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

Merge pull request #1361 from ssilvert/KEYCLOAK-1083-unlock-user-account

Browse source 
KEYCLOAK-1083: Provide a way for admin to unlock user account
This commit is contained in:
Stian Thorgersen 2015-06-12 07:44:07 +01:00
commit 2d82d15e5b
9 changed files with 56 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
model/api/src/main/java/org/keycloak/models/entities/UsernameLoginFailureEntity.java
View file

@ -60,4 +60,11 @@ public class UsernameLoginFailureEntity extends AbstractIdentifiableEntity {
public void setRealmId(String realmId) {
this.realmId = realmId;
}
public void clearFailures() {
this.numFailures = 0;
this.lastFailure = 0;
this.lastIPFailure = null;
this.failedLoginNotBefore = 0;
}
}

2
model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UsernameLoginFailureAdapter.java
View file

@ -51,7 +51,7 @@ public class UsernameLoginFailureAdapter implements UsernameLoginFailureModel {
@Override
public void clearFailures() {
entity.setNumFailures(0);
entity.clearFailures();
update();
}

6
model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureEntity.java
View file

@ -62,4 +62,10 @@ public class LoginFailureEntity implements Serializable {
this.lastIPFailure = lastIPFailure;
}
public void clearFailures() {
this.failedLoginNotBefore = 0;
this.numFailures = 0;
this.lastFailure = 0;
this.lastIPFailure = null;
}
}

2
model/sessions-jpa/src/main/java/org/keycloak/models/sessions/jpa/UsernameLoginFailureAdapter.java
View file

@ -43,7 +43,7 @@ public class UsernameLoginFailureAdapter implements UsernameLoginFailureModel
@Override
public void clearFailures() {
user.setNumFailures(0);
user.clearFailures();
}
@Override

7
model/sessions-jpa/src/main/java/org/keycloak/models/sessions/jpa/entities/UsernameLoginFailureEntity.java
View file

@ -91,6 +91,13 @@ public class UsernameLoginFailureEntity {
this.realmId = realmId;
}
public void clearFailures() {
setFailedLoginNotBefore(0);
setLastFailure(0);
setLastIPFailure(null);
setNumFailures(0);
}
public static class Key implements Serializable {
private String realmId;

2
model/sessions-mem/src/main/java/org/keycloak/models/sessions/mem/UsernameLoginFailureAdapter.java
View file

@ -45,7 +45,7 @@ public class UsernameLoginFailureAdapter implements UsernameLoginFailureModel {
@Override
public void clearFailures() {
entity.getNumFailures().set(0);
entity.clearFailures();
}
@Override

7
model/sessions-mem/src/main/java/org/keycloak/models/sessions/mem/entities/UsernameLoginFailureEntity.java
View file

@ -62,4 +62,11 @@ public class UsernameLoginFailureEntity {
this.lastIpFailure = lastIpFailure;
}
public void clearFailures() {
this.failedLoginNotBefore = new AtomicInteger();
this.lastFailure = new AtomicLong();
this.lastIpFailure = new AtomicReference<String>();
this.numFailures = new AtomicInteger();
}
}

2
model/sessions-mongo/src/main/java/org/keycloak/models/sessions/mongo/UsernameLoginFailureAdapter.java
View file

@ -50,7 +50,7 @@ public class UsernameLoginFailureAdapter extends AbstractMongoAdapter<MongoUser
@Override
public void clearFailures() {
user.setNumFailures(0);
user.clearFailures();
updateMongoEntity();
}

16
services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
View file

@ -68,6 +68,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.keycloak.models.UsernameLoginFailureModel;
import org.keycloak.services.managers.BruteForceProtector;
/**
* Base resource for managing users
@ -96,6 +98,9 @@ public class UsersResource {
@Context
protected HttpHeaders headers;
@Context
protected BruteForceProtector protector;
public UsersResource(RealmModel realm, RealmAuth auth, TokenManager tokenManager, AdminEventBuilder adminEvent) {
this.auth = auth;
this.realm = realm;
@ -131,6 +136,13 @@ public class UsersResource {
attrsToRemove = Collections.emptySet();
}
if (rep.isEnabled()) {
UsernameLoginFailureModel failureModel = session.sessions().getUserLoginFailure(realm, rep.getUsername());
if (failureModel != null) {
failureModel.clearFailures();
}
}
updateUserFromRep(user, rep, attrsToRemove);
adminEvent.operation(OperationType.UPDATE).resourcePath(uriInfo).representation(rep).success();
@ -251,6 +263,10 @@ public class UsersResource {
}
}
if ((protector != null) && protector.isTemporarilyDisabled(session, realm, rep.getUsername())) {
rep.setEnabled(false);
}
return rep;
}