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

KEYCLOAK-4939 ConcurrentLoginTest broken in latest master

Browse source
This commit is contained in:
mposolda 2017-05-19 14:00:42 +02:00
parent 336d05dd34
commit e2a7b71cf3
4 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/AuthenticatedClientSessionAdapter.java
View file

@ -69,10 +69,6 @@ public class AuthenticatedClientSessionAdapter implements AuthenticatedClientSes
} }
} else { } else {
this.userSession = (UserSessionAdapter) userSession; this.userSession = (UserSessionAdapter) userSession;
if (sessionEntity.getAuthenticatedClientSessions() == null) {
sessionEntity.setAuthenticatedClientSessions(new HashMap<>());
}
sessionEntity.getAuthenticatedClientSessions().put(clientUUID, entity); sessionEntity.getAuthenticatedClientSessions().put(clientUUID, entity);
update(); update();
} }

8
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java
View file

@ -53,6 +53,7 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -518,7 +519,8 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
entity.setBrokerUserId(userSession.getBrokerUserId()); entity.setBrokerUserId(userSession.getBrokerUserId());
entity.setIpAddress(userSession.getIpAddress()); entity.setIpAddress(userSession.getIpAddress());
entity.setLoginUsername(userSession.getLoginUsername()); entity.setLoginUsername(userSession.getLoginUsername());
entity.setNotes(userSession.getNotes()); entity.setNotes(userSession.getNotes()== null ? new ConcurrentHashMap<>() : userSession.getNotes());
entity.setAuthenticatedClientSessions(new ConcurrentHashMap<>());
entity.setRememberMe(userSession.isRememberMe()); entity.setRememberMe(userSession.isRememberMe());
entity.setState(userSession.getState()); entity.setState(userSession.getState());
entity.setUser(userSession.getUser().getId()); entity.setUser(userSession.getUser().getId());
@ -555,10 +557,6 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
entity.setTimestamp(clientSession.getTimestamp()); entity.setTimestamp(clientSession.getTimestamp());
Map<String, AuthenticatedClientSessionEntity> clientSessions = importedUserSession.getEntity().getAuthenticatedClientSessions(); Map<String, AuthenticatedClientSessionEntity> clientSessions = importedUserSession.getEntity().getAuthenticatedClientSessions();
if (clientSessions == null) {
clientSessions = new HashMap<>();
importedUserSession.getEntity().setAuthenticatedClientSessions(clientSessions);
}
clientSessions.put(clientSession.getClient().getId(), entity); clientSessions.put(clientSession.getClient().getId(), entity);

7
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java
View file

@ -159,9 +159,6 @@ public class UserSessionAdapter implements UserSessionModel {
@Override @Override
public void setNote(String name, String value) { public void setNote(String name, String value) {
if (entity.getNotes() == null) {
entity.setNotes(new ConcurrentHashMap<>());
}
if (value == null) { if (value == null) {
if (entity.getNotes().containsKey(name)) { if (entity.getNotes().containsKey(name)) {
removeNote(name); removeNote(name);
@ -201,8 +198,8 @@ public class UserSessionAdapter implements UserSessionModel {
provider.updateSessionEntity(entity, realm, user, loginUsername, ipAddress, authMethod, rememberMe, brokerSessionId, brokerUserId); provider.updateSessionEntity(entity, realm, user, loginUsername, ipAddress, authMethod, rememberMe, brokerSessionId, brokerUserId);
entity.setState(null); entity.setState(null);
entity.setNotes(null); entity.getNotes().clear();
entity.setAuthenticatedClientSessions(null); entity.getAuthenticatedClientSessions().clear();
update(); update();
} }

2
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/UserSessionEntity.java
View file

@ -50,7 +50,7 @@ public class UserSessionEntity extends SessionEntity {
private Map<String, String> notes = new ConcurrentHashMap<>(); private Map<String, String> notes = new ConcurrentHashMap<>();
private Map<String, AuthenticatedClientSessionEntity> authenticatedClientSessions; private Map<String, AuthenticatedClientSessionEntity> authenticatedClientSessions = new ConcurrentHashMap<>();
public String getUser() { public String getUser() {
return user; return user;