KEYCLOAK-8264 Update OpenShift Token Review endpoint to support additional algorithms and to update session last refresh on token introspection

KEYCLOAK-8263 Add option to client to override access token timeout
KEYCLOAK-7560 Refactor token signature SPI PR
2018-09-11 14:18:13 +02:00 · 2018-09-11 12:40:51 +02:00 · 2018-09-11 08:14:10 +02:00 · 2018-09-11 08:14:10 +02:00 · 2018-09-10 21:17:00 +02:00 · 2018-09-10 20:31:04 +02:00
920 changed files with 17657 additions and 4194 deletions
@@ -8,6 +8,9 @@
 .project
 .settings
 .classpath
+bin/
+.factorypath
+

 # NetBeans #
 ############
@@ -54,4 +57,4 @@ target
 ##########
 # KEYCLOAK-5391: We will re-exclude node_modules when node_modules handling is worked out.
 # For now, we keep our js libraries checked into GitHub, so we don't ignore.
-#node_modules
+#node_modules
@@ -1,5 +1,4 @@
 language: java
-dist: precise

 cache:
  cache: false
@@ -37,4 +36,7 @@ before_install:
 script: 
  - ./travis-run-tests.sh $TESTS

+after_success:
+  - .travis/docker-hub-master-trigger.sh
+
 sudo: false
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ "$DOCKER_HUB_TOKEN" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "keycloak/keycloak" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+    curl -H "Content-Type: application/json" --data '{"docker_tag": "master"}' -X POST https://registry.hub.docker.com/u/jboss/keycloak/trigger/$DOCKER_HUB_TOKEN/
+    echo "Triggered Docker hub build"
+elif [ "$DOCKER_HUB_TOKEN" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "keycloak/keycloak" ] && [ "$TRAVIS_BRANCH" == "openshift-integration2" ]; then
+    curl -H "Content-Type: application/json" --data '{"docker_tag": "nightly-openshift-integration2"}' -X POST https://registry.hub.docker.com/u/jboss/keycloak/trigger/$DOCKER_HUB_TOKEN/
+    echo "Triggered Docker hub build"
+fi
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -85,7 +85,7 @@ public class BasicAuthRequestAuthenticator extends BearerTokenRequestAuthenticat
        return authenticateToken(exchange, atr.getToken());
    } 
 
-    private AccessTokenResponse getToken(String username, String password) throws Exception {
+    protected AccessTokenResponse getToken(String username, String password) throws Exception {
    	AccessTokenResponse tokenResponse=null;
    	HttpClient client = deployment.getClient();

@@ -70,7 +70,11 @@ public abstract class AbstractPolicyEnforcer {
        if (securityContext == null) {
            if (!isDefaultAccessDeniedUri(request)) {
                if (pathConfig != null) {
-                    challenge(pathConfig, getRequiredScopes(pathConfig, request), httpFacade);
+                    if (EnforcementMode.DISABLED.equals(pathConfig.getEnforcementMode())) {
+                        return createEmptyAuthorizationContext(true);
+                    } else {
+                        challenge(pathConfig, getRequiredScopes(pathConfig, request), httpFacade);
+                    }
                } else {
                    handleAccessDenied(httpFacade);
                }
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -38,8 +38,21 @@

    <modules>
        <module>camel-undertow</module>
-        <module>jetty94</module>
-        <module>tomcat8</module>
        <module>undertow</module>
    </modules>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jetty94</module>
+                <module>tomcat8</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -69,7 +69,7 @@
        </dependency>
        <dependency>
            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
        </dependency>

    </dependencies>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
    <dependencies>
        <dependency>
            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -216,6 +216,16 @@ declare namespace Keycloak {
 		createdTimestamp?: number;
 	}

+	interface KeycloakTokenParsed {
+		exp?: number;
+		iat?: number;
+		nonce?: string;
+		sub?: string;
+		session_state?: string;
+		realm_access?: { roles: string[] };
+		resource_access?: string[];
+	}
+
 	// export interface KeycloakUserInfo {}

 	/**
@@ -269,15 +279,7 @@ declare namespace Keycloak {
 		/**
 		 * The parsed token as a JavaScript object.
 		 */
-		tokenParsed?: {
-			exp?: number;
-			iat?: number;
-			nonce?: string;
-			sub?: string;
-			session_state?: string;
-			realm_access?: { roles: string[] };
-			resource_access?: string[];
-		};
+		tokenParsed?: KeycloakTokenParsed;

 		/**
 		 * The base64 encoded refresh token that can be used to retrieve a new token.
@@ -287,7 +289,7 @@ declare namespace Keycloak {
 		/**
 		 * The parsed refresh token as a JavaScript object.
 		 */
-		refreshTokenParsed?: { nonce?: string };
+		refreshTokenParsed?: KeycloakTokenParsed;

 		/**
 		 * The base64 encoded ID token.
@@ -297,7 +299,7 @@ declare namespace Keycloak {
 		/**
 		 * The parsed id token as a JavaScript object.
 		 */
-		idTokenParsed?: { nonce?: string };
+		idTokenParsed?: KeycloakTokenParsed;

 		/**
 		 * The estimated time difference between the browser time and the Keycloak
@@ -910,7 +910,7 @@
                    supportedParams = ['code', 'state', 'session_state'];
                    break;
                case 'implicit':
-                    supportedParams = ['access_token', 'id_token', 'state', 'session_state'];
+                    supportedParams = ['access_token', 'token_type', 'id_token', 'state', 'session_state', 'expires_in'];
                    break;
                case 'hybrid':
                    supportedParams = ['access_token', 'id_token', 'code', 'state', 'session_state'];
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -87,6 +87,7 @@ public class PathBasedKeycloakConfigResolver implements KeycloakConfigResolver {
            if (!cacheConfiguration(pathFragment, configuration)) {
                throw new IllegalStateException("Not able to read the file " + configuration);
            }
+            deployment = getCachedDeployment(pathFragment);
        }

        return deployment;
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -30,6 +30,17 @@
    <name>Keycloak Servlet Filter Adapter Integration</name>
    <description/>

+    <properties>
+        <keycloak.osgi.export>
+            org.keycloak.adapters.servlet.*
+        </keycloak.osgi.export>
+        <keycloak.osgi.import>
+            javax.servlet.*;version="[2.5,4)";resolution:=optional,
+            org.keycloak.*;version="${project.version}",
+            *;resolution:=optional
+        </keycloak.osgi.import>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>org.jboss.logging</groupId>
@@ -94,6 +105,39 @@
                    <target>${maven.compiler.target}</target>
                </configuration>
            </plugin>
+
+            <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-ClassPath>.</Bundle-ClassPath>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>${keycloak.osgi.import}</Import-Package>
+                        <Export-Package>${keycloak.osgi.export}</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
        </plugins>
    </build>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+    <version>4.5.0.Final-SNAPSHOT</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
      <artifactId>keycloak-parent</artifactId>
      <groupId>org.keycloak</groupId>
-      <version>4.3.0.Final-SNAPSHOT</version>
+      <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+    <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+    <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -0,0 +1,19 @@
+package org.keycloak.adapters.springsecurity.authentication;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.keycloak.adapters.AdapterTokenStore;
+import org.keycloak.adapters.KeycloakDeployment;
+import org.keycloak.adapters.RequestAuthenticator;
+import org.keycloak.adapters.spi.HttpFacade;
+
+/**
+ * Creates {@link RequestAuthenticator}s.
+ */
+public interface RequestAuthenticatorFactory {
+    /**
+     * Creates new {@link RequestAuthenticator} instances on a per-request basis.
+    */
+    RequestAuthenticator createRequestAuthenticator(HttpFacade facade, HttpServletRequest request, 
+            KeycloakDeployment deployment, AdapterTokenStore tokenStore, int sslRedirectPort);
+}
@@ -0,0 +1,17 @@
+package org.keycloak.adapters.springsecurity.authentication;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.keycloak.adapters.AdapterTokenStore;
+import org.keycloak.adapters.KeycloakDeployment;
+import org.keycloak.adapters.RequestAuthenticator;
+import org.keycloak.adapters.spi.HttpFacade;
+
+public class SpringSecurityRequestAuthenticatorFactory implements RequestAuthenticatorFactory {
+    
+    @Override
+    public RequestAuthenticator createRequestAuthenticator(HttpFacade facade,
+            HttpServletRequest request, KeycloakDeployment deployment, AdapterTokenStore tokenStore, int sslRedirectPort) {
+        return new SpringSecurityRequestAuthenticator(facade, request, deployment, tokenStore, sslRedirectPort);
+    }
+}
@@ -27,16 +27,15 @@ import javax.servlet.http.HttpServletResponse;
 import org.keycloak.OAuth2Constants;
 import org.keycloak.adapters.AdapterDeploymentContext;
 import org.keycloak.adapters.AdapterTokenStore;
-import org.keycloak.adapters.AuthenticatedActionsHandler;
 import org.keycloak.adapters.KeycloakDeployment;
-import org.keycloak.adapters.OIDCHttpFacade;
 import org.keycloak.adapters.RequestAuthenticator;
 import org.keycloak.adapters.spi.AuthChallenge;
 import org.keycloak.adapters.spi.AuthOutcome;
 import org.keycloak.adapters.spi.HttpFacade;
 import org.keycloak.adapters.springsecurity.KeycloakAuthenticationException;
 import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationFailureHandler;
-import org.keycloak.adapters.springsecurity.authentication.SpringSecurityRequestAuthenticator;
+import org.keycloak.adapters.springsecurity.authentication.RequestAuthenticatorFactory;
+import org.keycloak.adapters.springsecurity.authentication.SpringSecurityRequestAuthenticatorFactory;
 import org.keycloak.adapters.springsecurity.facade.SimpleHttpFacade;
 import org.keycloak.adapters.springsecurity.token.AdapterTokenStoreFactory;
 import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
@@ -85,6 +84,7 @@ public class KeycloakAuthenticationProcessingFilter extends AbstractAuthenticati
    private AdapterDeploymentContext adapterDeploymentContext;
    private AdapterTokenStoreFactory adapterTokenStoreFactory = new SpringSecurityAdapterTokenStoreFactory();
    private AuthenticationManager authenticationManager;
+    private RequestAuthenticatorFactory requestAuthenticatorFactory = new SpringSecurityRequestAuthenticatorFactory();

    /**
     * Creates a new Keycloak authentication processing filter with given {@link AuthenticationManager} and the
@@ -144,7 +144,7 @@ public class KeycloakAuthenticationProcessingFilter extends AbstractAuthenticati

        AdapterTokenStore tokenStore = adapterTokenStoreFactory.createAdapterTokenStore(deployment, request);
        RequestAuthenticator authenticator
-                = new SpringSecurityRequestAuthenticator(facade, request, deployment, tokenStore, -1);
+                = requestAuthenticatorFactory.createRequestAuthenticator(facade, request, deployment, tokenStore, -1);

        AuthOutcome result = authenticator.authenticate();
        log.debug("Auth outcome: {}", result);
@@ -251,4 +251,14 @@ public class KeycloakAuthenticationProcessingFilter extends AbstractAuthenticati
    public final void setContinueChainBeforeSuccessfulAuthentication(boolean continueChainBeforeSuccessfulAuthentication) {
        throw new UnsupportedOperationException("This filter does not support explicitly setting a continue chain before success policy");
    }
-}
+
+    /**
+     * Sets the request authenticator factory to use when creating per-request authenticators.
+     *
+     * @param requestAuthenticatorFactory the <code>RequestAuthenticatorFactory</code> to use
+     */
+    public void setRequestAuthenticatorFactory(RequestAuthenticatorFactory requestAuthenticatorFactory) {
+        Assert.notNull(requestAuthenticatorFactory, "RequestAuthenticatorFactory cannot be null");
+        this.requestAuthenticatorFactory = requestAuthenticatorFactory;
+    }
+}
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -42,6 +42,11 @@ import java.util.HashSet;
 import java.util.Set;
 import org.keycloak.adapters.cloned.HttpClientBuilder;
 import java.net.URI;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.logging.Level;

 /**
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -205,8 +210,13 @@ public class DeploymentBuilder {
            Certificate cert = null;
            try {
                cert = keyStore.getCertificate(key.getKeystore().getCertificateAlias());
+                if (cert instanceof X509Certificate) {
+                    ((X509Certificate) cert).checkValidity();
+                }
            } catch (KeyStoreException e) {
                throw new RuntimeException(e);
+            } catch (CertificateException e) {
+                throw new RuntimeException(e);
            }
            publicKey = cert.getPublicKey();
        } else {
@@ -224,7 +234,12 @@ public class DeploymentBuilder {
        if (key.getPublicKeyPem() != null) {
            publicKey = PemUtils.decodePublicKey(key.getPublicKeyPem().trim());
        } else {
-            Certificate cert = PemUtils.decodeCertificate(key.getCertificatePem().trim());
+            X509Certificate cert = PemUtils.decodeCertificate(key.getCertificatePem().trim());
+            try {
+                cert.checkValidity();
+            } catch (CertificateException ex) {
+                throw new RuntimeException(ex);
+            }
            publicKey = cert.getPublicKey();
        }
        return publicKey;
@@ -36,6 +36,7 @@ import org.keycloak.common.util.Time;
 import org.keycloak.dom.saml.v2.metadata.KeyTypes;
 import org.keycloak.rotation.KeyLocator;
 import org.keycloak.saml.processing.api.util.KeyInfoTools;
+import java.security.cert.CertificateException;

 /**
 * This class defines a {@link KeyLocator} that looks up public keys and certificates in IdP's
@@ -147,6 +148,11 @@ public class SamlDescriptorPublicKeyLocator implements KeyLocator, Iterable<Publ
        for (KeyInfo ki : signingCerts) {
            KeyName keyName = KeyInfoTools.getKeyName(ki);
            X509Certificate x509certificate = KeyInfoTools.getX509Certificate(ki);
+            try {
+                x509certificate.checkValidity();
+            } catch (CertificateException ex) {
+                x509certificate = null;
+            }
            if (x509certificate != null && keyName != null) {
                LOG.tracef("Registering signing certificate %s", keyName.getName());
                this.publicKeyCache.put(keyName.getName(), x509certificate.getPublicKey());
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -30,6 +30,16 @@
    <name>Keycloak Servlet Integration</name>
    <description/>

+    <properties>
+        <keycloak.osgi.export>
+            org.keycloak.adapters.servlet.*
+        </keycloak.osgi.export>
+        <keycloak.osgi.import>
+            *;resolution:=optional
+        </keycloak.osgi.import>
+        <keycloak.osgi.fragment>${project.groupId}.keycloak-servlet-filter-adapter</keycloak.osgi.fragment>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>org.jboss.logging</groupId>
@@ -64,6 +74,40 @@
                    <target>${maven.compiler.target}</target>
                </configuration>
            </plugin>
+
+            <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-ClassPath>.</Bundle-ClassPath>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>${keycloak.osgi.import}</Import-Package>
+                        <Export-Package>${keycloak.osgi.export}</Export-Package>
+                        <Fragment-Host>${keycloak.osgi.fragment}</Fragment-Host>
+                    </instructions>
+                </configuration>
+            </plugin>
        </plugins>
    </build>

@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.3.0.Final-SNAPSHOT</version>
+		<version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</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.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -17,14 +17,14 @@
 */
 package org.keycloak.authorization.client.resource;

-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;

+import com.fasterxml.jackson.core.type.TypeReference;
 import org.keycloak.authorization.client.Configuration;
 import org.keycloak.authorization.client.representation.ServerConfiguration;
 import org.keycloak.authorization.client.util.Http;
+import org.keycloak.authorization.client.util.HttpMethod;
 import org.keycloak.authorization.client.util.Throwables;
 import org.keycloak.authorization.client.util.TokenCallable;
 import org.keycloak.representations.idm.authorization.ResourceRepresentation;
@@ -128,13 +128,13 @@ public class ProtectedResource {
     * @return a {@link ResourceRepresentation}
     */
    public ResourceRepresentation findByName(String name) {
-        String[] representations = find(null, name, null, configuration.getResource(), null, null, false, null, null);
+        List<ResourceRepresentation> representations = find(null, name, null, configuration.getResource(), null, null, false, true, null, null);

-        if (representations.length == 0) {
+        if (representations.isEmpty()) {
            return null;
        }

-        return findById(representations[0]);
+        return representations.get(0);
    }

    /**
@@ -145,13 +145,13 @@ public class ProtectedResource {
     * @return a {@link ResourceRepresentation}
     */
    public ResourceRepresentation findByName(String name, String ownerId) {
-        String[] representations = find(null, name, null, ownerId, null, null, false, null, null);
+        List<ResourceRepresentation> representations = find(null, name, null, ownerId, null, null, false, true,null, null);

-        if (representations.length == 0) {
+        if (representations.isEmpty()) {
            return null;
        }

-        return findById(representations[0]);
+        return representations.get(0);
    }

    /**
@@ -172,19 +172,7 @@ public class ProtectedResource {
        Callable<String[]> callable = new Callable<String[]>() {
            @Override
            public String[] call() throws Exception {
-                return http.<String[]>get(serverConfiguration.getResourceRegistrationEndpoint())
-                        .authorizationBearer(pat.call())
-                        .param("_id", id)
-                        .param("name", name)
-                        .param("uri", uri)
-                        .param("owner", owner)
-                        .param("type", type)
-                        .param("scope", scope)
-                        .param("matchingUri", Boolean.valueOf(matchingUri).toString())
-                        .param("deep", Boolean.FALSE.toString())
-                        .param("first", firstResult != null ? firstResult.toString() : null)
-                        .param("max", maxResult != null ? maxResult.toString() : null)
-                        .response().json(String[].class).execute();
+                return (String[]) createFindRequest(id, name, uri, owner, type, scope, matchingUri, false, firstResult, maxResult).response().json(String[].class).execute();
            }
        };
        try {
@@ -194,6 +182,40 @@ public class ProtectedResource {
        }
    }

+    /**
+     * Query the server for any resource with the matching arguments.
+     *
+     * @param id the resource id
+     * @param name the resource name
+     * @param uri the resource uri
+     * @param owner the resource owner
+     * @param type the resource type
+     * @param scope the resource scope
+     * @param matchingUri the resource uri. Use this parameter to lookup a resource that best match the given uri
+     * @param deep if the result should be a list of resource representations with details about the resource. If false, only ids are returned
+     * @param firstResult the position of the first resource to retrieve
+     * @param maxResult the maximum number of resources to retrieve
+     * @return a list of resource representations or an array of strings representing resource ids, depending on the generic type
+     */
+    public <R> R find(final String id, final String name, final String uri, final String owner, final String type, final String scope, final boolean matchingUri, final boolean deep, final Integer firstResult, final Integer maxResult) {
+        if (deep) {
+            Callable<List<ResourceRepresentation>> callable = new Callable<List<ResourceRepresentation>>() {
+                @Override
+                public List<ResourceRepresentation> call() {
+                    return (List<ResourceRepresentation>) createFindRequest(id, name, uri, owner, type, scope, matchingUri, deep, firstResult, maxResult).response().json(new TypeReference<List<ResourceRepresentation>>() {
+                    }).execute();
+                }
+            };
+            try {
+                return (R) callable.call();
+            } catch (Exception cause) {
+                return (R) Throwables.retryAndWrapExceptionIfNecessary(callable, pat, "Could not find resource", cause);
+            }
+        }
+
+        return (R) find(id, name, uri, owner, type, scope, matchingUri, firstResult, maxResult);
+    }
+
    /**
     * Query the server for all resources.
     *
@@ -235,19 +257,7 @@ public class ProtectedResource {
     * @param uri the resource uri
     */
    public List<ResourceRepresentation> findByUri(String uri) {
-        String[] ids = find(null, null, uri, null, null, null, false, null, null);
-
-        if (ids.length == 0) {
-            return Collections.emptyList();
-        }
-
-        List<ResourceRepresentation> representations = new ArrayList<>();
-
-        for (String id : ids) {
-            representations.add(findById(id));
-        }
-
-        return representations;
+        return find(null, null, uri, null, null, null, false, true, null, null);
    }

    /**
@@ -258,18 +268,21 @@ public class ProtectedResource {
     * @return a list of resources
     */
    public List<ResourceRepresentation> findByMatchingUri(String uri) {
-        String[] ids = find(null, null, uri, null, null, null, true, null, null);
+        return find(null, null, uri, null, null, null, true, true,null, null);
+    }

-        if (ids.length == 0) {
-            return Collections.emptyList();
-        }
-
-        List<ResourceRepresentation> representations = new ArrayList<>();
-
-        for (String id : ids) {
-            representations.add(findById(id));
-        }
-
-        return representations;
+    private HttpMethod createFindRequest(String id, String name, String uri, String owner, String type, String scope, boolean matchingUri, boolean deep, Integer firstResult, Integer maxResult) {
+        return http.get(serverConfiguration.getResourceRegistrationEndpoint())
+                .authorizationBearer(pat.call())
+                .param("_id", id)
+                .param("name", name)
+                .param("uri", uri)
+                .param("owner", owner)
+                .param("type", type)
+                .param("scope", scope)
+                .param("matchingUri", Boolean.valueOf(matchingUri).toString())
+                .param("deep", Boolean.toString(deep))
+                .param("first", firstResult != null ? firstResult.toString() : null)
+                .param("max", maxResult != null ? maxResult.toString() : null);
    }
 }
@@ -25,7 +25,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -39,13 +39,11 @@ public class ScopePolicyProvider extends AbstractPermissionProvider {
        Map<Object, Decision.Effect> decisions = decisionCache.computeIfAbsent(policy, p -> new HashMap<>());
        ResourcePermission permission = evaluation.getPermission();

-        for (Scope scope : permission.getScopes()) {
-            Decision.Effect effect = decisions.get(scope);
+        Decision.Effect effect = decisions.get(permission);

-            if (effect != null) {
-                defaultEvaluation.setEffect(effect);
-                return;
-            }
+        if (effect != null) {
+            defaultEvaluation.setEffect(effect);
+            return;
        }

        Decision.Effect decision = defaultEvaluation.getEffect();
@@ -53,9 +51,7 @@ public class ScopePolicyProvider extends AbstractPermissionProvider {
        if (decision == null) {
            super.evaluate(evaluation);

-            for (Scope scope : policy.getScopes()) {
-                decisions.put(scope, defaultEvaluation.getEffect());
-            }
+            decisions.put(permission, defaultEvaluation.getEffect());
        }
    }
 }
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -55,7 +55,7 @@

        <dependency>
            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-parent</artifactId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

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

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

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

    <groupId>org.keycloak.bom</groupId>
    <artifactId>keycloak-bom-parent</artifactId>
-    <version>4.3.0.Final-SNAPSHOT</version>
+    <version>4.5.0.Final-SNAPSHOT</version>

    <packaging>pom</packaging>

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

    <groupId>org.keycloak.bom</groupId>
@@ -38,12 +38,12 @@
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-core</artifactId>
-                <version>4.3.0.Final-SNAPSHOT</version>
+                <version>4.5.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-server-spi</artifactId>
-                <version>4.3.0.Final-SNAPSHOT</version>
+                <version>4.5.0.Final-SNAPSHOT</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,13 @@ import java.util.Set;
 public class Profile {

    public enum Feature {
-        AUTHORIZATION, IMPERSONATION, SCRIPTS, DOCKER, ACCOUNT2, TOKEN_EXCHANGE
+        ACCOUNT2,
+        AUTHORIZATION,
+        DOCKER,
+        IMPERSONATION,
+        OPENSHIFT_INTEGRATION,
+        SCRIPTS,
+        TOKEN_EXCHANGE
    }

    private enum ProductValue {
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.3.0.Final-SNAPSHOT</version>
+        <version>4.5.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,7 @@ import java.security.PublicKey;
 * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
 * @version $Revision: 1 $
 */
+@Deprecated
 public class RSATokenVerifier {

    private final TokenVerifier<AccessToken> tokenVerifier;
Author	SHA1	Message	Date
stianst	0bb2ff9e8a	KEYCLOAK-8264 Update OpenShift Token Review endpoint to support additional algorithms and to update session last refresh on token introspection	2018-09-11 14:18:13 +02:00
stianst	12f3d2115d	KEYCLOAK-8263 Add option to client to override access token timeout	2018-09-11 12:40:51 +02:00
stianst	24e60747b6	KEYCLOAK-7560 Refactor token signature SPI PR Also incorporates: KEYCLOAK-6770 ES256/384/512 providers KEYCLOAK-4622 Use HS256 for refresh tokens KEYCLOAK-4623 Use HS256 for client reg tokens	2018-09-11 08:14:10 +02:00
Takashi Norimatsu	5b6036525c	KEYCLOAK-7560 Refactor Token Sign and Verify by Token Signature SPI	2018-09-11 08:14:10 +02:00
vramik	bd4098191b	KEYCLOAK-7604-rename-ids-saml-clients	2018-09-10 21:17:00 +02:00
Leon Graser	df22c4d613	changed user and resource entity to fetch mode select with batch size 20	2018-09-10 20:31:04 +02:00
Pedro Igor	0561d73ae2	[KEYCLOAK-6285] - HTTP Challenge Authentication Flow	2018-09-10 19:02:49 +02:00
stianst	bf758809ba	KEYCLOAK-6229 OpenShift Token Review interface	2018-09-07 08:21:28 +02:00
stianst	1fb4ca4525	Set version to 4.5.0.Final	2018-09-06 20:08:02 +02:00
vmuzikar	e59646aafb	KEYCLOAK-8246 Disable Base UI tests by default	2018-09-06 14:56:57 +02:00
vmuzikar	bd8510f4da	KEYCLOAK-7925 Initial tests for the new Account Console	2018-09-06 09:59:28 +02:00
stianst	c56e171f3a	KEYCLOAK-7608 Check if themes dir is null in FolderThemeProvider	2018-09-06 08:52:17 +02:00
Hynek Mlnarik	812e76c39b	KEYCLOAK-8163 Improve SAML validations	2018-09-05 15:47:03 +02:00
vramik	8761819b24	KEYCLOAK-8176 fix export issue for required action	2018-09-05 08:40:31 +02:00
Pedro Igor	47066e1b89	[KEYCLOAK-8012] - Fix offline session support in authorization services	2018-09-04 15:07:49 -03:00
Pedro Igor	6a0a1031a1	[KEYCLOAK-7754] - Fixing compat issues with UMA spec in RPT Introspection Provider	2018-09-04 11:41:09 -03:00
Pedro Igor	33efcc6b93	[KEYCLOAK-8142] - Fixing regression when setting path enforcement mode to disabled	2018-09-04 10:32:06 -03:00
Pedro Igor	2eddfd3ea8	[KEYCLOAK-7160] - Completely broken AuthZ Configs in IE	2018-09-04 14:40:14 +02:00
Dmitry Telegin	bc8763ccf3	KEYCLOAK-7858 - OIDC servlet filter adapter OSGi support	2018-09-04 11:29:45 +02:00
Hynek Mlnarik	9f839f001f	KEYCLOAK-8218 Do not clear SAML REDIRECT query parameters	2018-09-04 11:16:06 +02:00
June Zhang	237318dfd3	KEYCLOAK-7751 Auth welcome page	2018-09-04 07:55:08 +02:00
Hynek Mlnarik	5fe1905e4b	KEYCLOAK-6803 Prevent duplicating required actions in JPA user storage	2018-09-03 19:42:18 +02:00
mposolda	f0ba8f6591	KEYCLOAK-8139 Added wildfly-deprecated module for adapters testing. Remove wildfly9 and wildfly10	2018-09-03 08:56:09 +02:00
Hynek Mlnarik	54b5ec206e	KEYCLOAK-8183 Improve authz caching for negative cases	2018-08-31 18:31:55 +02:00
mposolda	befee75917	KEYCLOAK-8174 Admin console test for the "Client Scopes" tab of the client	2018-08-31 12:32:17 +02:00
mposolda	5ae126b10e	KEYCLOAK-7584 Fix some admin console tests broken by adding clientScopes support	2018-08-31 12:32:17 +02:00
Johannes Knutsen	c0b5c12dee	KEYCLOAK-8147: Add support for Content-Security-Policy-Report-Only response headers	2018-08-31 10:38:56 +02:00
vramik	214a8e1fed	KEYCLOAK-8176 fix requiredActionsPriority test	2018-08-31 10:25:28 +02:00
vramik	f89637bd8f	KEYCLOAK-8178 fix AdminEventTest	2018-08-30 15:16:33 +02:00
Hynek Mlnarik	bee3894cdf	KEYCLOAK-8150 Improve loading user list	2018-08-30 13:03:49 +02:00
vramik	df76afb513	KEYCLOAK-8167 fix ExportImportTest on undertow	2018-08-29 15:18:24 +02:00
vramik	c266e90a77	KEYCLOAK-6746 ability to skip adapter test	2018-08-29 14:40:44 +02:00
mposolda	b70468341e	KEYCLOAK-7470 Ability to order client scopes	2018-08-29 14:37:27 +02:00
mhajas	21b71e83dd	KEYCLOAK-7161 Stabilize authz tests as they are running on undertow -> in Travis	2018-08-29 13:13:06 +02:00
mhajas	ccba07a5c0	KEYCLOAK-7213 Make example tests running on app-server-undertow	2018-08-29 13:13:06 +02:00
Jani	42553cdc44	[KEYCLOAK-7695] Restore token_type and expires_in for implicit flow As KEYCLOAK-6585 concerns only hybrid flow, this commit restores the behavior for implicit flow. This commit partially reverts #5041 (061049e41a6b0e6fb45c75f05748023ad7ab7d92).	2018-08-29 13:00:57 +02:00
Hynek Mlnarik	8a7a545628	KEYCLOAK-7944 Remove duplicate offline client sessions	2018-08-29 10:55:38 +02:00
Pavel Drozd	d37eb5d10b	KEYCLOAK-8138 Fixed tests for product profile	2018-08-29 10:31:10 +02:00
AlistairDoswald	36837ae4b6	Added a ScriptMapper for SAML for KEYCLOAK-5520 Added mapper, tests and entry in the ProtocolMapper file. This code is adapted from the following module: https://github.com/cloudtrust/keycloak-client-mappers	2018-08-29 09:39:30 +02:00
mposolda	31270e2f52	KEYCLOAK-7437 Support for prompt=consent	2018-08-29 08:35:29 +02:00
Pedro Igor	3ccffdb77e	[KEYCLOAK-8145] - Configure keystore when running KeycloakServer using TLS	2018-08-29 08:33:16 +02:00
Johannes Knutsen	56c97407d4	KEYCLOAK-8152: Allow passing the current locale to OAuth2 identity providers	2018-08-28 15:52:23 +02:00
Grzegorz Grzybek	bf7a173e1e	[KEYCLOAK-7394] Change Content-Type to x-www-form-urlencoded for RealmAdminResource#testLDAPConnection	2018-08-28 04:56:08 -03:00
Hynek Mlnarik	2077975b1c	KEYCLOAK-6411 Fix list of keywords on MySQL/MariaDB	2018-08-28 09:51:58 +02:00
mposolda	e4d05a7852	KEYCLOAK-8127 Added support for app-server-eap71. Make sure ConsoleProtectionTest is executed just for app-server-eap71	2018-08-27 12:52:53 +02:00
mposolda Douglas Palmer stianst Hynek Mlnarik	6fc99cd749	KEYCLOAK-7594 Upgrade to Wildfly 13. Cross-DC: Upgrade to infinispan server 9.2.4 and JDG 7.2 Co-authored-by: Douglas Palmer <dpalmer@redhat.com> Co-authored-by: stianst <stianst@gmail.com> Co-authored-by: Hynek Mlnarik <hmlnarik@redhat.com>	2018-08-27 12:52:53 +02:00
vramik	01b0b6b345	KEYCLOAK-7975 fix updating execution with Oracle DB	2018-08-24 15:04:48 +02:00
Martin Kanis	59082e0b5f	KEYCLOAK-7943 NPE when SAML User Property mapper is empty	2018-08-24 14:39:24 +02:00
vramik	9e072cb174	KEYCLOAK-8119 Migration tests doesn't reflect if authorization features is enabled or not	2018-08-24 14:38:36 +02:00
Pedro Igor	c0508aded7	[KEYCLOAK-7757] - Deleting scopes in account console doesn't work	2018-08-24 09:35:52 -03:00
Pedro Igor	9882341ecf	[KEYCLOAK-7725] - CORS should be set based on client making the request	2018-08-24 09:35:38 -03:00
Pedro Igor	3c2339ba33	[KEYCLOAK-4902] - Only set effect if result exists and removing ignore from tests	2018-08-24 09:34:39 -03:00
Hynek Mlnařík	457c6a9d80	KEYCLOAK-5226 Test with trusty image	2018-08-24 13:21:51 +02:00
Hynek Mlnarik	1f840b1fbc	KEYCLOAK-8109 Fix getDOMElement	2018-08-24 10:03:33 +02:00
mhajas	694966b613	KEYCLOAK-8120 Fix NullPointerException in ClaimInformationPointProviderTest	2018-08-24 09:00:35 +02:00
Dan Hooper	0a8fca7ec4	Created common interface for parsed tokens in typescript declaration file	2018-08-23 16:14:17 -04:00
Frank Schmager	3e2e0ac91c	Renamed factory and java doc	2018-08-22 16:39:55 +02:00
Frank Schmager	b21e784826	ignoring bin/ directories instead of bin files	2018-08-22 16:39:55 +02:00
Frank Schmager	dda365e002	initial exposing of BasicAuthRequestAuthenticator to make extensible	2018-08-22 16:39:55 +02:00
vmuzikar	653d3f4f5d	KEYCLOAK-8093 Add IDs to HTML elements in new Account Console	2018-08-22 09:30:20 -04:00
Alex Szczuczko	3dcc106c59	KEYCLOAK-8054 Switch to BOMREST as the source for productized 3rd party versions This will allow the versions to be kept up to date automatically by DA within PNC. A side effect is fixing issues like KEYCLOAK-7896. Also remove additional dependencyExclusions that can be filled by PME BOMREST	2018-08-22 10:24:07 +02:00
Martin Kanis	248654a75e	KEYCLOAK-6706 E-mail verification won't let user back into the app	2018-08-21 16:30:15 +02:00
Grzegorz Grzybek	fdc9882709	[KEYCLOAK-8101] Return just cached deployment to prevent NPE	2018-08-21 09:56:58 +02:00
Gregor Tudan	b606a25684	KEYCLOAK-7991: add pagination params to the RoleResource	2018-08-21 08:19:33 +02:00
rmartinc	1b88eaf817	KEYCLOAK-8080 Audit the realm event configuration change	2018-08-20 21:01:38 +02:00
stianst	dc8268b30c	Update triggers for Docker Hub	2018-08-20 20:38:57 +02:00
Corentin Dupont	b80701589c	[KEYCLOAK-7804] - Option to return resource body	2018-08-20 13:07:29 -03:00
Martin Kanis	d04791243c	KEYCLOAK-7970-KEYCLOAK-7222 Add clientId to action tokens	2018-08-20 15:25:24 +02:00
Wolfgang Zenker	c5f861a522	Make cli usable on FreeBSD	2018-08-20 09:08:02 +02:00
Alex Szczuczko	b6d545b332	KEYCLOAK-7815 Set product.filename.version based on the value of product.rhsso.version When `product.filename.version` is hardcoded to 7.2, it obviously doesn't update when `product.rhsso.version` changes. By using build-helper-maven-plugin, it's now derived automatically, and we shouldn't see this issue pop up again for e.g. 7.4.	2018-08-20 09:06:45 +02:00
Alex Szczuczko	a35ed671e6	KEYCLOAK-7480 Make fuse7 tomcat8 adapter community-only	2018-08-20 09:06:45 +02:00
Alex Szczuczko	f0a2f7a675	KEYCLOAK-7480 Make fuse7 adapter's jetty94 conditional on the community profile In commit `d70859ef` keycloak-pax-web-jetty94 was added. org.keycloak:keycloak-jetty94-adapter:jar is a dependency of this module, and isn't produced outside of the community profile. So, the jetty94 module here must be consistent with that.	2018-08-20 09:06:45 +02:00
stianst	4cb9944067	Trigger Docker hub image on merge to master	2018-08-20 09:05:01 +02:00
Pedro Igor	625f613128	[KEYCLOAK-4902] - Using streams to process requested permissions and limit support for scope responses	2018-08-17 11:00:53 -03:00
stianst	e406e8f1f0	KEYCLOAK-8069 Simplify config for fixed hostname provider	2018-08-17 14:47:14 +02:00