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

[KEYCLOAK-9353] - Avoids initialization of the policy enforcer during deployment

Browse source
This commit is contained in:
Pedro Igor 2019-04-03 17:16:24 -03:00 committed by Bruno Oliveira da Silva
parent a516a795a2
commit ad9f59f9f7
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
View file

@ -33,6 +33,7 @@ import org.keycloak.representations.adapters.config.AdapterConfig;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
import java.util.concurrent.Callable;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@ -469,7 +470,7 @@ public class AdapterDeploymentContext {
}
@Override
public void setPolicyEnforcer(PolicyEnforcer policyEnforcer) {
public void setPolicyEnforcer(Callable<PolicyEnforcer> policyEnforcer) {
delegate.setPolicyEnforcer(policyEnforcer);
}

13
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeployment.java
View file

@ -89,7 +89,7 @@ public class KeycloakDeployment {
protected int tokenMinimumTimeToLive;
protected int minTimeBetweenJwksRequests;
protected int publicKeyCacheTtl;
private PolicyEnforcer policyEnforcer;
protected Callable<PolicyEnforcer> policyEnforcer;
// https://tools.ietf.org/html/rfc7636
protected boolean pkce = false;
@ -464,12 +464,19 @@ public class KeycloakDeployment {
this.publicKeyCacheTtl = publicKeyCacheTtl;
}
public void setPolicyEnforcer(PolicyEnforcer policyEnforcer) {
public void setPolicyEnforcer(Callable<PolicyEnforcer> policyEnforcer) {
this.policyEnforcer = policyEnforcer;
}
public PolicyEnforcer getPolicyEnforcer() {
return policyEnforcer;
if (policyEnforcer == null) {
return null;
}
try {
return policyEnforcer.call();
} catch (Exception cause) {
throw new RuntimeException("Failed to obtain policy enforcer", cause);
}
}
// https://tools.ietf.org/html/rfc7636

19
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
View file

@ -53,7 +53,7 @@ public class KeycloakDeploymentBuilder {
}
protected KeycloakDeployment internalBuild(AdapterConfig adapterConfig) {
protected KeycloakDeployment internalBuild(final AdapterConfig adapterConfig) {
if (adapterConfig.getRealm() == null) throw new RuntimeException("Must set 'realm' in config");
deployment.setRealm(adapterConfig.getRealm());
String resource = adapterConfig.getResource();
@ -143,10 +143,23 @@ public class KeycloakDeploymentBuilder {
deployment.setTurnOffChangeSessionIdOnLogin(adapterConfig.getTurnOffChangeSessionIdOnLogin());
}
PolicyEnforcerConfig policyEnforcerConfig = adapterConfig.getPolicyEnforcerConfig();
final PolicyEnforcerConfig policyEnforcerConfig = adapterConfig.getPolicyEnforcerConfig();
if (policyEnforcerConfig != null) {
deployment.setPolicyEnforcer(new PolicyEnforcer(deployment, adapterConfig));
deployment.setPolicyEnforcer(new Callable<PolicyEnforcer>() {
PolicyEnforcer policyEnforcer;
@Override
public PolicyEnforcer call() {
if (policyEnforcer == null) {
synchronized (deployment) {
if (policyEnforcer == null) {
policyEnforcer = new PolicyEnforcer(deployment, adapterConfig);
}
}
}
return policyEnforcer;
}
});
}
log.debug("Use authServerUrl: " + deployment.getAuthServerBaseUrl() + ", tokenUrl: " + deployment.getTokenUrl() + ", relativeUrls: " + deployment.getRelativeUrls());