libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

ConcurrentModificationException when restarting user sessions

Browse source 
Closes #34093

Signed-off-by: Martin Kanis <mkanis@redhat.com>
This commit is contained in:
Martin Kanis 2024-10-23 15:21:12 +02:00 committed by Alexander Schwartz
parent 4b605382f7
commit 4f3ced9560
2 changed files with 15 additions and 3 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/JpaChangesPerformer.java
View file

@ -544,7 +544,7 @@ public class JpaChangesPerformer<K, V extends SessionEntity> implements SessionC
@Override @Override
public void clear() { public void clear() {
userSessionModel.getNotes().forEach((k, v) -> userSessionModel.removeNote(k)); userSessionModel.getNotes().clear();
} }
}; };
} }

16
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
View file

@ -17,6 +17,7 @@
package org.keycloak.testsuite.model; package org.keycloak.testsuite.model;
import org.hamcrest.Matchers;
import org.junit.After; import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
@ -49,6 +50,7 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@ -148,9 +150,19 @@ public class UserSessionProviderTest extends AbstractTestRealmKeycloakTest {
UserSessionModel userSession = kcSession.sessions().getUserSession(realm, sessions[0].getId()); UserSessionModel userSession = kcSession.sessions().getUserSession(realm, sessions[0].getId());
assertSession(userSession, kcSession.users().getUserByUsername(realm, "user1"), "127.0.0.1", started, started, "test-app", "third-party"); assertSession(userSession, kcSession.users().getUserByUsername(realm, "user1"), "127.0.0.1", started, started, "test-app", "third-party");
userSession.restartSession(realm, kcSession.users().getUserByUsername(realm, "user2"), "user2", "127.0.0.6", "form", true, null, null); // add some dummy session notes just to test if restart bellow will work
userSession.setNote("k1", "v1");
userSession.setNote("k2", "v2");
userSession.setNote("k3", "v3");
userSession.restartSession(realm, kcSession.users().getUserByUsername(realm, "user2"), "user2", "127.0.0.6", "form", true, null, null);
});
KeycloakModelUtils.runJobInTransaction(session.getKeycloakSessionFactory(), kcSession -> {
UserSessionModel userSession = kcSession.sessions().getUserSession(realm, sessions[0].getId());
assertThat(userSession.getNotes(), Matchers.anEmptyMap());
userSession = kcSession.sessions().getUserSession(realm, sessions[0].getId());
assertSession(userSession, kcSession.users().getUserByUsername(realm, "user2"), "127.0.0.6", started + 100, started + 100); assertSession(userSession, kcSession.users().getUserByUsername(realm, "user2"), "127.0.0.6", started + 100, started + 100);
}); });
} finally { } finally {