Remote Infinispan should return count per client only for the current realm (keycloak#44948)

pruivo · web-flow · commit ba495d1ab19a · 2025-12-17T07:40:49.000+01:00
Closes keycloak#44577 Signed-off-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com> Co-authored-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/ClientSessionQueries.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/ClientSessionQueries.java
@@ -35,7 +35,7 @@ private ClientSessionQueries() {
     public static final String CLIENT_SESSION = Marshalling.protoEntity(RemoteAuthenticatedClientSessionEntity.class);
 
     private static final String FETCH_USER_SESSION_ID = "SELECT e.userSessionId FROM %s as e WHERE e.realmId = :realmId && e.clientId = :clientId ORDER BY e.userSessionId".formatted(CLIENT_SESSION);
-    private static final String PER_CLIENT_COUNT = "SELECT e.clientId, count(e.clientId) FROM %s as e GROUP BY e.clientId ORDER BY e.clientId".formatted(CLIENT_SESSION);
+    private static final String PER_CLIENT_COUNT = "SELECT e.clientId, count(e.clientId) FROM %s as e WHERE e.realmId = :realmId GROUP BY e.clientId ORDER BY e.clientId".formatted(CLIENT_SESSION);
     private static final String CLIENT_SESSION_COUNT = "SELECT count(e) FROM %s as e WHERE e.realmId = :realmId && e.clientId = :clientId".formatted(CLIENT_SESSION);
     private static final String FROM_USER_SESSION = "FROM %s as e WHERE e.userSessionId = :userSessionId ORDER BY e.clientId".formatted(CLIENT_SESSION);
     private static final String IDS_FROM_USER_SESSION = "SELECT e.clientId FROM %s as e WHERE e.userSessionId = :userSessionId ORDER BY e.clientId".formatted(CLIENT_SESSION);
@@ -52,8 +52,9 @@ public static Query<Object[]> fetchUserSessionIdForClientId(RemoteCache<ClientSe
     /**
      * Returns a projection with the client ID and its number of active client sessions.
      */
-    public static Query<Object[]> activeClientCount(RemoteCache<ClientSessionKey, RemoteAuthenticatedClientSessionEntity> cache) {
-        return cache.query(PER_CLIENT_COUNT);
+    public static Query<Object[]> activeClientCount(RemoteCache<ClientSessionKey, RemoteAuthenticatedClientSessionEntity> cache, String realmId) {
+        return cache.<Object[]>query(PER_CLIENT_COUNT)
+                .setParameter("realmId", realmId);
     }
 
     /**
diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProvider.java
@@ -168,7 +168,7 @@ public long getActiveUserSessions(RealmModel realm, ClientModel client) {
 
     @Override
     public Map<String, Long> getActiveClientSessionStats(RealmModel realm, boolean offline) {
-        var query = ClientSessionQueries.activeClientCount(getClientSessionTransaction(offline).getCache());
+        var query = ClientSessionQueries.activeClientCount(getClientSessionTransaction(offline).getCache(), realm.getId());
         return QueryHelper.streamAll(query, batchSize, QueryHelper.PROJECTION_TO_STRING_LONG_ENTRY)
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/InfinispanIckleQueryTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/InfinispanIckleQueryTest.java
@@ -459,9 +459,9 @@ public void testClientSessionQueries() {
         expectedResults = CLIENTS.stream().map(s -> new ClientSessionKey(userSession, s)).map(Objects::toString).collect(Collectors.toSet());
         assertQuery(query2, objects -> objects.createCacheKey().toString(), expectedResults);
 
-        // each client has user-session * realms active client sessions
-        query = ClientSessionQueries.activeClientCount(cache);
-        expectedResults = CLIENTS.stream().map(s -> String.format("%s-%s", s, USER_SESSIONS.size() * REALMS.size())).collect(Collectors.toSet());
+        // each client has user-session active client sessions
+        query = ClientSessionQueries.activeClientCount(cache, realm);
+        expectedResults = CLIENTS.stream().map(s -> String.format("%s-%s", s, USER_SESSIONS.size())).collect(Collectors.toSet());
         assertQuery(query, objects -> String.format("%s-%s", objects[0], objects[1]), expectedResults);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public long getActiveUserSessions(RealmModel realm, ClientModel client) {`
`168`	`168`
`169`	`169`	`@Override`
`170`	`170`	`public Map<String, Long> getActiveClientSessionStats(RealmModel realm, boolean offline) {`
`171`		`- var query = ClientSessionQueries.activeClientCount(getClientSessionTransaction(offline).getCache());`
	`171`	`+ var query = ClientSessionQueries.activeClientCount(getClientSessionTransaction(offline).getCache(), realm.getId());`
`172`	`172`	`return QueryHelper.streamAll(query, batchSize, QueryHelper.PROJECTION_TO_STRING_LONG_ENTRY)`
`173`	`173`	`.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));`
`174`	`174`	`}`