Skip to content

Commit d2d1275

Browse files
rntrpjzheaux
authored andcommitted
Fix IllegalArgumentException message for unknown Argon2 types
Array index 0 points to an empty string. Use index 1 instead. Signed-off-by: Roman Trapickin <8594293+rntrp@users.noreply.github.com>
1 parent 7bf776e commit d2d1275

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static Argon2Hash decode(String encodedHash) throws IllegalArgumentException {
111111
case "argon2d" -> new Argon2Parameters.Builder(Argon2Parameters.ARGON2_d);
112112
case "argon2i" -> new Argon2Parameters.Builder(Argon2Parameters.ARGON2_i);
113113
case "argon2id" -> new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id);
114-
default -> throw new IllegalArgumentException("Invalid algorithm type: " + parts[0]);
114+
default -> throw new IllegalArgumentException("Invalid algorithm type: " + parts[1]);
115115
};
116116
if (parts[currentPart].startsWith("v=")) {
117117
paramsBuilder.withVersion(Integer.parseInt(parts[currentPart].substring(2)));

crypto/src/test/java/org/springframework/security/crypto/argon2/Argon2EncodingUtilsTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public void decodeWhenNotAnArgon2HashThenThrowException() {
9595
@Test
9696
public void decodeWhenNonexistingAlgorithmThenThrowException() {
9797
assertThatIllegalArgumentException().isThrownBy(() -> Argon2EncodingUtils
98-
.decode("$argon2x$v=19$m=1024,t=3,p=2$Y1JkRmJDdzIzZ3oyTWx4aw$cGE5Cbd/cx7micVhXVBdH5qTr66JI1iUyuNNVAnErXs"));
98+
.decode("$argon2x$v=19$m=1024,t=3,p=2$Y1JkRmJDdzIzZ3oyTWx4aw$cGE5Cbd/cx7micVhXVBdH5qTr66JI1iUyuNNVAnErXs"))
99+
.withMessageContaining("argon2x");
99100
}
100101

101102
@Test

0 commit comments

Comments
 (0)