mirror of
https://github.com/keycloak/keycloak.git
synced 2025-12-19 13:30:21 -06:00
Avoid holding on to the realm in cached configurations
Closes #43744 Signed-off-by: Alexander Schwartz <alexander.schwartz@ibm.com>
This commit is contained in:
committed by
GitHub
parent
e0c1f2ee0f
commit
2b51d6f4ac
@@ -727,13 +727,13 @@ public class RealmAdapter implements CachedRealmModel {
|
||||
@Override
|
||||
public CibaConfig getCibaPolicy() {
|
||||
if (isUpdated()) return updated.getCibaPolicy();
|
||||
return cached.getCibaConfig(session, modelSupplier);
|
||||
return cached.getCibaConfig(modelSupplier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ParConfig getParPolicy() {
|
||||
if (isUpdated()) return updated.getParPolicy();
|
||||
return cached.getParConfig(session, modelSupplier);
|
||||
return cached.getParConfig(modelSupplier);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -112,8 +112,6 @@ public class CachedRealm extends AbstractExtendableRevisioned {
|
||||
protected int accessCodeLifespanUserAction;
|
||||
protected int accessCodeLifespanLogin;
|
||||
protected LazyLoader<RealmModel, OAuth2DeviceConfig> deviceConfig;
|
||||
protected LazyLoader<RealmModel, CibaConfig> cibaConfig;
|
||||
protected LazyLoader<RealmModel, ParConfig> parConfig;
|
||||
protected int actionTokenGeneratedByAdminLifespan;
|
||||
protected int actionTokenGeneratedByUserLifespan;
|
||||
protected int notBefore;
|
||||
@@ -229,8 +227,6 @@ public class CachedRealm extends AbstractExtendableRevisioned {
|
||||
accessTokenLifespanForImplicitFlow = model.getAccessTokenLifespanForImplicitFlow();
|
||||
accessCodeLifespan = model.getAccessCodeLifespan();
|
||||
deviceConfig = new DefaultLazyLoader<>(OAuth2DeviceConfig::new, null);
|
||||
cibaConfig = new DefaultLazyLoader<>(CibaConfig::new, null);
|
||||
parConfig = new DefaultLazyLoader<>(ParConfig::new, null);
|
||||
accessCodeLifespanUserAction = model.getAccessCodeLifespanUserAction();
|
||||
accessCodeLifespanLogin = model.getAccessCodeLifespanLogin();
|
||||
actionTokenGeneratedByAdminLifespan = model.getActionTokenGeneratedByAdminLifespan();
|
||||
@@ -531,12 +527,12 @@ public class CachedRealm extends AbstractExtendableRevisioned {
|
||||
return deviceConfig.get(session, modelSupplier);
|
||||
}
|
||||
|
||||
public CibaConfig getCibaConfig(KeycloakSession session, Supplier<RealmModel> modelSupplier) {
|
||||
return cibaConfig.get(session, modelSupplier);
|
||||
public CibaConfig getCibaConfig(Supplier<RealmModel> modelSupplier) {
|
||||
return new CibaConfig(modelSupplier.get());
|
||||
}
|
||||
|
||||
public ParConfig getParConfig(KeycloakSession session, Supplier<RealmModel> modelSupplier) {
|
||||
return parConfig.get(session, modelSupplier);
|
||||
public ParConfig getParConfig(Supplier<RealmModel> modelSupplier) {
|
||||
return new ParConfig(modelSupplier.get());
|
||||
}
|
||||
|
||||
public int getActionTokenGeneratedByAdminLifespan() {
|
||||
|
||||
Reference in New Issue
Block a user