External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

[26.3] ClientSession timestamp not updated in the database

Browse Source 
Closes #42012

Signed-off-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
Co-authored-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
This commit is contained in:
Pedro Ruivo 2025-09-10 19:33:50 +01:00 committed by GitHub
parent 373e99e398
commit bd927edc79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 115 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ClientSessionPersistentChangelogBasedTransaction.java
View File

@ -86,6 +86,7 @@ public class ClientSessionPersistentChangelogBasedTransaction extends Persistent
// Cache does not contain the offline flag value so adding it
wrappedEntity.getEntity().setOffline(offline);
wrappedEntity.getEntity().setUserSessionId(userSession.getId());
RealmModel realmFromSession = kcSession.realms().getRealm(wrappedEntity.getEntity().getRealmId());
if (!realmFromSession.getId().equals(realm.getId())) {
@ -147,6 +148,7 @@ public class ClientSessionPersistentChangelogBasedTransaction extends Persistent
entity.setRedirectUri(clientSession.getRedirectUri());
entity.setTimestamp(clientSession.getTimestamp());
entity.setOffline(clientSession.getUserSession().isOffline());
entity.setUserSessionId(userSessionId);
return entity;
}

5
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/JpaChangesPerformer.java
View File

@ -44,6 +44,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.CompletableFuture;
@ -251,13 +252,13 @@ public class JpaChangesPerformer<K, V extends SessionEntity> implements SessionC
ClientModel client = new ClientModelLazyDelegate(null) {
@Override
public String getId() {
return entity.getClientId();
return Objects.requireNonNull(entity.getClientId());
}
};
UserSessionModel userSession = new UserSessionModelDelegate(null) {
@Override
public String getId() {
return entity.getUserSessionId();
return Objects.requireNonNull(entity.getUserSessionId());
}
};
PersistentAuthenticatedClientSessionAdapter clientSessionModel = (PersistentAuthenticatedClientSessionAdapter) userSessionPersister.loadClientSession(realm, client, userSession, entity.isOffline());

5
model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java
View File

@ -258,7 +258,10 @@ public class PersistentAuthenticatedClientSessionAdapter implements Authenticate
@Override
public String toString() {
return getId();
return "PersistentAuthenticatedClientSessionAdapter{" +
"userSessionId=" + model.getUserSessionId() +
"clientId=" + model.getClientId() +
"}";
}
@JsonIgnoreProperties(ignoreUnknown = true)

125
testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionPersisterProviderTest.java
View File

@ -17,15 +17,34 @@
package org.keycloak.testsuite.model.session;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.hamcrest.Matchers;
import org.infinispan.Cache;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
import org.keycloak.OAuth2Constants;
import org.keycloak.common.Profile;
import org.keycloak.common.util.MultiSiteUtils;
import org.keycloak.common.util.Time;
import org.keycloak.connections.infinispan.InfinispanConnectionProvider;
import org.keycloak.infinispan.util.InfinispanUtils;
import org.keycloak.models.AuthenticatedClientSessionModel;
import org.keycloak.models.ClientModel;
import org.keycloak.models.Constants;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
@ -37,35 +56,24 @@ import org.keycloak.models.UserSessionProvider;
import org.keycloak.models.jpa.session.JpaUserSessionPersisterProvider;
import org.keycloak.models.session.UserSessionPersisterProvider;
import org.keycloak.models.sessions.infinispan.PersistentUserSessionProvider;
import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper;
import org.keycloak.models.sessions.infinispan.entities.AuthenticatedClientSessionEntity;
import org.keycloak.models.utils.ResetTimeOffsetEvent;
import org.keycloak.protocol.oidc.OIDCLoginProtocol;
import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory;
import org.keycloak.services.managers.ClientManager;
import org.keycloak.services.managers.RealmManager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.keycloak.models.Constants;
import org.hamcrest.Matchers;
import org.keycloak.storage.client.ClientStorageProvider;
import org.keycloak.storage.client.ClientStorageProviderModel;
import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory;
import org.keycloak.testsuite.model.KeycloakModelTest;
import org.keycloak.testsuite.model.RequireProvider;
import java.util.LinkedList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
@ -377,6 +385,85 @@ public class UserSessionPersisterProviderTest extends KeycloakModelTest {
});
}
@Test
public void testClientTimestampUpdate() {
final String realmName = "client-test";
final String username = "my-user";
final String clientId = "my-app";
final AtomicReference<String> userSessionID = new AtomicReference<>();
final AtomicReference<String> clientSessionId = new AtomicReference<>();
// create user and client
inComittedTransaction(session -> {
RealmModel realm = session.realms().createRealm(realmName);
session.getContext().setRealm(realm);
realm.setDefaultRole(session.roles().addRealmRole(realm, Constants.DEFAULT_ROLES_ROLE_PREFIX));
realm.addClient(clientId);
session.users().addUser(realm, username);
UserSessionModel userSession = session.sessions().createUserSession(null, realm, session.users().getUserByUsername(realm, username), username, "127.0.0.1", "form", true, null, null, UserSessionModel.SessionPersistenceState.PERSISTENT);
userSessionID.set(userSession.getId());
AuthenticatedClientSessionModel clientSession = createClientSession(session, realm.getId(), realm.getClientByClientId(clientId), userSession, "http://redirect", "state");
clientSessionId.set(clientSession.getId());
});
if (InfinispanUtils.isEmbeddedInfinispan()) {
// causes https://github.com/keycloak/keycloak/issues/42012
inComittedTransaction(session -> {
RealmModel realm = session.realms().getRealmByName(realmName);
session.getContext().setRealm(realm);
Cache<UUID, SessionEntityWrapper<AuthenticatedClientSessionEntity>> clientSessoinCache = session.getProvider(InfinispanConnectionProvider.class).getCache(CLIENT_SESSION_CACHE_NAME);
SessionEntityWrapper<AuthenticatedClientSessionEntity> clientSession = clientSessoinCache.get(UUID.fromString(clientSessionId.get()));
assertNotNull(clientSession);
assertNotNull(clientSession.getEntity());
// user session id is not stored in the cache
// when reading from a remote keycloak instance, this field is null
// we are simulating a “remote read” here.
clientSession.getEntity().setUserSessionId(null);
});
}
Function<KeycloakSession, Integer> fetchTimestamp = session -> {
RealmModel realm = session.realms().getRealmByName(realmName);
session.getContext().setRealm(realm);
ClientModel client = realm.getClientByClientId(clientId);
UserSessionModel userSession = session.sessions().getUserSession(realm, userSessionID.get());
// read from database!
if (Profile.isFeatureEnabled(Profile.Feature.PERSISTENT_USER_SESSIONS)) {
return session.getProvider(UserSessionPersisterProvider.class)
.loadClientSession(realm, client, userSession, false)
.getTimestamp();
}
return session.sessions()
.getClientSession(userSession, client, clientSessionId.get(), false)
.getTimestamp();
};
// fetch the current timestamp
int currentTimestamp = inComittedTransaction(fetchTimestamp);
// update timestamp
inComittedTransaction(session -> {
RealmModel realm = session.realms().getRealmByName(realmName);
session.getContext().setRealm(realm);
ClientModel client = realm.getClientByClientId(clientId);
UserSessionModel userSession = session.sessions().getUserSession(realm, userSessionID.get());
session.sessions()
.getClientSession(userSession, client, clientSessionId.get(), false)
.setTimestamp(currentTimestamp + 10);
});
// check if it is updated
int timestamp = inComittedTransaction(fetchTimestamp);
assertEquals(currentTimestamp + 10, timestamp);
}
@Test
public void testOnUserRemoved() {
int started = Time.currentTime();