upstream/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-02-18 18:37:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Use cached realm attributes for PAR and CIBA config
Some checks failed
Weblate Sync / Trigger Weblate to pull the latest changes (push) Has been cancelled
Details

Browse source 
Closes #46100

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 2026-02-09 18:12:08 +00:00 committed by GitHub
parent 24193928c3
commit c438da8d8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 72 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java vendored
View file

@ -528,11 +528,11 @@ public class CachedRealm extends AbstractExtendableRevisioned {
}
public CibaConfig getCibaConfig(Supplier<RealmModel> modelSupplier) {
return new CibaConfig(modelSupplier.get());
return CibaConfig.fromCache(modelSupplier, Collections.unmodifiableMap(attributes));
}
public ParConfig getParConfig(Supplier<RealmModel> modelSupplier) {
return new ParConfig(modelSupplier.get());
return ParConfig.fromCache(modelSupplier, Collections.unmodifiableMap(attributes));
}
public int getActionTokenGeneratedByAdminLifespan() {

4
model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
View file

@ -642,12 +642,12 @@ public class RealmAdapter implements StorageProviderRealmModel, JpaModel<RealmEn
@Override
public CibaConfig getCibaPolicy() {
return new CibaConfig(this);
return CibaConfig.fromModel(this);
}
@Override
public ParConfig getParPolicy() {
return new ParConfig(this);
return ParConfig.fromModel(this);
}
@Override

15
server-spi/src/main/java/org/keycloak/models/AbstractConfig.java
View file

@ -17,8 +17,11 @@
package org.keycloak.models;
import java.io.Serializable;
import java.util.Map;
import java.util.function.Supplier;
import org.keycloak.utils.StringUtil;
public abstract class AbstractConfig implements Serializable {
@Deprecated(since = "26.5", forRemoval = true)
@ -40,4 +43,16 @@ public abstract class AbstractConfig implements Serializable {
realm.setAttribute(name, value);
}
}
protected static int getIntAttribute(Map<String, String> attributes, String name, int defaultValue) {
var value = attributes.get(name);
if (StringUtil.isBlank(value)) {
return defaultValue;
}
try {
return Integer.parseInt(value);
} catch (NumberFormatException e) {
return defaultValue;
}
}
}

31
server-spi/src/main/java/org/keycloak/models/CibaConfig.java
View file

@ -18,6 +18,9 @@ package org.keycloak.models;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Supplier;
import org.keycloak.jose.jws.Algorithm;
import org.keycloak.utils.StringUtil;
@ -53,6 +56,10 @@ public class CibaConfig extends AbstractConfig {
public static final String CIBA_BACKCHANNEL_CLIENT_NOTIFICATION_ENDPOINT = "ciba.backchannel.client.notification.endpoint";
public static final String CIBA_BACKCHANNEL_AUTH_REQUEST_SIGNING_ALG = "ciba.backchannel.auth.request.signing.alg";
/**
* @deprecated use {@link #fromCache(Supplier, Map)} or {@link #fromModel(RealmModel)} factory methods
*/
@Deprecated(since = "26.6", forRemoval = true)
public CibaConfig(RealmModel realm) {
this.backchannelTokenDeliveryMode = realm.getAttribute(CIBA_BACKCHANNEL_TOKEN_DELIVERY_MODE);
if (this.backchannelTokenDeliveryMode == null) {
@ -71,6 +78,30 @@ public class CibaConfig extends AbstractConfig {
this.realmForWrite = () -> realm;
}
private CibaConfig(Supplier<RealmModel> realmForWrite, String authRequestedUserHint, String backChannelTokenDeliveryMode, int expiresIn, int poolingInterval) {
this.authRequestedUserHint = authRequestedUserHint;
this.backchannelTokenDeliveryMode = backChannelTokenDeliveryMode;
this.expiresIn = expiresIn;
this.poolingInterval = poolingInterval;
this.realmForWrite = realmForWrite;
}
public static CibaConfig fromModel(RealmModel realm) {
var backChannelTokenDeliveryMode = Objects.requireNonNullElse(realm.getAttribute(CIBA_BACKCHANNEL_TOKEN_DELIVERY_MODE), DEFAULT_CIBA_POLICY_TOKEN_DELIVERY_MODE);
var authRequestedUserHint = Objects.requireNonNullElse(realm.getAttribute(CIBA_AUTH_REQUESTED_USER_HINT), DEFAULT_CIBA_POLICY_AUTH_REQUESTED_USER_HINT);
var expiresIn = realm.getAttribute(CIBA_EXPIRES_IN, DEFAULT_CIBA_POLICY_EXPIRES_IN);
var poolingInterval = realm.getAttribute(CIBA_INTERVAL, DEFAULT_CIBA_POLICY_INTERVAL);
return new CibaConfig(() -> realm, authRequestedUserHint, backChannelTokenDeliveryMode, expiresIn, poolingInterval);
}
public static CibaConfig fromCache(Supplier<RealmModel> realmForWrite, Map<String, String> realmAttributes) {
var backChannelTokenDeliveryMode = realmAttributes.getOrDefault(CIBA_BACKCHANNEL_TOKEN_DELIVERY_MODE, DEFAULT_CIBA_POLICY_TOKEN_DELIVERY_MODE);
var authRequestedUserHint = realmAttributes.getOrDefault(CIBA_AUTH_REQUESTED_USER_HINT, DEFAULT_CIBA_POLICY_AUTH_REQUESTED_USER_HINT);
var expiresIn = getIntAttribute(realmAttributes, CIBA_EXPIRES_IN, DEFAULT_CIBA_POLICY_EXPIRES_IN);
var poolingInterval = getIntAttribute(realmAttributes, CIBA_INTERVAL, DEFAULT_CIBA_POLICY_INTERVAL);
return new CibaConfig(realmForWrite, authRequestedUserHint, backChannelTokenDeliveryMode, expiresIn, poolingInterval);
}
public String getBackchannelTokenDeliveryMode(ClientModel client) {
String mode = client.getAttribute(CIBA_BACKCHANNEL_TOKEN_DELIVERY_MODE_PER_CLIENT);
if (StringUtil.isBlank(mode)) {

22
server-spi/src/main/java/org/keycloak/models/ParConfig.java
View file

@ -16,6 +16,9 @@
*/
package org.keycloak.models;
import java.util.Map;
import java.util.function.Supplier;
public class ParConfig extends AbstractConfig {
// realm attribute names
@ -29,12 +32,31 @@ public class ParConfig extends AbstractConfig {
// client attribute names
public static final String REQUIRE_PUSHED_AUTHORIZATION_REQUESTS = "require.pushed.authorization.requests";
/**
* @deprecated use {@link #fromCache(Supplier, Map)} or {@link #fromModel(RealmModel)} factory methods
*/
@Deprecated(since = "26.6", forRemoval = true)
public ParConfig(RealmModel realm) {
this.requestUriLifespan = realm.getAttribute(PAR_REQUEST_URI_LIFESPAN, DEFAULT_PAR_REQUEST_URI_LIFESPAN);
this.realmForWrite = () -> realm;
}
private ParConfig(Supplier<RealmModel> realmForWrite, int requestUriLifespan) {
this.requestUriLifespan = requestUriLifespan;
this.realmForWrite = realmForWrite;
}
public static ParConfig fromModel(RealmModel realm) {
var requestUriLifespan = realm.getAttribute(PAR_REQUEST_URI_LIFESPAN, DEFAULT_PAR_REQUEST_URI_LIFESPAN);
return new ParConfig(() -> realm, requestUriLifespan);
}
public static ParConfig fromCache(Supplier<RealmModel> realmForWrite, Map<String, String> realmAttributes) {
var requestUriLifespan = getIntAttribute(realmAttributes, PAR_REQUEST_URI_LIFESPAN, DEFAULT_PAR_REQUEST_URI_LIFESPAN);
return new ParConfig(realmForWrite, requestUriLifespan);
}
public int getRequestUriLifespan() {
return requestUriLifespan;
}