libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #4717 from patriot1burke/master

Browse source 
KEYCLOAK-5715
This commit is contained in:
Bill Burke 2017-11-17 12:59:36 -05:00 committed by GitHub
commit 7c0c48da01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java vendored
View file

@ -611,7 +611,7 @@ public class UserCacheSession implements UserCache {
@Override @Override
public List<UserModel> getUsers(RealmModel realm, int firstResult, int maxResults) { public List<UserModel> getUsers(RealmModel realm, int firstResult, int maxResults) {
return getUsers(realm, firstResult, maxResults, false); return getUsers(realm, firstResult, maxResults, false);
} }
@Override @Override

10
server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java
View file

@ -73,6 +73,16 @@ public class Pbkdf2PasswordHashProvider implements PasswordHashProvider {
credential.setValue(encodedPassword); credential.setValue(encodedPassword);
} }
@Override
public String encode(String rawPassword, int iterations) {
if (iterations == -1) {
iterations = defaultIterations;
}
byte[] salt = getSalt();
return encode(rawPassword, iterations, salt);
}
@Override @Override
public boolean verify(String rawPassword, CredentialModel credential) { public boolean verify(String rawPassword, CredentialModel credential) {
return encode(rawPassword, credential.getHashIterations(), credential.getSalt()).equals(credential.getValue()); return encode(rawPassword, credential.getHashIterations(), credential.getSalt()).equals(credential.getValue());

5
server-spi/src/main/java/org/keycloak/credential/hash/PasswordHashProvider.java
View file

@ -29,5 +29,10 @@ public interface PasswordHashProvider extends Provider {
void encode(String rawPassword, int iterations, CredentialModel credential); void encode(String rawPassword, int iterations, CredentialModel credential);
default
String encode(String rawPassword, int iterations) {
return rawPassword;
}
boolean verify(String rawPassword, CredentialModel credential); boolean verify(String rawPassword, CredentialModel credential);
} }

33
services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java
View file

@ -22,9 +22,12 @@ import org.keycloak.authentication.AbstractFormAuthenticator;
import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowContext;
import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowError;
import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInput;
import org.keycloak.credential.CredentialModel;
import org.keycloak.credential.hash.PasswordHashProvider;
import org.keycloak.events.Details; import org.keycloak.events.Details;
import org.keycloak.events.Errors; import org.keycloak.events.Errors;
import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelDuplicateException;
import org.keycloak.models.PasswordPolicy;
import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel; import org.keycloak.models.UserModel;
import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.KeycloakModelUtils;
@ -83,8 +86,32 @@ public abstract class AbstractUsernameFormAuthenticator extends AbstractFormAuth
return challengeResponse; return challengeResponse;
} }
protected void runDefaultDummyHash(AuthenticationFlowContext context) {
PasswordHashProvider hash = context.getSession().getProvider(PasswordHashProvider.class, PasswordPolicy.HASH_ALGORITHM_DEFAULT);
hash.encode("dummypassword", PasswordPolicy.HASH_ITERATIONS_DEFAULT);
}
protected void dummyHash(AuthenticationFlowContext context) {
PasswordPolicy policy = context.getRealm().getPasswordPolicy();
if (policy == null) {
runDefaultDummyHash(context);
return;
} else {
PasswordHashProvider hash = context.getSession().getProvider(PasswordHashProvider.class, policy.getHashAlgorithm());
if (hash == null) {
runDefaultDummyHash(context);
return;
} else {
hash.encode("dummypassword", policy.getHashIterations());
}
}
}
public boolean invalidUser(AuthenticationFlowContext context, UserModel user) { public boolean invalidUser(AuthenticationFlowContext context, UserModel user) {
if (user == null) { if (user == null) {
dummyHash(context);
context.getEvent().error(Errors.USER_NOT_FOUND); context.getEvent().error(Errors.USER_NOT_FOUND);
Response challengeResponse = invalidUser(context); Response challengeResponse = invalidUser(context);
context.failureChallenge(AuthenticationFlowError.INVALID_USER, challengeResponse); context.failureChallenge(AuthenticationFlowError.INVALID_USER, challengeResponse);
@ -144,15 +171,15 @@ public abstract class AbstractUsernameFormAuthenticator extends AbstractFormAuth
return false; return false;
} }
if (invalidUser(context, user)){ if (invalidUser(context, user)) {
return false; return false;
} }
if (!validatePassword(context, user, inputData)){ if (!validatePassword(context, user, inputData)) {
return false; return false;
} }
if(!enabledUser(context, user)){ if (!enabledUser(context, user)) {
return false; return false;
} }