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

[KEYCLOAK-11282] - Properly resolve config resolver

Browse source 
Co-authored-by: mhajas <mhajas@redhat.com>
This commit is contained in:
Pedro Igor 2020-03-11 16:40:12 -03:00 committed by Stian Thorgersen
parent 56d1ab19a8
commit 84d099e48f
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adapters/oidc/spring-boot-adapter-core/src/main/java/org/keycloak/adapters/springboot/KeycloakBaseSpringBootConfiguration.java
View file

@ -21,7 +21,6 @@ import io.undertow.servlet.api.DeploymentInfo;
import io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic; import io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic;
import io.undertow.servlet.api.WebResourceCollection; import io.undertow.servlet.api.WebResourceCollection;
import org.apache.catalina.Context; import org.apache.catalina.Context;
import org.apache.log4j.Logger;
import org.apache.tomcat.util.descriptor.web.LoginConfig; import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint; import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
@ -34,7 +33,6 @@ import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import org.keycloak.adapters.KeycloakDeploymentBuilder;
import org.keycloak.adapters.jetty.KeycloakJettyAuthenticator; import org.keycloak.adapters.jetty.KeycloakJettyAuthenticator;
import org.keycloak.adapters.undertow.KeycloakServletExtension; import org.keycloak.adapters.undertow.KeycloakServletExtension;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -54,9 +52,9 @@ public class KeycloakBaseSpringBootConfiguration {
protected KeycloakSpringBootProperties keycloakProperties; protected KeycloakSpringBootProperties keycloakProperties;
@Autowired @Autowired
public void setKeycloakSpringBootProperties(KeycloakSpringBootProperties keycloakProperties, KeycloakSpringBootConfigResolver resolver) { public void setKeycloakSpringBootProperties(KeycloakSpringBootProperties keycloakProperties) {
this.keycloakProperties = keycloakProperties; this.keycloakProperties = keycloakProperties;
resolver.setAdapterConfig(keycloakProperties); KeycloakSpringBootConfigResolverWrapper.setAdapterConfig(keycloakProperties);
} }
@Autowired @Autowired

8
adapters/oidc/spring-boot-adapter-core/src/main/java/org/keycloak/adapters/springboot/KeycloakSpringBootConfigResolverWrapper.java
View file

@ -33,6 +33,7 @@ import org.springframework.context.ApplicationContext;
public class KeycloakSpringBootConfigResolverWrapper extends KeycloakSpringConfigResolverWrapper { public class KeycloakSpringBootConfigResolverWrapper extends KeycloakSpringConfigResolverWrapper {
private static ApplicationContext context; private static ApplicationContext context;
private static KeycloakSpringBootProperties adapterConfig;
public KeycloakSpringBootConfigResolverWrapper() { public KeycloakSpringBootConfigResolverWrapper() {
super(new KeycloakSpringBootConfigResolver()); super(new KeycloakSpringBootConfigResolver());
@ -40,9 +41,16 @@ public class KeycloakSpringBootConfigResolverWrapper extends KeycloakSpringConfi
setDelegate(context.getBean(KeycloakConfigResolver.class)); setDelegate(context.getBean(KeycloakConfigResolver.class));
} catch (NoSuchBeanDefinitionException ignore) { } catch (NoSuchBeanDefinitionException ignore) {
} }
if (getDelegate() instanceof KeycloakSpringBootConfigResolver) {
KeycloakSpringBootConfigResolver.class.cast(getDelegate()).setAdapterConfig(adapterConfig);
}
} }
public static void setApplicationContext(ApplicationContext context) { public static void setApplicationContext(ApplicationContext context) {
KeycloakSpringBootConfigResolverWrapper.context = context; KeycloakSpringBootConfigResolverWrapper.context = context;
} }
public static void setAdapterConfig(KeycloakSpringBootProperties adapterConfig) {
KeycloakSpringBootConfigResolverWrapper.adapterConfig = adapterConfig;
}
} }

7
adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakAutoConfiguration.java
View file

@ -49,13 +49,6 @@ public class KeycloakAutoConfiguration extends KeycloakBaseSpringBootConfigurati
private KeycloakSpringBootProperties keycloakProperties; private KeycloakSpringBootProperties keycloakProperties;
@Autowired
public void setKeycloakSpringBootProperties(KeycloakSpringBootProperties keycloakProperties, KeycloakSpringBootConfigResolver resolver) {
this.keycloakProperties = keycloakProperties;
resolver.setAdapterConfig(keycloakProperties);
}
@Bean @Bean
public EmbeddedServletContainerCustomizer getKeycloakContainerCustomizer() { public EmbeddedServletContainerCustomizer getKeycloakContainerCustomizer() {
return new EmbeddedServletContainerCustomizer() { return new EmbeddedServletContainerCustomizer() {

4
adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/config/KeycloakSpringConfigResolverWrapper.java
View file

@ -43,4 +43,8 @@ public class KeycloakSpringConfigResolverWrapper implements KeycloakConfigResolv
protected void setDelegate(KeycloakConfigResolver delegate) { protected void setDelegate(KeycloakConfigResolver delegate) {
this.delegate = delegate; this.delegate = delegate;
} }
protected KeycloakConfigResolver getDelegate() {
return delegate;
}
} }