Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed internal encoding method to make subclassing work.

This commit is contained in:
Luke Taylor 2005-12-16 00:59:29 +00:00
parent 781ed0f380
commit 45e2f9dac4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/acegisecurity/providers/encoding/ShaPasswordEncoder.java
View File

@ -43,21 +43,19 @@ public class ShaPasswordEncoder extends BaseDigestPasswordEncoder
public boolean isPasswordValid(String encPass, String rawPass, Object salt) { public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
String pass1 = "" + encPass; String pass1 = "" + encPass;
String pass2 = encodeInternal(mergePasswordAndSalt(rawPass, salt, false)); String pass2 = encodePassword(rawPass, salt);
return pass1.equals(pass2); return pass1.equals(pass2);
} }
public String encodePassword(String rawPass, Object salt) { public String encodePassword(String rawPass, Object salt) {
return encodeInternal(mergePasswordAndSalt(rawPass, salt, false)); String saltedPass = mergePasswordAndSalt(rawPass, salt, false);
}
private String encodeInternal(String input) {
if (!getEncodeHashAsBase64()) { if (!getEncodeHashAsBase64()) {
return DigestUtils.shaHex(input); return DigestUtils.shaHex(saltedPass);
} }
byte[] encoded = Base64.encodeBase64(DigestUtils.sha(input)); byte[] encoded = Base64.encodeBase64(DigestUtils.sha(saltedPass));
return new String(encoded); return new String(encoded);
} }