Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pbkdf2PasswordEncoder supports Base64 encoding

Browse Source 
Fixes gh-4683
This commit is contained in:
Rob Winch
2017-10-24 08:47:04 -05:00
parent fe8f3afbaf
commit 870b8bf9b2
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/src/test/java/org/springframework/security/crypto/password/Pbkdf2PasswordEncoderTests.java
View File

@@ -19,6 +19,7 @@ import java.util.Arrays;
import org.junit.Test;
import org.springframework.security.crypto.codec.Base64;
import org.springframework.security.crypto.codec.Hex;
import org.springframework.security.crypto.keygen.KeyGenerators;
@@ -75,6 +76,25 @@ public class Pbkdf2PasswordEncoderTests {
assertThat(fixedHex).isEqualTo(encodedPassword);
}
@Test
public void encodeAndMatchWhenBase64ThenSuccess() {
this.encoder.setEncodeHashAsBase64(true);
String rawPassword = "password";
String encodedPassword = this.encoder.encode(rawPassword);
assertThat(this.encoder.matches(rawPassword, encodedPassword)).isTrue();
}
@Test
public void matchWhenBase64ThenSuccess() {
this.encoder.setEncodeHashAsBase64(true);
String rawPassword = "password";
String encodedPassword = "3FOwOMcDgxP+z1x/sv184LFY2WVD+ZGMgYP3LPOSmCcDmk1XPYvcCQ==";
assertThat(this.encoder.matches(rawPassword, encodedPassword)).isTrue();
java.util.Base64.getDecoder().decode(encodedPassword); // validate can decode as Base64
}
@Test
public void encodeAndMatchWhenSha256ThenSuccess() {
this.encoder.setAlgorithm(Pbkdf2PasswordEncoder.SecretKeyFactoryAlgorithm.PBKDF2WithHmacSHA256);