Set version to 4.6.0.Tmp

try to register node during authentication attempt in filter
* PreAuthActionsFilter registers deployment during authentication attempt to enable, well, node registration if filter is used by itself (if no securityConstraints when using spring boot and spring security) * deregistering node during clean shutdown * added unit test
2018-10-10 06:41:51 +00:00 · 2018-10-09 10:30:37 -03:00 · 2018-10-09 14:17:33 +02:00 · 2018-10-09 08:22:43 -03:00 · 2018-10-09 08:09:29 -03:00 · 2018-10-08 22:21:07 +02:00
600 changed files with 9634 additions and 10553 deletions
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -72,8 +72,13 @@ public class BearerTokenRequestAuthenticator {
        for (String authHeader : authHeaders) {
            String[] split = authHeader.trim().split("\\s+");
            if (split == null || split.length != 2) continue;
-            if (!split[0].equalsIgnoreCase("Bearer")) continue;
-            tokenString = split[1];
+            if (split[0].equalsIgnoreCase("Bearer")) {
+                tokenString = split[1];
+                if (log.isDebugEnabled()) {
+                    log.debugf("Found [%s] values in authorization header, selecting the first value for Bearer.", authHeaders.size());
+                }
+                break;
+            };
        }

        if (tokenString == null) {
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-as7-integration-pom</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Jetty Integration</name>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OIDC Client Adapter Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>4.5.0.Final</version>
+    <version>4.6.0.Tmp</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -32,10 +32,10 @@ import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.util.security.Constraint;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.keycloak.adapters.KeycloakConfigResolver;
 import org.keycloak.adapters.jetty.KeycloakJettyAuthenticator;
 import org.keycloak.adapters.undertow.KeycloakServletExtension;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;

 import java.util.ArrayList;
 import java.util.HashSet;
@@ -55,9 +55,9 @@ public class KeycloakBaseSpringBootConfiguration {
        KeycloakSpringBootConfigResolver.setAdapterConfig(keycloakProperties);
    }

-    @Autowired (required = false)
-    public void setKeycloakConfigResolvers(KeycloakConfigResolver configResolver) {
-        KeycloakSpringBootConfigResolver.setDelegateConfigResolver(configResolver);
+    @Autowired
+    public void setApplicationContext(ApplicationContext context) {
+        KeycloakSpringBootConfigResolverWrapper.setApplicationContext(context);
    }

    static class KeycloakBaseUndertowDeploymentInfoCustomizer  {
@@ -75,7 +75,7 @@ public class KeycloakBaseSpringBootConfiguration {

            deploymentInfo.setLoginConfig(loginConfig);

-            deploymentInfo.addInitParameter("keycloak.config.resolver", KeycloakSpringBootConfigResolver.class.getName());
+            deploymentInfo.addInitParameter("keycloak.config.resolver", KeycloakSpringBootConfigResolverWrapper.class.getName());
            deploymentInfo.addSecurityConstraints(getSecurityConstraints());

            deploymentInfo.addServletExtension(new KeycloakServletExtension());
@@ -117,7 +117,7 @@ public class KeycloakBaseSpringBootConfiguration {
        public void customize(Server server) {

            KeycloakJettyAuthenticator keycloakJettyAuthenticator = new KeycloakJettyAuthenticator();
-            keycloakJettyAuthenticator.setConfigResolver(new KeycloakSpringBootConfigResolver());
+            keycloakJettyAuthenticator.setConfigResolver(new KeycloakSpringBootConfigResolverWrapper());

            /* see org.eclipse.jetty.webapp.StandardDescriptorProcessor#visitSecurityConstraint for an example
               on how to map servlet spec to Constraints */
@@ -268,7 +268,7 @@ public class KeycloakBaseSpringBootConfiguration {
                context.addConstraint(tomcatConstraint);
            }

-            context.addParameter("keycloak.config.resolver", KeycloakSpringBootConfigResolver.class.getName());
+            context.addParameter("keycloak.config.resolver", KeycloakSpringBootConfigResolverWrapper.class.getName());
        }
    }
 }
@@ -17,7 +17,6 @@

 package org.keycloak.adapters.springboot;

-import org.keycloak.adapters.KeycloakConfigResolver;
 import org.keycloak.adapters.KeycloakDeployment;
 import org.keycloak.adapters.KeycloakDeploymentBuilder;
 import org.keycloak.adapters.OIDCHttpFacade;
@@ -25,31 +24,22 @@ import org.keycloak.representations.adapters.config.AdapterConfig;

 public class KeycloakSpringBootConfigResolver implements org.keycloak.adapters.KeycloakConfigResolver {

-    private static AdapterConfig adapterConfig;
-    private static KeycloakConfigResolver delegateConfigResolver;
-
    private KeycloakDeployment keycloakDeployment;

+    private static AdapterConfig adapterConfig;
+
    @Override
    public KeycloakDeployment resolve(OIDCHttpFacade.Request request) {
-        if (delegateConfigResolver == null) {
-            if (keycloakDeployment != null) {
-                return keycloakDeployment;
-            }
-
-            keycloakDeployment = KeycloakDeploymentBuilder.build(KeycloakSpringBootConfigResolver.adapterConfig);
-
+        if (keycloakDeployment != null) {
            return keycloakDeployment;
        }

-        return delegateConfigResolver.resolve(request);
+        keycloakDeployment = KeycloakDeploymentBuilder.build(KeycloakSpringBootConfigResolver.adapterConfig);
+
+        return keycloakDeployment;
    }

    static void setAdapterConfig(AdapterConfig adapterConfig) {
        KeycloakSpringBootConfigResolver.adapterConfig = adapterConfig;
    }
-
-    static void setDelegateConfigResolver(KeycloakConfigResolver configResolver) {
-        KeycloakSpringBootConfigResolver.delegateConfigResolver = configResolver;
-    }
 }
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.keycloak.adapters.springboot;
+
+import org.keycloak.adapters.KeycloakConfigResolver;
+import org.keycloak.adapters.springsecurity.config.KeycloakSpringConfigResolverWrapper;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * <p>A specific implementation of {@link KeycloakSpringConfigResolverWrapper} that first tries to register any {@link KeycloakConfigResolver}
+ * instance provided by the application. if none is provided, {@link KeycloakSpringBootConfigResolver} is set.
+ *
+ * <p>This implementation is specially useful when using Spring Boot and Spring Security in the same application where the same {@link KeycloakConfigResolver}
+ * instance must be used across the different stacks.
+ *
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+public class KeycloakSpringBootConfigResolverWrapper extends KeycloakSpringConfigResolverWrapper {
+
+    private static ApplicationContext context;
+
+    public KeycloakSpringBootConfigResolverWrapper() {
+        super(new KeycloakSpringBootConfigResolver());
+        try {
+            setDelegate(context.getBean(KeycloakConfigResolver.class));
+        } catch (NoSuchBeanDefinitionException ignore) {
+        }
+    }
+
+    public static void setApplicationContext(ApplicationContext context) {
+        KeycloakSpringBootConfigResolverWrapper.context = context;
+    }
+}
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.keycloak.adapters.springboot.KeycloakAutoConfiguration
@@ -4,7 +4,7 @@
    <parent>
      <artifactId>keycloak-parent</artifactId>
      <groupId>org.keycloak</groupId>
-      <version>4.5.0.Final</version>
+      <version>4.6.0.Tmp</version>
      <relativePath>../../../pom.xml</relativePath>
    </parent>
    <artifactId>spring-boot-container-bundle</artifactId>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>4.5.0.Final</version>
+    <version>4.6.0.Tmp</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>4.5.0.Final</version>
+    <version>4.6.0.Tmp</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.keycloak.adapters.springsecurity.config;
+
+import org.keycloak.adapters.KeycloakConfigResolver;
+import org.keycloak.adapters.KeycloakDeployment;
+import org.keycloak.adapters.spi.HttpFacade;
+
+/**
+ * Spring applications may use different security stacks in order to enforce access based on the configuration provided
+ * by a {@code KeycloakDeployment}. This implementation of {@code KeycloakConfigResolver} wraps and avoid calling multiple
+ * {@code KeycloakConfigResolver} instances but only those defined by applications or set as default by the configuration.
+ *
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+public class KeycloakSpringConfigResolverWrapper implements KeycloakConfigResolver {
+
+    private KeycloakConfigResolver delegate;
+
+    public KeycloakSpringConfigResolverWrapper(KeycloakConfigResolver delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public KeycloakDeployment resolve(HttpFacade.Request facade) {
+        return delegate.resolve(facade);
+    }
+
+    protected void setDelegate(KeycloakConfigResolver delegate) {
+        this.delegate = delegate;
+    }
+}
@@ -65,7 +65,7 @@ public abstract class KeycloakWebSecurityConfigurerAdapter extends WebSecurityCo
    protected AdapterDeploymentContext adapterDeploymentContext() throws Exception {
        AdapterDeploymentContextFactoryBean factoryBean;
        if (keycloakConfigResolver != null) {
-             factoryBean = new AdapterDeploymentContextFactoryBean(keycloakConfigResolver);
+             factoryBean = new AdapterDeploymentContextFactoryBean(new KeycloakSpringConfigResolverWrapper(keycloakConfigResolver));
        }
        else {
            factoryBean = new AdapterDeploymentContextFactoryBean(keycloakConfigFileResource);
@@ -48,10 +48,11 @@ public class KeycloakPreAuthActionsFilter extends GenericFilterBean implements A

    private static final Logger log = LoggerFactory.getLogger(KeycloakPreAuthActionsFilter.class);

-    private final NodesRegistrationManagement management = new NodesRegistrationManagement();
+    private NodesRegistrationManagement nodesRegistrationManagement = new NodesRegistrationManagement();
    private ApplicationContext applicationContext;
    private AdapterDeploymentContext deploymentContext;
    private UserSessionManagement userSessionManagement;
+    private PreAuthActionsHandlerFactory preAuthActionsHandlerFactory = new PreAuthActionsHandlerFactory();

    public KeycloakPreAuthActionsFilter() {
        super();
@@ -69,7 +70,7 @@ public class KeycloakPreAuthActionsFilter extends GenericFilterBean implements A
    @Override
    public void destroy() {
        log.debug("Unregistering deployment");
-        management.stop();
+        nodesRegistrationManagement.stop();
    }

    @Override
@@ -77,7 +78,8 @@ public class KeycloakPreAuthActionsFilter extends GenericFilterBean implements A
            throws IOException, ServletException {

        HttpFacade facade = new SimpleHttpFacade((HttpServletRequest)request, (HttpServletResponse)response);
-        PreAuthActionsHandler handler = new PreAuthActionsHandler(userSessionManagement, deploymentContext, facade);
+        nodesRegistrationManagement.tryRegister(deploymentContext.resolveDeployment(facade));
+        PreAuthActionsHandler handler = preAuthActionsHandlerFactory.createPreAuthActionsHandler(facade);
        if (handler.handleRequest()) {
            log.debug("Pre-auth filter handled request: {}", ((HttpServletRequest) request).getRequestURI());
        } else {
@@ -93,4 +95,23 @@ public class KeycloakPreAuthActionsFilter extends GenericFilterBean implements A
    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
        this.applicationContext = applicationContext;
    }
+    
+    void setNodesRegistrationManagement(NodesRegistrationManagement nodesRegistrationManagement) {
+        this.nodesRegistrationManagement = nodesRegistrationManagement;
+    }
+    
+    void setPreAuthActionsHandlerFactory(PreAuthActionsHandlerFactory preAuthActionsHandlerFactory) {
+        this.preAuthActionsHandlerFactory = preAuthActionsHandlerFactory;
+    }
+    
+    /**
+     * Creates {@link PreAuthActionsHandler}s.
+     * 
+     * Package-private class to enable mocking.
+     */
+    class PreAuthActionsHandlerFactory {
+        PreAuthActionsHandler createPreAuthActionsHandler(HttpFacade facade) {
+            return new PreAuthActionsHandler(userSessionManagement, deploymentContext, facade);
+        }
+    }
 }
@@ -0,0 +1,90 @@
+package org.keycloak.adapters.springsecurity.filter;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import javax.servlet.FilterChain;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.keycloak.adapters.AdapterDeploymentContext;
+import org.keycloak.adapters.KeycloakDeployment;
+import org.keycloak.adapters.NodesRegistrationManagement;
+import org.keycloak.adapters.PreAuthActionsHandler;
+import org.keycloak.adapters.spi.HttpFacade;
+import org.keycloak.adapters.spi.UserSessionManagement;
+import org.keycloak.adapters.springsecurity.filter.KeycloakPreAuthActionsFilter.PreAuthActionsHandlerFactory;
+import org.mockito.Mock;
+import org.springframework.context.ApplicationContext;
+
+public class KeycloakPreAuthActionsFilterTest {
+
+    private KeycloakPreAuthActionsFilter filter;
+    
+    @Mock
+    private NodesRegistrationManagement nodesRegistrationManagement;
+    @Mock
+    private ApplicationContext applicationContext;
+    @Mock
+    private AdapterDeploymentContext deploymentContext;
+    @Mock
+    private PreAuthActionsHandlerFactory preAuthActionsHandlerFactory;
+    @Mock
+    private UserSessionManagement userSessionManagement;
+    @Mock
+    private PreAuthActionsHandler preAuthActionsHandler;
+    @Mock
+    private KeycloakDeployment deployment;
+
+    @Mock
+    private HttpServletRequest request;
+    @Mock
+    private HttpServletResponse response;
+    @Mock
+    private FilterChain chain;
+    
+    @Before
+    public void setUp() throws Exception {
+        initMocks(this);
+        filter = new KeycloakPreAuthActionsFilter(userSessionManagement);
+        filter.setNodesRegistrationManagement(nodesRegistrationManagement);
+        filter.setApplicationContext(applicationContext);
+        filter.setPreAuthActionsHandlerFactory(preAuthActionsHandlerFactory);
+        when(applicationContext.getBean(AdapterDeploymentContext.class)).thenReturn(deploymentContext);
+        when(deploymentContext.resolveDeployment(any(HttpFacade.class))).thenReturn(deployment);
+        when(preAuthActionsHandlerFactory.createPreAuthActionsHandler(any(HttpFacade.class))).thenReturn(preAuthActionsHandler);
+        filter.initFilterBean();
+    }
+    
+    @Test
+    public void shouldIgnoreChainWhenPreAuthActionHandlerHandled() throws Exception {
+        when(preAuthActionsHandler.handleRequest()).thenReturn(true);
+        
+        filter.doFilter(request, response, chain);
+        
+        verifyZeroInteractions(chain);
+        verify(nodesRegistrationManagement).tryRegister(deployment);
+    }
+    
+    @Test
+    public void shouldContinueChainWhenPreAuthActionHandlerDidNotHandle() throws Exception {
+        when(preAuthActionsHandler.handleRequest()).thenReturn(false);
+        
+        filter.doFilter(request, response, chain);
+        
+        verify(chain).doFilter(request, response);;
+        verify(nodesRegistrationManagement).tryRegister(deployment);
+    }
+    
+    @After
+    public void tearDown() {
+        filter.destroy();
+        verify(nodesRegistrationManagement).stop();
+    }
+}
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Tomcat Integration</name>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak WildFly Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Adapters</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML EAP Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Jetty Integration</name>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Client Adapter Modules</name>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Tomcat Integration</name>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -79,7 +79,7 @@ class KeycloakHttpServerAuthenticationMechanism implements HttpServerAuthenticat
            return;
        }

-        if (httpFacade.getRequest().getRelativePath().contains(deployment.getLogoutPage())) {
+        if (deployment.getLogoutPage() != null && httpFacade.getRequest().getRelativePath().contains(deployment.getLogoutPage())) {
            LOGGER.debugf("Ignoring request for [%s] and logout page [%s].", request.getRequestURI(), deployment.getLogoutPage());
            httpFacade.authenticationCompleteAnonymous();
            return;
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Wildfly Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Client Adapter SPI Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.5.0.Final</version>
+		<version>4.6.0.Tmp</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -25,7 +25,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -16,9 +16,30 @@
 */
 package org.keycloak.authorization.policy.provider.permission;

+import org.keycloak.authorization.identity.Identity;
+import org.keycloak.authorization.model.Resource;
+import org.keycloak.authorization.permission.ResourcePermission;
+import org.keycloak.authorization.policy.evaluation.Evaluation;
+
 /**
 * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
 */
 public class UMAPolicyProvider extends AbstractPermissionProvider {

+    @Override
+    public void evaluate(Evaluation evaluation) {
+        ResourcePermission permission = evaluation.getPermission();
+        Resource resource = permission.getResource();
+
+        if (resource != null) {
+            Identity identity = evaluation.getContext().getIdentity();
+
+            // no need to evaluate UMA permissions to resource owner resources
+            if (resource.getOwner().equals(identity.getId())) {
+                return;
+            }
+        }
+
+        super.evaluate(evaluation);
+    }
 }
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -104,7 +104,7 @@ public class DroolsPolicyProviderFactory implements PolicyProviderFactory<RulePo

    @Override
    public void init(Config.Scope config) {
-        this.ks = Factory.get();
+        this.ks = KieServices.get();
    }

    @Override
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.keycloak.bom</groupId>
        <artifactId>keycloak-bom-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
    </parent>

    <groupId>org.keycloak.bom</groupId>
@@ -37,107 +37,107 @@
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-core</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-adapter-core</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-adapter-spi</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-wildfly-adapter-dist</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-saml-adapter-core</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-saml-adapter-api-public</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-tomcat8-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-tomcat7-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-tomcat6-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty81-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty91-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty92-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty93-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-undertow-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-boot-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-boot-2-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>spring-boot-container-bundle</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-security-adapter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-boot-starter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-legacy-spring-boot-starter</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-authz-client</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@@ -26,7 +26,7 @@

    <groupId>org.keycloak.bom</groupId>
    <artifactId>keycloak-bom-parent</artifactId>
-    <version>4.5.0.Final</version>
+    <version>4.6.0.Tmp</version>

    <packaging>pom</packaging>

@@ -23,7 +23,7 @@
    <parent>
        <groupId>org.keycloak.bom</groupId>
        <artifactId>keycloak-bom-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
    </parent>

    <groupId>org.keycloak.bom</groupId>
@@ -38,12 +38,12 @@
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-core</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-server-spi</artifactId>
-                <version>4.5.0.Final</version>
+                <version>4.6.0.Tmp</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -33,6 +33,14 @@ public class MultivaluedHashMap<K, V> extends HashMap<K, List<V>>
   public MultivaluedHashMap() {
   }

+   public MultivaluedHashMap(Map<K, List<V>> map) {
+      if (map == null) {
+         throw new IllegalArgumentException("Map can not be null");
+      }
+      putAll(map);
+   }
+
+
   public MultivaluedHashMap(MultivaluedHashMap<K, V> config) {
      addAll(config);
   }
@@ -42,7 +42,38 @@ public class ObjectUtil {
        return str1.equals(str2);
    }

+
    public static String capitalize(String str) {
        return str.substring(0, 1).toUpperCase() + str.substring(1);
    }
+
+
+    /**
+     * Forked from apache-commons StringUtils
+     *
+     * <p>Checks if a CharSequence is whitespace, empty ("") or null.</p>
+     *
+     * <pre>
+     * ObjectUtil.isBlank(null)      = true
+     * ObjectUtil.isBlank("")        = true
+     * ObjectUtil.isBlank(" ")       = true
+     * ObjectUtil.isBlank("bob")     = false
+     * ObjectUtil.isBlank("  bob  ") = false
+     * </pre>
+     *
+     * @param cs
+     * @return {@code true} if the CharSequence is null, empty or whitespace
+     */
+    public static boolean isBlank(final CharSequence cs) {
+        int strLen;
+        if (cs == null || (strLen = cs.length()) == 0) {
+            return true;
+        }
+        for (int i = 0; i < strLen; i++) {
+            if (!Character.isWhitespace(cs.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -28,6 +28,7 @@ public class ProtocolMapperTypeRepresentation {
    protected String name;
    protected String category;
    protected String helpText;
+    protected int priority;

    protected List<ConfigPropertyRepresentation> properties;

@@ -63,6 +64,14 @@ public class ProtocolMapperTypeRepresentation {
        this.helpText = helpText;
    }

+    public int getPriority() {
+        return priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+
    public List<ConfigPropertyRepresentation> getProperties() {
        return properties;
    }
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -18,23 +18,22 @@

    <properties>
        <aopalliance.version>1.0</aopalliance.version>
-        <xstream.version>1.4.9</xstream.version>
-        <antlr-runtime.version>3.5</antlr-runtime.version>
-        <ant.version>1.8.3</ant.version>
-        <maven.version>3.2.5</maven.version>
-        <wagon.version>2.6</wagon.version>
+        <xstream.version>1.4.10</xstream.version>
+        <antlr-runtime.version>3.5.2</antlr-runtime.version>
+        <ant.version>1.8.4</ant.version>
+        <maven.version>3.3.9</maven.version>
+        <wagon.version>3.0.0</wagon.version>
        <plexus-classworlds.version>2.5.2</plexus-classworlds.version>
-        <plexus-component-annotations.version>1.5.5</plexus-component-annotations.version>
+        <plexus-component-annotations.version>1.6</plexus-component-annotations.version>
        <plexus-interpolation.version>1.21</plexus-interpolation.version>
-        <plexus-utils.version>3.0.20</plexus-utils.version>
-        <aether.version>1.0.0.v20140518</aether.version>
-        <sisu.version>0.3.0.M1</sisu.version>
-        <mvel2.version>2.2.8.Final</mvel2.version>
+        <plexus-utils.version>3.0.22</plexus-utils.version>
+        <aether.version>1.1.0</aether.version>
+        <org.eclipse.sisu>0.3.2</org.eclipse.sisu>
+        <mvel2.version>2.4.0.Final</mvel2.version>
        <plexus-cipher.version>1.7</plexus-cipher.version>
        <plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
-        <sisu-guice.version>3.2.3</sisu-guice.version>
+        <sisu-guice.version>4.0</sisu-guice.version>
        <ecj.version>4.4.2</ecj.version>
-        <itext.version>2.1.2</itext.version>
    </properties>

    <dependencyManagement>
@@ -46,6 +45,13 @@
                <version>${version.org.drools}</version>
                <scope>import</scope>
            </dependency>
+            <dependency>
+                <groupId>org.kie.soup</groupId>
+                <artifactId>kie-soup-bom</artifactId>
+                <type>pom</type>
+                <version>${version.org.drools}</version>
+                <scope>import</scope>
+            </dependency>

            <dependency>
                <groupId>aopalliance</groupId>
@@ -122,6 +128,11 @@
                <artifactId>maven-settings-builder</artifactId>
                <version>${maven.version}</version>
            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-builder-support</artifactId>
+                <version>${maven.version}</version>
+            </dependency>
            <dependency>
                <groupId>org.apache.maven.wagon</groupId>
                <artifactId>wagon-http</artifactId>
@@ -200,12 +211,12 @@
            <dependency>
                <groupId>org.eclipse.sisu</groupId>
                <artifactId>org.eclipse.sisu.inject</artifactId>
-                <version>${sisu.version}</version>
+                <version>${org.eclipse.sisu}</version>
            </dependency>
            <dependency>
                <groupId>org.eclipse.sisu</groupId>
                <artifactId>org.eclipse.sisu.plexus</artifactId>
-                <version>${sisu.version}</version>
+                <version>${org.eclipse.sisu}</version>
            </dependency>
            <dependency>
                <groupId>org.mvel</groupId>
@@ -223,13 +234,19 @@
                <version>${plexus-sec-dispatcher.version}</version>
            </dependency>
            <dependency>
-                <groupId>org.sonatype.sisu.inject</groupId>
+                <groupId>com.google.inject.extensions</groupId>
                <artifactId>guice-servlet</artifactId>
                <version>${sisu-guice.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.inject</groupId>
+                        <artifactId>guice</artifactId>
+                    </exclusion>
+                </exclusions>
            </dependency>
            <dependency>
-                <groupId>org.sonatype.sisu</groupId>
-                <artifactId>sisu-guice</artifactId>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
                <classifier>no_aop</classifier>
                <version>${sisu-guice.version}</version>
            </dependency>
@@ -238,21 +255,6 @@
                <artifactId>ecj</artifactId>
                <version>${ecj.version}</version>
            </dependency>
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext</artifactId>
-                <version>${itext.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>bouncycastle</groupId>
-                        <artifactId>bcmail-jdk14</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>bouncycastle</groupId>
-                        <artifactId>bcprov-jdk14</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
        </dependencies>
    </dependencyManagement>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.5.0.Final</version>
+        <version>4.6.0.Tmp</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
keycloak-bot	176c9a173d	Set version to 4.6.0.Tmp	2018-10-10 06:41:51 +00:00
Frank Schmager	6b59c2f44c	try to register node during authentication attempt in filter * PreAuthActionsFilter registers deployment during authentication attempt to enable, well, node registration if filter is used by itself (if no securityConstraints when using spring boot and spring security) * deregistering node during clean shutdown * added unit test	2018-10-09 10:30:37 -03:00
sebastienblanc	fd0ab4a626	removing spring factories from core module	2018-10-09 14:17:33 +02:00
Toni Ristola	22d64368a6	KEYCLOAK-8191 Fixed DI that was not working	2018-10-09 08:22:43 -03:00
Pedro Igor	79ca722b49	[KEYCLOAK-7605] - Make sure Evaluation API is read-only	2018-10-09 08:09:29 -03:00
Takashi Mogi	c3f1bd5a25	KEYCLOAK-8342 Add core-management module to standalone and standaloen-ha	2018-10-08 22:21:07 +02:00
mposolda	3ca386f223	KEYCLOAK-8148 Duplication of listed roles assigned through groups in userinfo endpoint	2018-10-08 22:18:06 +02:00
Sebastian Häni	00f4b54730	themes: add german messages to admin theme	2018-10-08 21:54:30 +02:00
Stan Silvert	a8ab1fea58	KEYCLOAK-8420: Create Hello React	2018-10-08 15:43:35 -04:00
Pedro Igor	8e57cee30f	[KEYCLOAK-8445] - Owner not granted with permissions when using only scope-based permissions	2018-10-08 09:57:21 -03:00
Hynek Mlnarik	7f1c03a122	KEYCLOAK-8462 Close delegates properly	2018-10-08 14:45:48 +02:00
Pedro Igor	6fd4a02f95	[KEYCLOAK-8444] - Error when producing KeycloakSpringBootConfigResolver from spring security configuration	2018-10-08 09:29:59 -03:00
Hynek Mlnarik	531ee3a1be	KEYCLOAK-8494 Use c3p0 connection pool in testsuite	2018-10-08 14:24:56 +02:00
Mark True	28b6e4dd5b	cleaning up to do PR	2018-10-08 09:16:53 +02:00
Moritz Becker	f17b5f0f49	fix KEYCLOAK-7572 consistently perform duplicate user checks during account update only if email changes Fix test	2018-10-05 09:35:05 +02:00
stianst	86a2f28561	KEYCLOAK-8310 Add support to set fixed scheme on fixed hostname provider	2018-10-05 09:34:17 +02:00
mposolda	0d9b1e73b8	KEYCLOAK-7855 Cannot reset Client Consent Screen Text	2018-10-04 21:00:48 +02:00
k-tamura	fe0db7fe44	Update Japanese properties for 4.0	2018-10-04 20:59:38 +02:00
stianst	6ebc6c0354	KEYCLOAK-8437 Remove Keycloak demo dist	2018-10-04 20:54:23 +02:00
wildloop	a82f0ab657	Translation to Polish language	2018-10-04 20:50:58 +02:00
Pedro Igor	0a6e22ba54	[KEYCLOAK-8412] - Upgrade to Drools 7.11.0.Final	2018-10-04 09:41:41 -03:00
Hynek Mlnarik	211774ccbc	KEYCLOAK-7810 Fix NPE in Elytron SAML adapter	2018-10-04 14:38:45 +02:00
gbtec-igormartens	c41bcddd8d	Update UserResource.java In my opinion, the old documentation does not match the actual behaviour of the resetPassword method.	2018-10-04 12:54:49 +02:00
mposolda	2a4cee6044	KEYCLOAK-6884 KEYCLOAK-3454 KEYCLOAK-8298 Default 'roles' and 'web-origins' client scopes. Add roles and allowed-origins to the token through protocol mappers	2018-10-04 12:00:38 +02:00
Stan Silvert	dba513c921	KEYCLOAK-8419: Make most act mgt APIs only active in preview mode	2018-10-02 16:32:56 -04:00
Pedro Igor	b4b3527df7	[KEYCLOAK-7950] - Fixes user pagination when using filtering users members of groups	2018-10-02 15:44:23 -03:00
Hynek Mlnarik	17a1a33987	KEYCLOAK-7740 Support parsing of xs:date type	2018-10-02 19:54:40 +02:00
mposolda	4b9b189016	KEYCLOAK-8008 Ensure InputStream are closed	2018-10-01 16:06:32 +02:00
Sebastian Laskawiec	e1ecf94428	KEYCLOAK-6807 Refactor TestHelper	2018-10-01 09:39:42 -03:00
Pedro Igor	2da758ac86	[KEYCLOAK-6928] - Selecting first bearer if multiple values exists in authorization header	2018-10-01 09:36:10 -03:00
Martin Kanis	efe6a38648	KEYCLOAK-6718 Auth Flow does not Check Client Protocol	2018-09-26 21:00:02 +02:00
stianst	c3fc9e9815	Set version to 4.6.0.Final-SNAPSHOT	2018-09-26 20:58:41 +02:00