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

fix integer overflow with explicit cast

Browse source 
Closes #28564

Signed-off-by: tqe1999 <tqe1999@gmail.com>
This commit is contained in:
tqe1999 2024-04-11 16:58:44 +08:00 committed by GitHub
parent 9b94b6f47e
commit 6e0fc8a774
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java
View file

@ -207,7 +207,7 @@ public class UserStorageSyncManager {
if (provider.getFullSyncPeriod() > 0) { if (provider.getFullSyncPeriod() > 0) {
// schedule periodic full sync for this provider // schedule periodic full sync for this provider
UserStorageSyncTask task = new UserStorageSyncTask(provider, realm, sessionFactory, UserStorageSyncTask.SyncMode.FULL); UserStorageSyncTask task = new UserStorageSyncTask(provider, realm, sessionFactory, UserStorageSyncTask.SyncMode.FULL);
timer.schedule(task, provider.getFullSyncPeriod() * 1000, fullSyncTaskName); timer.schedule(task, provider.getFullSyncPeriod() * 1000L, fullSyncTaskName);
} else { } else {
// cancel potentially dangling task // cancel potentially dangling task
timer.cancelTask(fullSyncTaskName); timer.cancelTask(fullSyncTaskName);
@ -217,7 +217,7 @@ public class UserStorageSyncManager {
if (provider.getChangedSyncPeriod() > 0) { if (provider.getChangedSyncPeriod() > 0) {
// schedule periodic changed user sync for this provider // schedule periodic changed user sync for this provider
UserStorageSyncTask task = new UserStorageSyncTask(provider, realm, sessionFactory, UserStorageSyncTask.SyncMode.CHANGED); UserStorageSyncTask task = new UserStorageSyncTask(provider, realm, sessionFactory, UserStorageSyncTask.SyncMode.CHANGED);
timer.schedule(task, provider.getChangedSyncPeriod() * 1000, changedSyncTaskName); timer.schedule(task, provider.getChangedSyncPeriod() * 1000L, changedSyncTaskName);
} else { } else {
// cancel potentially dangling task // cancel potentially dangling task
timer.cancelTask(changedSyncTaskName); timer.cancelTask(changedSyncTaskName);

41
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
View file

@ -365,6 +365,47 @@ public class SyncFederationTest extends AbstractAuthTest {
}); });
} }
@Test
public void test05LongSync() throws Exception {
// Add IgnoredDummyUserFederationProviderFactory provider
testingClient.server().run(session -> {
RealmModel appRealm = session.realms().getRealmByName(AuthRealm.TEST);
UserStorageProviderModel model = new UserStorageProviderModel();
model.setProviderId(IgnoredDummyUserFederationProviderFactory.IGNORED_PROVIDER_ID);
model.setPriority(1);
model.setName("test-sync-dummy");
model.setFullSyncPeriod(2147484);
model.setChangedSyncPeriod(2147484);
model.setLastSync(0);
appRealm.addComponentModel(model);
});
// run both sync methods that will be ignored
testingClient.server().run(session -> {
RealmModel appRealm = session.realms().getRealmByName(AuthRealm.TEST);
UserStorageProviderModel dummyModel = findDummyProviderModel(appRealm);
KeycloakSessionFactory sessionFactory = session.getKeycloakSessionFactory();
SynchronizationResult syncResult = UserStorageSyncManager.syncAllUsers(sessionFactory, appRealm.getId(), dummyModel);
Assert.assertTrue(syncResult.isIgnored());
syncResult = UserStorageSyncManager.syncChangedUsers(sessionFactory, appRealm.getId(), dummyModel);
Assert.assertTrue(syncResult.isIgnored());
});
// assert the last sync is not updated
testingClient.server().run(session -> {
RealmModel appRealm = session.realms().getRealmByName(AuthRealm.TEST);
UserStorageProviderModel dummyModel = findDummyProviderModel(appRealm);
Assert.assertEquals(0, dummyModel.getLastSync());
});
// remove provider
testingClient.server().run(session -> {
RealmModel appRealm = session.realms().getRealmByName(AuthRealm.TEST);
UserStorageProviderModel dummyModel = findDummyProviderModel(appRealm);
appRealm.removeComponent(dummyModel);
});
}
private static void sleep(long ms) { private static void sleep(long ms) {
try { try {
log.infof("Sleeping for %d ms", ms); log.infof("Sleeping for %d ms", ms);