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

NPE when listing sessions in UI if associated user is gone

Browse source 
Closes #28801

Signed-off-by: Martin Kanis <mkanis@redhat.com>
This commit is contained in:
Martin Kanis 2024-04-16 13:41:51 +02:00 committed by Pedro Igor
parent 8832da08fb
commit f764a9cb4a
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -363,7 +363,8 @@ public class InfinispanUserSessionProvider implements UserSessionProvider, Sessi
return persister.loadUserSessionsStream(realm, user, offline, 0, null) return persister.loadUserSessionsStream(realm, user, offline, 0, null)
.map(persistentUserSession -> getUserSessionEntityFromCacheOrImportIfNecessary(realm, offline, persistentUserSession)) .map(persistentUserSession -> getUserSessionEntityFromCacheOrImportIfNecessary(realm, offline, persistentUserSession))
.filter(Objects::nonNull) .filter(Objects::nonNull)
.map(userSessionEntity -> wrap(realm, userSessionEntity, offline)); .map(userSessionEntity -> (UserSessionModel) wrap(realm, userSessionEntity, offline))
.filter(Objects::nonNull);
} }
@ -480,11 +481,14 @@ public class InfinispanUserSessionProvider implements UserSessionProvider, Sessi
} }
protected Stream<UserSessionModel> getUserSessionsStream(final RealmModel realm, ClientModel client, Integer firstResult, Integer maxResults, final boolean offline) { protected Stream<UserSessionModel> getUserSessionsStream(final RealmModel realm, ClientModel client, Integer firstResult, Integer maxResults, final boolean offline) {
if (offline) { if (offline) {
// fetch the actual offline user session count from the database // fetch the actual offline user session count from the database
UserSessionPersisterProvider persister = session.getProvider(UserSessionPersisterProvider.class); UserSessionPersisterProvider persister = session.getProvider(UserSessionPersisterProvider.class);
return persister.loadUserSessionsStream(realm, client, true, firstResult, maxResults); return persister.loadUserSessionsStream(realm, client, true, firstResult, maxResults)
.map(persistentUserSession -> getUserSessionEntityFromCacheOrImportIfNecessary(realm, offline, persistentUserSession))
.filter(Objects::nonNull)
.map(userSessionEntity -> (UserSessionModel) wrap(realm, userSessionEntity, offline))
.filter(Objects::nonNull);
} }
UserSessionPredicate predicate = UserSessionPredicate.create(realm.getId()).client(client.getId()); UserSessionPredicate predicate = UserSessionPredicate.create(realm.getId()).client(client.getId());
@ -773,6 +777,11 @@ public class InfinispanUserSessionProvider implements UserSessionProvider, Sessi
user = session.users().getUserById(realm, entity.getUser()); user = session.users().getUserById(realm, entity.getUser());
if (user == null) { if (user == null) {
// remove orphaned user session from the cache and from persister if the session is offline; also removes associated client sessions
removeUserSession(entity, offline);
if (offline) {
session.getProvider(UserSessionPersisterProvider.class).removeUserSession(entity.getId(), true);
}
return null; return null;
} }