Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-08 19:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-1031: Ported change from trunk.

Browse Source
This commit is contained in:
Luke Taylor 2008-11-11 23:36:47 +00:00
parent ad4b5c487f
commit 4c3867718e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/main/java/org/springframework/security/providers/ldap/authenticator/LdapShaPasswordEncoder.java
View File

@ -86,9 +86,9 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
sha.update(rawPass.getBytes("UTF-8")); sha.update(rawPass.getBytes("UTF-8"));
} catch (java.security.NoSuchAlgorithmException e) { } catch (java.security.NoSuchAlgorithmException e) {
throw new IllegalStateException("No SHA implementation available!"); throw new IllegalStateException("No SHA implementation available!");
} catch (UnsupportedEncodingException ue) { } catch (UnsupportedEncodingException ue) {
throw new IllegalStateException("UTF-8 not supported!"); throw new IllegalStateException("UTF-8 not supported!");
} }
if (salt != null) { if (salt != null) {
Assert.isInstanceOf(byte[].class, salt, "Salt value must be a byte array"); Assert.isInstanceOf(byte[].class, salt, "Salt value must be a byte array");
@ -131,7 +131,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
*/ */
public boolean isPasswordValid(final String encPass, final String rawPass, Object salt) { public boolean isPasswordValid(final String encPass, final String rawPass, Object salt) {
String prefix = extractPrefix(encPass); String prefix = extractPrefix(encPass);
if (prefix == null) { if (prefix == null) {
return encPass.equals(rawPass); return encPass.equals(rawPass);
} }
@ -141,32 +141,32 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
} else if (!prefix.equals(SHA_PREFIX) && !prefix.equals(SHA_PREFIX_LC)) { } else if (!prefix.equals(SHA_PREFIX) && !prefix.equals(SHA_PREFIX_LC)) {
throw new IllegalArgumentException("Unsupported password prefix '" + prefix + "'"); throw new IllegalArgumentException("Unsupported password prefix '" + prefix + "'");
} else { } else {
// Standard SHA // Standard SHA
salt = null; salt = null;
} }
int startOfHash = prefix.length() + 1; int startOfHash = prefix.length();
String encodedRawPass = encodePassword(rawPass, salt).substring(startOfHash); String encodedRawPass = encodePassword(rawPass, salt).substring(startOfHash);
return encodedRawPass.equals(encPass.substring(startOfHash)); return encodedRawPass.equals(encPass.substring(startOfHash));
} }
/** /**
* Returns the hash prefix or null if there isn't one. * Returns the hash prefix or null if there isn't one.
*/ */
private String extractPrefix(String encPass) { private String extractPrefix(String encPass) {
if (!encPass.startsWith("{")) { if (!encPass.startsWith("{")) {
return null; return null;
} }
int secondBrace = encPass.lastIndexOf('}'); int secondBrace = encPass.lastIndexOf('}');
if (secondBrace < 0) { if (secondBrace < 0) {
throw new IllegalArgumentException("Couldn't find closing brace for SHA prefix"); throw new IllegalArgumentException("Couldn't find closing brace for SHA prefix");
} }
return encPass.substring(0, secondBrace + 1); return encPass.substring(0, secondBrace + 1);
} }
public void setForceLowerCasePrefix(boolean forceLowerCasePrefix) { public void setForceLowerCasePrefix(boolean forceLowerCasePrefix) {