keycloak-memoizeit
Changes
adapters/oidc/adapter-core/pom.xml 2(+1 -1)
adapters/oidc/as7-eap6/pom.xml 2(+1 -1)
adapters/oidc/installed/pom.xml 2(+1 -1)
adapters/oidc/jetty/jetty8.1/pom.xml 2(+1 -1)
adapters/oidc/jetty/jetty9.1/pom.xml 2(+1 -1)
adapters/oidc/jetty/jetty9.2/pom.xml 2(+1 -1)
adapters/oidc/jetty/pom.xml 2(+1 -1)
adapters/oidc/js/pom.xml 2(+1 -1)
adapters/oidc/osgi-adapter/pom.xml 2(+1 -1)
adapters/oidc/pom.xml 2(+1 -1)
adapters/oidc/servlet-filter/pom.xml 2(+1 -1)
adapters/oidc/spring-boot/pom.xml 2(+1 -1)
adapters/oidc/tomcat/pom.xml 2(+1 -1)
adapters/oidc/tomcat/tomcat6/pom.xml 6(+3 -3)
adapters/oidc/tomcat/tomcat7/pom.xml 6(+3 -3)
adapters/oidc/tomcat/tomcat8/pom.xml 6(+3 -3)
adapters/oidc/undertow/pom.xml 2(+1 -1)
adapters/oidc/wildfly/pom.xml 2(+1 -1)
adapters/pom.xml 2(+1 -1)
adapters/saml/as7-eap6/pom.xml 2(+1 -1)
adapters/saml/core/pom.xml 2(+1 -1)
adapters/saml/jetty/jetty8.1/pom.xml 2(+1 -1)
adapters/saml/jetty/jetty9.1/pom.xml 2(+1 -1)
adapters/saml/jetty/jetty9.2/pom.xml 2(+1 -1)
adapters/saml/jetty/pom.xml 2(+1 -1)
adapters/saml/pom.xml 2(+1 -1)
adapters/saml/servlet-filter/pom.xml 2(+1 -1)
adapters/saml/tomcat/pom.xml 2(+1 -1)
adapters/saml/tomcat/tomcat6/pom.xml 6(+3 -3)
adapters/saml/tomcat/tomcat7/pom.xml 6(+3 -3)
adapters/saml/tomcat/tomcat8/pom.xml 6(+3 -3)
adapters/saml/undertow/pom.xml 2(+1 -1)
adapters/saml/wildfly/pom.xml 2(+1 -1)
adapters/spi/adapter-spi/pom.xml 2(+1 -1)
adapters/spi/pom.xml 2(+1 -1)
common/pom.xml 2(+1 -1)
core/pom.xml 2(+1 -1)
dependencies/pom.xml 2(+1 -1)
dependencies/server-all/pom.xml 2(+1 -1)
dependencies/server-min/pom.xml 2(+1 -1)
distribution/adapters/osgi/pom.xml 2(+1 -1)
distribution/adapters/pom.xml 2(+1 -1)
distribution/demo-dist/pom.xml 2(+1 -1)
distribution/docs-dist/pom.xml 2(+1 -1)
distribution/downloads/pom.xml 2(+1 -1)
distribution/examples-dist/pom.xml 2(+1 -1)
distribution/feature-packs/pom.xml 2(+1 -1)
distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt 0(+0 -0)
distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json 4(+2 -2)
distribution/feature-packs/server-feature-pack/src/main/resources/content/themes/README.txt 0(+0 -0)
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml 6(+5 -1)
distribution/pom.xml 2(+1 -1)
distribution/proxy-dist/pom.xml 2(+1 -1)
distribution/saml-adapters/pom.xml 2(+1 -1)
distribution/server-dist/pom.xml 2(+1 -1)
distribution/server-overlay/pom.xml 2(+1 -1)
distribution/src-dist/pom.xml 2(+1 -1)
docbook/auth-server-docs/pom.xml 2(+1 -1)
docbook/pom.xml 2(+1 -1)
docbook/saml-adapter-docs/pom.xml 2(+1 -1)
examples/admin-client/pom.xml 2(+1 -1)
examples/basic-auth/pom.xml 2(+1 -1)
examples/broker/pom.xml 2(+1 -1)
examples/cors/pom.xml 2(+1 -1)
examples/demo-template/pom.xml 2(+1 -1)
examples/fuse/camel/pom.xml 2(+1 -1)
examples/fuse/cxf-jaxrs/pom.xml 2(+1 -1)
examples/fuse/cxf-jaxws/pom.xml 2(+1 -1)
examples/fuse/features/pom.xml 2(+1 -1)
examples/fuse/pom.xml 2(+1 -1)
examples/js-console/pom.xml 2(+1 -1)
examples/kerberos/pom.xml 2(+1 -1)
examples/ldap/pom.xml 2(+1 -1)
examples/multi-tenant/pom.xml 2(+1 -1)
examples/pom.xml 2(+1 -1)
examples/providers/pom.xml 2(+1 -1)
examples/saml/pom.xml 2(+1 -1)
examples/saml/servlet-filter/pom.xml 2(+1 -1)
examples/themes/pom.xml 2(+1 -1)
federation/kerberos/pom.xml 2(+1 -1)
federation/ldap/pom.xml 2(+1 -1)
federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/store/ldap/LDAPOperationManager.java 12(+3 -9)
federation/pom.xml 2(+1 -1)
integration/admin-client/pom.xml 2(+1 -1)
integration/pom.xml 2(+1 -1)
model/infinispan/pom.xml 2(+1 -1)
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java 27(+19 -8)
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java 11(+11 -0)
model/jpa/pom.xml 2(+1 -1)
model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java 68(+68 -0)
model/mongo/pom.xml 2(+1 -1)
model/pom.xml 2(+1 -1)
pom.xml 7(+5 -2)
proxy/launcher/pom.xml 2(+1 -1)
proxy/pom.xml 2(+1 -1)
proxy/proxy-server/pom.xml 2(+1 -1)
saml-core/pom.xml 2(+1 -1)
server-spi/pom.xml 2(+1 -1)
services/pom.xml 2(+1 -1)
testsuite/docker-cluster/pom.xml 2(+1 -1)
testsuite/integration/pom.xml 2(+1 -1)
testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/FederationProvidersIntegrationTest.java 4(+4 -0)
testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java 22(+19 -3)
testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java 19(+19 -0)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractDemoExampleAdapterTest.java 5(+4 -1)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/mellon/http_localhost_auth.xml 3(+0 -3)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.cert 17(+17 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.key 28(+28 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.xml 72(+72 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/idp-metadata.xml 51(+51 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/auth2/index.html 20(+20 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource.java 4(+2 -2)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource2.java 32(+32 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource.java 4(+2 -2)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource2.java 23(+23 -0)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonTest.java 57(+50 -7)
testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/resources/mellon-realm.json 529(+188 -341)
testsuite/jetty/jetty81/pom.xml 2(+1 -1)
testsuite/jetty/jetty91/pom.xml 2(+1 -1)
testsuite/jetty/jetty92/pom.xml 2(+1 -1)
testsuite/jetty/pom.xml 2(+1 -1)
testsuite/performance/pom.xml 2(+1 -1)
testsuite/pom.xml 2(+1 -1)
testsuite/proxy/pom.xml 2(+1 -1)
testsuite/stress/pom.xml 2(+1 -1)
testsuite/tomcat6/pom.xml 2(+1 -1)
testsuite/tomcat7/pom.xml 2(+1 -1)
testsuite/tomcat8/pom.xml 2(+1 -1)
themes/pom.xml 2(+1 -1)
util/embedded-ldap/pom.xml 2(+1 -1)
util/pom.xml 2(+1 -1)
wildfly/adduser/pom.xml 2(+1 -1)
wildfly/extensions/pom.xml 2(+1 -1)
wildfly/pom.xml 2(+1 -1)
wildfly/server-subsystem/pom.xml 2(+1 -1)
Details
adapters/oidc/adapter-core/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/adapter-core/pom.xml b/adapters/oidc/adapter-core/pom.xml
index 2b76919..c44e1f5 100755
--- a/adapters/oidc/adapter-core/pom.xml
+++ b/adapters/oidc/adapter-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/as7-eap6/as7-adapter/pom.xml b/adapters/oidc/as7-eap6/as7-adapter/pom.xml
index 55037af..79f7a89 100755
--- a/adapters/oidc/as7-eap6/as7-adapter/pom.xml
+++ b/adapters/oidc/as7-eap6/as7-adapter/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-as7-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml b/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml
index 217b417..2253a4a 100755
--- a/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml
+++ b/adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-as7-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
index 8938e88..8943fb5 100755
--- a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
+++ b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
@@ -20,9 +20,9 @@
<parent>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <artifactId>keycloak-as7-integration-pom</artifactId>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-as7-subsystem</artifactId>
adapters/oidc/as7-eap6/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/as7-eap6/pom.xml b/adapters/oidc/as7-eap6/pom.xml
index dcfb1cd..65333f2 100755
--- a/adapters/oidc/as7-eap6/pom.xml
+++ b/adapters/oidc/as7-eap6/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak AS7 / JBoss EAP 6 Integration</name>
adapters/oidc/installed/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/installed/pom.xml b/adapters/oidc/installed/pom.xml
index f977732..5935dda 100755
--- a/adapters/oidc/installed/pom.xml
+++ b/adapters/oidc/installed/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/jaxrs-oauth-client/pom.xml b/adapters/oidc/jaxrs-oauth-client/pom.xml
index 60e8ae7..75ec83a 100755
--- a/adapters/oidc/jaxrs-oauth-client/pom.xml
+++ b/adapters/oidc/jaxrs-oauth-client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/jetty/jetty8.1/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/jetty/jetty8.1/pom.xml b/adapters/oidc/jetty/jetty8.1/pom.xml
index a60704c..71d2710 100755
--- a/adapters/oidc/jetty/jetty8.1/pom.xml
+++ b/adapters/oidc/jetty/jetty8.1/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/jetty/jetty9.1/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/jetty/jetty9.1/pom.xml b/adapters/oidc/jetty/jetty9.1/pom.xml
index 1f734e5..c489ff0 100755
--- a/adapters/oidc/jetty/jetty9.1/pom.xml
+++ b/adapters/oidc/jetty/jetty9.1/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/jetty/jetty9.2/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/jetty/jetty9.2/pom.xml b/adapters/oidc/jetty/jetty9.2/pom.xml
index 3bf79a1..ae5bf10 100755
--- a/adapters/oidc/jetty/jetty9.2/pom.xml
+++ b/adapters/oidc/jetty/jetty9.2/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/jetty/jetty-core/pom.xml b/adapters/oidc/jetty/jetty-core/pom.xml
index 5a18937..66f747a 100755
--- a/adapters/oidc/jetty/jetty-core/pom.xml
+++ b/adapters/oidc/jetty/jetty-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/jetty/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/jetty/pom.xml b/adapters/oidc/jetty/pom.xml
index 40b7c0f..c5d37ea 100755
--- a/adapters/oidc/jetty/pom.xml
+++ b/adapters/oidc/jetty/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Jetty Integration</name>
adapters/oidc/js/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/js/pom.xml b/adapters/oidc/js/pom.xml
index e460dae..e147af2 100755
--- a/adapters/oidc/js/pom.xml
+++ b/adapters/oidc/js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/osgi-adapter/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/osgi-adapter/pom.xml b/adapters/oidc/osgi-adapter/pom.xml
index d33cce2..dd3115e 100755
--- a/adapters/oidc/osgi-adapter/pom.xml
+++ b/adapters/oidc/osgi-adapter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml
index 98adb1f..fc0e302 100755
--- a/adapters/oidc/pom.xml
+++ b/adapters/oidc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Keycloak OIDC Client Adapter Modules</name>
adapters/oidc/servlet-filter/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml
index 9e39669..808272c 100755
--- a/adapters/oidc/servlet-filter/pom.xml
+++ b/adapters/oidc/servlet-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/servlet-oauth-client/pom.xml b/adapters/oidc/servlet-oauth-client/pom.xml
index 0f2891e..acebeec 100755
--- a/adapters/oidc/servlet-oauth-client/pom.xml
+++ b/adapters/oidc/servlet-oauth-client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/spring-boot/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/spring-boot/pom.xml b/adapters/oidc/spring-boot/pom.xml
index 0a97026..1c4998f 100755
--- a/adapters/oidc/spring-boot/pom.xml
+++ b/adapters/oidc/spring-boot/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/spring-security/pom.xml b/adapters/oidc/spring-security/pom.xml
index d07f2e4..6943e5e 100755
--- a/adapters/oidc/spring-security/pom.xml
+++ b/adapters/oidc/spring-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/tomcat/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml
index d37050f..dcbe1b4 100755
--- a/adapters/oidc/tomcat/pom.xml
+++ b/adapters/oidc/tomcat/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Tomcat Integration</name>
adapters/oidc/tomcat/tomcat6/pom.xml 6(+3 -3)
diff --git a/adapters/oidc/tomcat/tomcat6/pom.xml b/adapters/oidc/tomcat/tomcat6/pom.xml
index 2b14493..6dddf97 100755
--- a/adapters/oidc/tomcat/tomcat6/pom.xml
+++ b/adapters/oidc/tomcat/tomcat6/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/tomcat/tomcat7/pom.xml 6(+3 -3)
diff --git a/adapters/oidc/tomcat/tomcat7/pom.xml b/adapters/oidc/tomcat/tomcat7/pom.xml
index d39ad8d..fc5e76d 100755
--- a/adapters/oidc/tomcat/tomcat7/pom.xml
+++ b/adapters/oidc/tomcat/tomcat7/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/tomcat/tomcat8/pom.xml 6(+3 -3)
diff --git a/adapters/oidc/tomcat/tomcat8/pom.xml b/adapters/oidc/tomcat/tomcat8/pom.xml
index 254f6cb..74e8d1d 100755
--- a/adapters/oidc/tomcat/tomcat8/pom.xml
+++ b/adapters/oidc/tomcat/tomcat8/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml
index c2f47f1..66ca303 100755
--- a/adapters/oidc/tomcat/tomcat-core/pom.xml
+++ b/adapters/oidc/tomcat/tomcat-core/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/undertow/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml
index 80d476e..71f7dc7 100755
--- a/adapters/oidc/undertow/pom.xml
+++ b/adapters/oidc/undertow/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/oidc/wildfly/pom.xml 2(+1 -1)
diff --git a/adapters/oidc/wildfly/pom.xml b/adapters/oidc/wildfly/pom.xml
index 6ebe56b..1e9267b 100755
--- a/adapters/oidc/wildfly/pom.xml
+++ b/adapters/oidc/wildfly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak WildFly Integration</name>
diff --git a/adapters/oidc/wildfly/wf8-subsystem/pom.xml b/adapters/oidc/wildfly/wf8-subsystem/pom.xml
index 871775c..8d66b1d 100755
--- a/adapters/oidc/wildfly/wf8-subsystem/pom.xml
+++ b/adapters/oidc/wildfly/wf8-subsystem/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/adapters/oidc/wildfly/wildfly-adapter/pom.xml b/adapters/oidc/wildfly/wildfly-adapter/pom.xml
index c92a5ae..fd585c4 100755
--- a/adapters/oidc/wildfly/wildfly-adapter/pom.xml
+++ b/adapters/oidc/wildfly/wildfly-adapter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
index fdb1b5e..d17c12e 100755
--- a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
+++ b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
adapters/pom.xml 2(+1 -1)
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 4e6de1e..0003a4f 100755
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Keycloak Integration</name>
diff --git a/adapters/saml/as7-eap6/adapter/pom.xml b/adapters/saml/as7-eap6/adapter/pom.xml
index f190d76..43016f8 100755
--- a/adapters/saml/as7-eap6/adapter/pom.xml
+++ b/adapters/saml/as7-eap6/adapter/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-eap-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/as7-eap6/pom.xml 2(+1 -1)
diff --git a/adapters/saml/as7-eap6/pom.xml b/adapters/saml/as7-eap6/pom.xml
index dec5da6..e919401 100755
--- a/adapters/saml/as7-eap6/pom.xml
+++ b/adapters/saml/as7-eap6/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak SAML EAP Integration</name>
diff --git a/adapters/saml/as7-eap6/subsystem/pom.xml b/adapters/saml/as7-eap6/subsystem/pom.xml
index 47e9d9e..993d01f 100755
--- a/adapters/saml/as7-eap6/subsystem/pom.xml
+++ b/adapters/saml/as7-eap6/subsystem/pom.xml
@@ -20,9 +20,9 @@
<parent>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <artifactId>keycloak-saml-eap-integration-pom</artifactId>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-saml-as7-subsystem</artifactId>
adapters/saml/core/pom.xml 2(+1 -1)
diff --git a/adapters/saml/core/pom.xml b/adapters/saml/core/pom.xml
index c01fb49..7751fb2 100755
--- a/adapters/saml/core/pom.xml
+++ b/adapters/saml/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/jetty/jetty8.1/pom.xml 2(+1 -1)
diff --git a/adapters/saml/jetty/jetty8.1/pom.xml b/adapters/saml/jetty/jetty8.1/pom.xml
index c3e3d7d..36f97e7 100755
--- a/adapters/saml/jetty/jetty8.1/pom.xml
+++ b/adapters/saml/jetty/jetty8.1/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/jetty/jetty9.1/pom.xml 2(+1 -1)
diff --git a/adapters/saml/jetty/jetty9.1/pom.xml b/adapters/saml/jetty/jetty9.1/pom.xml
index 930b2c8..5ec3c72 100755
--- a/adapters/saml/jetty/jetty9.1/pom.xml
+++ b/adapters/saml/jetty/jetty9.1/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/jetty/jetty9.2/pom.xml 2(+1 -1)
diff --git a/adapters/saml/jetty/jetty9.2/pom.xml b/adapters/saml/jetty/jetty9.2/pom.xml
index fb26a7d..dd370fd 100755
--- a/adapters/saml/jetty/jetty9.2/pom.xml
+++ b/adapters/saml/jetty/jetty9.2/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/saml/jetty/jetty-core/pom.xml b/adapters/saml/jetty/jetty-core/pom.xml
index 32390c8..674c74c 100755
--- a/adapters/saml/jetty/jetty-core/pom.xml
+++ b/adapters/saml/jetty/jetty-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/jetty/pom.xml 2(+1 -1)
diff --git a/adapters/saml/jetty/pom.xml b/adapters/saml/jetty/pom.xml
index 0a6256e..70e130c 100755
--- a/adapters/saml/jetty/pom.xml
+++ b/adapters/saml/jetty/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak SAML Jetty Integration</name>
adapters/saml/pom.xml 2(+1 -1)
diff --git a/adapters/saml/pom.xml b/adapters/saml/pom.xml
index 88f8517..22b03c2 100755
--- a/adapters/saml/pom.xml
+++ b/adapters/saml/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Keycloak SAML Client Adapter Modules</name>
adapters/saml/servlet-filter/pom.xml 2(+1 -1)
diff --git a/adapters/saml/servlet-filter/pom.xml b/adapters/saml/servlet-filter/pom.xml
index e3dbee8..25b8b34 100755
--- a/adapters/saml/servlet-filter/pom.xml
+++ b/adapters/saml/servlet-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/tomcat/pom.xml 2(+1 -1)
diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml
index dc65476..be42d18 100755
--- a/adapters/saml/tomcat/pom.xml
+++ b/adapters/saml/tomcat/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak SAML Tomcat Integration</name>
adapters/saml/tomcat/tomcat6/pom.xml 6(+3 -3)
diff --git a/adapters/saml/tomcat/tomcat6/pom.xml b/adapters/saml/tomcat/tomcat6/pom.xml
index 6339f33..1e1c7bd 100755
--- a/adapters/saml/tomcat/tomcat6/pom.xml
+++ b/adapters/saml/tomcat/tomcat6/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/tomcat/tomcat7/pom.xml 6(+3 -3)
diff --git a/adapters/saml/tomcat/tomcat7/pom.xml b/adapters/saml/tomcat/tomcat7/pom.xml
index 4e7598e..ea6dd78 100755
--- a/adapters/saml/tomcat/tomcat7/pom.xml
+++ b/adapters/saml/tomcat/tomcat7/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/tomcat/tomcat8/pom.xml 6(+3 -3)
diff --git a/adapters/saml/tomcat/tomcat8/pom.xml b/adapters/saml/tomcat/tomcat8/pom.xml
index 417b5c5..4867e82 100755
--- a/adapters/saml/tomcat/tomcat8/pom.xml
+++ b/adapters/saml/tomcat/tomcat8/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml
index 028c0c7..b776ec5 100755
--- a/adapters/saml/tomcat/tomcat-core/pom.xml
+++ b/adapters/saml/tomcat/tomcat-core/pom.xml
@@ -19,10 +19,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/undertow/pom.xml 2(+1 -1)
diff --git a/adapters/saml/undertow/pom.xml b/adapters/saml/undertow/pom.xml
index ce7006e..9a82918 100755
--- a/adapters/saml/undertow/pom.xml
+++ b/adapters/saml/undertow/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/saml/wildfly/pom.xml 2(+1 -1)
diff --git a/adapters/saml/wildfly/pom.xml b/adapters/saml/wildfly/pom.xml
index a6ded56..035af90 100755
--- a/adapters/saml/wildfly/pom.xml
+++ b/adapters/saml/wildfly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak SAML Wildfly Integration</name>
diff --git a/adapters/saml/wildfly/wildfly-adapter/pom.xml b/adapters/saml/wildfly/wildfly-adapter/pom.xml
index acc426f..cd64e12 100755
--- a/adapters/saml/wildfly/wildfly-adapter/pom.xml
+++ b/adapters/saml/wildfly/wildfly-adapter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/saml/wildfly/wildfly-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-subsystem/pom.xml
index 10bf249..6fc49fe 100755
--- a/adapters/saml/wildfly/wildfly-subsystem/pom.xml
+++ b/adapters/saml/wildfly/wildfly-subsystem/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
adapters/spi/adapter-spi/pom.xml 2(+1 -1)
diff --git a/adapters/spi/adapter-spi/pom.xml b/adapters/spi/adapter-spi/pom.xml
index ad4748e..d9eabbd 100755
--- a/adapters/spi/adapter-spi/pom.xml
+++ b/adapters/spi/adapter-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml
index 9e05f33..f9bf0b0 100755
--- a/adapters/spi/jboss-adapter-core/pom.xml
+++ b/adapters/spi/jboss-adapter-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/spi/jetty-adapter-spi/pom.xml b/adapters/spi/jetty-adapter-spi/pom.xml
index cacbedb..908d6c1 100755
--- a/adapters/spi/jetty-adapter-spi/pom.xml
+++ b/adapters/spi/jetty-adapter-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
adapters/spi/pom.xml 2(+1 -1)
diff --git a/adapters/spi/pom.xml b/adapters/spi/pom.xml
index 0787b1e..5f7f231 100755
--- a/adapters/spi/pom.xml
+++ b/adapters/spi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Keycloak Client Adapter SPI Modules</name>
diff --git a/adapters/spi/servlet-adapter-spi/pom.xml b/adapters/spi/servlet-adapter-spi/pom.xml
index c4c944b..45095ec 100755
--- a/adapters/spi/servlet-adapter-spi/pom.xml
+++ b/adapters/spi/servlet-adapter-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/spi/tomcat-adapter-spi/pom.xml b/adapters/spi/tomcat-adapter-spi/pom.xml
index f002701..d830f52 100755
--- a/adapters/spi/tomcat-adapter-spi/pom.xml
+++ b/adapters/spi/tomcat-adapter-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml
index 7912f1d..06dc8c6 100755
--- a/adapters/spi/undertow-adapter-spi/pom.xml
+++ b/adapters/spi/undertow-adapter-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
common/pom.xml 2(+1 -1)
diff --git a/common/pom.xml b/common/pom.xml
index 1a8a935..9cbe55c 100755
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
core/pom.xml 2(+1 -1)
diff --git a/core/pom.xml b/core/pom.xml
index fb9b3a7..72768b2 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
dependencies/pom.xml 2(+1 -1)
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index cc0643a..1682881 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
dependencies/server-all/pom.xml 2(+1 -1)
diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index 34dca79..33c80b1 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
dependencies/server-min/pom.xml 2(+1 -1)
diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index 4d220b1..fb072f6 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
index ea722a3..a6e510d 100755
--- a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
index 11da4c4..bc7d813 100755
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-as7-modules</artifactId>
diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
index baa9136..3101406 100755
--- a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
@@ -19,10 +19,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-eap6-adapter-dist</artifactId>
diff --git a/distribution/adapters/as7-eap6-adapter/pom.xml b/distribution/adapters/as7-eap6-adapter/pom.xml
index 4cf818b..50c75af 100644
--- a/distribution/adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/adapters/as7-eap6-adapter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
diff --git a/distribution/adapters/jetty81-adapter-zip/pom.xml b/distribution/adapters/jetty81-adapter-zip/pom.xml
index 7a33467..ee2c736 100755
--- a/distribution/adapters/jetty81-adapter-zip/pom.xml
+++ b/distribution/adapters/jetty81-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/jetty91-adapter-zip/pom.xml b/distribution/adapters/jetty91-adapter-zip/pom.xml
index 02a6b9e..a894294 100755
--- a/distribution/adapters/jetty91-adapter-zip/pom.xml
+++ b/distribution/adapters/jetty91-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/jetty92-adapter-zip/pom.xml b/distribution/adapters/jetty92-adapter-zip/pom.xml
index 508ed07..0dab89c 100755
--- a/distribution/adapters/jetty92-adapter-zip/pom.xml
+++ b/distribution/adapters/jetty92-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/js-adapter-zip/pom.xml b/distribution/adapters/js-adapter-zip/pom.xml
index 78e2134..a26f432 100755
--- a/distribution/adapters/js-adapter-zip/pom.xml
+++ b/distribution/adapters/js-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/osgi/features/pom.xml b/distribution/adapters/osgi/features/pom.xml
index 810efd5..24e77d4 100755
--- a/distribution/adapters/osgi/features/pom.xml
+++ b/distribution/adapters/osgi/features/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<name>Keycloak OSGI Features</name>
diff --git a/distribution/adapters/osgi/features/src/main/resources/features.xml b/distribution/adapters/osgi/features/src/main/resources/features.xml
index e5efc8d..6ead274 100755
--- a/distribution/adapters/osgi/features/src/main/resources/features.xml
+++ b/distribution/adapters/osgi/features/src/main/resources/features.xml
@@ -21,8 +21,8 @@
<feature name="keycloak-adapter-core" version="${project.version}" resolver="(obr)">
<details>The keycloak adapter core stuff</details>
<bundle dependency="true">mvn:org.keycloak/keycloak-osgi-thirdparty/${project.version}</bundle>
- <bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.crypto.version}</bundle>
- <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.crypto.version}</bundle>
+ <bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
+ <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
diff --git a/distribution/adapters/osgi/jaas/pom.xml b/distribution/adapters/osgi/jaas/pom.xml
index b32815b..093a760 100755
--- a/distribution/adapters/osgi/jaas/pom.xml
+++ b/distribution/adapters/osgi/jaas/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<name>Keycloak OSGI JAAS Realm Configuration</name>
distribution/adapters/osgi/pom.xml 2(+1 -1)
diff --git a/distribution/adapters/osgi/pom.xml b/distribution/adapters/osgi/pom.xml
index b85e6c2..74c30aa 100755
--- a/distribution/adapters/osgi/pom.xml
+++ b/distribution/adapters/osgi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak OSGI Integration</name>
diff --git a/distribution/adapters/osgi/thirdparty/pom.xml b/distribution/adapters/osgi/thirdparty/pom.xml
index 9bb0beb..d796451 100755
--- a/distribution/adapters/osgi/thirdparty/pom.xml
+++ b/distribution/adapters/osgi/thirdparty/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
distribution/adapters/pom.xml 2(+1 -1)
diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index f5dc9b3..29dfce2 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Adapters Distribution Parent</name>
diff --git a/distribution/adapters/tomcat6-adapter-zip/pom.xml b/distribution/adapters/tomcat6-adapter-zip/pom.xml
index 68f5cc3..1d797e8 100755
--- a/distribution/adapters/tomcat6-adapter-zip/pom.xml
+++ b/distribution/adapters/tomcat6-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/tomcat7-adapter-zip/pom.xml b/distribution/adapters/tomcat7-adapter-zip/pom.xml
index 7a6ef20..b6005af 100755
--- a/distribution/adapters/tomcat7-adapter-zip/pom.xml
+++ b/distribution/adapters/tomcat7-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/tomcat8-adapter-zip/pom.xml b/distribution/adapters/tomcat8-adapter-zip/pom.xml
index fe7a31b..36dfa05 100755
--- a/distribution/adapters/tomcat8-adapter-zip/pom.xml
+++ b/distribution/adapters/tomcat8-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/wf8-adapter/pom.xml b/distribution/adapters/wf8-adapter/pom.xml
index 1afb386..59cef87 100644
--- a/distribution/adapters/wf8-adapter/pom.xml
+++ b/distribution/adapters/wf8-adapter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Wildfly 8 Adapter</name>
diff --git a/distribution/adapters/wf8-adapter/wf8-adapter-zip/pom.xml b/distribution/adapters/wf8-adapter/wf8-adapter-zip/pom.xml
index 97d8b04..48d91fa 100755
--- a/distribution/adapters/wf8-adapter/wf8-adapter-zip/pom.xml
+++ b/distribution/adapters/wf8-adapter/wf8-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/wf8-adapter/wf8-modules/pom.xml b/distribution/adapters/wf8-adapter/wf8-modules/pom.xml
index 40278ce..1fba204 100755
--- a/distribution/adapters/wf8-adapter/wf8-modules/pom.xml
+++ b/distribution/adapters/wf8-adapter/wf8-modules/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml
index cd70fd2..f36704c 100644
--- a/distribution/adapters/wildfly-adapter/pom.xml
+++ b/distribution/adapters/wildfly-adapter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Wildfly Adapter</name>
diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
index bae525f..855cd8b 100755
--- a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
+++ b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml
index 10149d6..e817ec0 100755
--- a/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml
+++ b/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
distribution/demo-dist/pom.xml 2(+1 -1)
diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml
index 1d3edd5..3da79e9 100755
--- a/distribution/demo-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-demo-dist</artifactId>
distribution/docs-dist/pom.xml 2(+1 -1)
diff --git a/distribution/docs-dist/pom.xml b/distribution/docs-dist/pom.xml
index fd3c48c..44d1f74 100755
--- a/distribution/docs-dist/pom.xml
+++ b/distribution/docs-dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-docs-dist</artifactId>
distribution/downloads/pom.xml 2(+1 -1)
diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml
index ae5d2d4..e2d67d7 100755
--- a/distribution/downloads/pom.xml
+++ b/distribution/downloads/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-dist-downloads</artifactId>
distribution/examples-dist/pom.xml 2(+1 -1)
diff --git a/distribution/examples-dist/pom.xml b/distribution/examples-dist/pom.xml
index fc3fcfc..f30995b 100755
--- a/distribution/examples-dist/pom.xml
+++ b/distribution/examples-dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-examples-dist</artifactId>
diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml
index b02190e..a7c8035 100755
--- a/distribution/feature-packs/adapter-feature-pack/pom.xml
+++ b/distribution/feature-packs/adapter-feature-pack/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>feature-packs-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
distribution/feature-packs/pom.xml 2(+1 -1)
diff --git a/distribution/feature-packs/pom.xml b/distribution/feature-packs/pom.xml
index a521fc4..1e01087 100644
--- a/distribution/feature-packs/pom.xml
+++ b/distribution/feature-packs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Feature Pack Builds</name>
diff --git a/distribution/feature-packs/server-feature-pack/assembly.xml b/distribution/feature-packs/server-feature-pack/assembly.xml
index 36ee4fa..41ef173 100644
--- a/distribution/feature-packs/server-feature-pack/assembly.xml
+++ b/distribution/feature-packs/server-feature-pack/assembly.xml
@@ -53,7 +53,7 @@
</fileSet>
<fileSet>
<directory>../../../themes/src/main/resources/theme</directory>
- <outputDirectory>content/standalone/configuration/themes</outputDirectory>
+ <outputDirectory>content/themes</outputDirectory>
<includes>
<include>**/**</include>
</includes>
diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml
index e8c8b0d..0ddd945 100644
--- a/distribution/feature-packs/server-feature-pack/pom.xml
+++ b/distribution/feature-packs/server-feature-pack/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>feature-packs-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json b/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
index 407f0c0..ff5bb85 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
@@ -1,6 +1,6 @@
{
"providers": [
- "classpath:${jboss.server.config.dir}/providers/*"
+ "classpath:${jboss.home.dir}/providers/*"
],
"admin": {
@@ -41,7 +41,7 @@
"cacheTemplates": true,
"cacheThemes": true,
"folder": {
- "dir": "${jboss.server.config.dir}/themes"
+ "dir": "${jboss.home.dir}/themes"
}
},
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
index 0df2b8b..3356e04 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
@@ -26,7 +26,11 @@
<dependencies>
<module name="org.keycloak.keycloak-common" services="import"/>
<module name="org.keycloak.keycloak-core" services="import"/>
- <module name="org.keycloak.keycloak-themes" services="import"/>
+ <module name="org.keycloak.keycloak-themes">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
<module name="org.keycloak.keycloak-js-adapter" services="import"/>
<module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
<module name="org.keycloak.keycloak-ldap-federation" services="import"/>
distribution/pom.xml 2(+1 -1)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e4de9d3..c4a4d6a 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
distribution/proxy-dist/pom.xml 2(+1 -1)
diff --git a/distribution/proxy-dist/pom.xml b/distribution/proxy-dist/pom.xml
index b9e2157..0d89c45 100755
--- a/distribution/proxy-dist/pom.xml
+++ b/distribution/proxy-dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-proxy-dist</artifactId>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
index 1f05529..72be75f 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml
index f18e0af..a7a6c5b 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-as7-eap6-adapter-dist-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-saml-as7-modules</artifactId>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
index 27b4dbf..286e25a 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
@@ -19,10 +19,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-saml-as7-eap6-adapter-dist-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <version>1.9.1.Final-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>keycloak-saml-eap6-adapter-dist</artifactId>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/pom.xml b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
index b0dee37..8513a5b 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/pom.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak SAML AS7 / JBoss EAP 6 Adapter Distros</name>
diff --git a/distribution/saml-adapters/jetty81-adapter-zip/pom.xml b/distribution/saml-adapters/jetty81-adapter-zip/pom.xml
index 550cc82..b945a2e 100755
--- a/distribution/saml-adapters/jetty81-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/jetty81-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/saml-adapters/jetty92-adapter-zip/pom.xml b/distribution/saml-adapters/jetty92-adapter-zip/pom.xml
index fdf53c6..0497458 100755
--- a/distribution/saml-adapters/jetty92-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/jetty92-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
distribution/saml-adapters/pom.xml 2(+1 -1)
diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml
index 0041706..bfb566b 100755
--- a/distribution/saml-adapters/pom.xml
+++ b/distribution/saml-adapters/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>SAML Adapters Distribution Parent</name>
diff --git a/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml b/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml
index 67e0576..3a44ec5 100755
--- a/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml b/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml
index 329a600..607744a 100755
--- a/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/saml-adapters/tomcat8-adapter-zip/pom.xml b/distribution/saml-adapters/tomcat8-adapter-zip/pom.xml
index e5e7e47..b9704e0 100755
--- a/distribution/saml-adapters/tomcat8-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/tomcat8-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/saml-adapters/wildfly-adapter/pom.xml b/distribution/saml-adapters/wildfly-adapter/pom.xml
index 48e326e..95efce0 100755
--- a/distribution/saml-adapters/wildfly-adapter/pom.xml
+++ b/distribution/saml-adapters/wildfly-adapter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Wildfly SAML Adapter</name>
diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
index ac51cee..8edb2e9 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml
index 9770d51..cfa4031 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
distribution/server-dist/pom.xml 2(+1 -1)
diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index 6885077..698fbde 100755
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-server-dist</artifactId>
diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 9d50f77..54165f3 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -45,15 +45,15 @@
<outputDirectory></outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/themes</directory>
- <outputDirectory>standalone/configuration/themes</outputDirectory>
+ <directory>${project.build.directory}/unpacked/keycloak-${project.version}/themes</directory>
+ <outputDirectory>themes</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/providers</directory>
- <outputDirectory>standalone/configuration/providers</outputDirectory>
+ <directory>${project.build.directory}/unpacked/keycloak-${project.version}/providers</directory>
+ <outputDirectory>providers</outputDirectory>
<includes>
<include>**/**</include>
</includes>
distribution/server-overlay/pom.xml 2(+1 -1)
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 99d31fc..3164f32 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-server-overlay</artifactId>
distribution/src-dist/pom.xml 2(+1 -1)
diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml
index 94f35c2..acfdceb 100755
--- a/distribution/src-dist/pom.xml
+++ b/distribution/src-dist/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-src-dist</artifactId>
docbook/auth-server-docs/pom.xml 2(+1 -1)
diff --git a/docbook/auth-server-docs/pom.xml b/docbook/auth-server-docs/pom.xml
index 2ea82f8..0e35210 100755
--- a/docbook/auth-server-docs/pom.xml
+++ b/docbook/auth-server-docs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-docbook-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
index 30bd80c..46fa368 100755
--- a/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
+++ b/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
@@ -99,6 +99,14 @@
<section>
<title>Migrating to 1.9.0</title>
<simplesect>
+ <title>Themes and providers directory moved</title>
+ <para>
+ We've moved the themes and providers directories from <literal>standalone/configuration/themes</literal> and <literal>standalone/configuration/providers</literal>
+ to <literal>themes</literal> and <literal>providers</literal> respectively. If you have added custom themes and providers you need
+ to move them to the new location. You also need to update <literal>keycloak-server.json</literal> as it's changed due to this.
+ </para>
+ </simplesect>
+ <simplesect>
<title>Adapter Subsystems only bring in dependencies if keycloak is on</title>
<para>
Previously, if you had installed our saml or oidc keycloak subsystem adapters into Wildfly or JBoss EAP, we would
diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/user-federation.xml b/docbook/auth-server-docs/reference/en/en-US/modules/user-federation.xml
index 93ce15e..f44e6ab 100755
--- a/docbook/auth-server-docs/reference/en/en-US/modules/user-federation.xml
+++ b/docbook/auth-server-docs/reference/en/en-US/modules/user-federation.xml
@@ -135,6 +135,23 @@
</variablelist>
</para>
</section>
+ <section>
+ <title>Connect to LDAP over SSL</title>
+ <para>
+ When you configure secured connection URL to LDAP (for example <literal>ldaps://myhost.com:636</literal> ) the Keycloak will
+ use SSL for the communication with LDAP server. The important thing is to properly configure truststore on the Keycloak server side,
+ because SSL won't work if Keycloak can't trust the SSL connection with LDAP (Keycloak acts as the <literal>client</literal> here, when LDAP acts as server).
+ </para>
+ <para>
+ The global truststore for the Keycloak can be configured with Truststore SPI in the <literal>keycloak-server.json</literal> file and it's described in the details <link linkend="truststore">here</link>.
+ If you don't configure truststore SPI, the truststore will fallback to the default mechanism provided by Java (either the file provided by system property <literal>javax.net.ssl.trustStore</literal> or finally
+ the cacerts file from JDK if even the system property is not set).
+ </para>
+ <para>There is configuration property <literal>Use Truststore SPI</literal> in the LDAP federation provider configuration, where you can choose
+ whether Truststore SPI is used. By default, the value is <literal>ldaps only</literal>, which is fine for most of deployments, because attempt
+ to use Truststore SPI is done just if connection to LDAP starts with <literal>ldaps</literal> .
+ </para>
+ </section>
</section>
<section>
<title>Sync of LDAP users to Keycloak</title>
docbook/pom.xml 2(+1 -1)
diff --git a/docbook/pom.xml b/docbook/pom.xml
index 9c11846..a0c9c0a 100755
--- a/docbook/pom.xml
+++ b/docbook/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Keycloak Documentation</name>
docbook/saml-adapter-docs/pom.xml 2(+1 -1)
diff --git a/docbook/saml-adapter-docs/pom.xml b/docbook/saml-adapter-docs/pom.xml
index c6e3e0f..65411ec 100755
--- a/docbook/saml-adapter-docs/pom.xml
+++ b/docbook/saml-adapter-docs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-docbook-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/examples/admin-client/example-realm.json b/examples/admin-client/example-realm.json
index e85bf67..1687627 100755
--- a/examples/admin-client/example-realm.json
+++ b/examples/admin-client/example-realm.json
@@ -17,7 +17,8 @@
}
],
"clientRoles": {
- "realm-management": [ "realm-admin" ]
+ "realm-management": [ "realm-admin" ],
+ "account": [ "manage-account" ]
}
}
],
examples/admin-client/pom.xml 2(+1 -1)
diff --git a/examples/admin-client/pom.xml b/examples/admin-client/pom.xml
index dda71a3..a93ce0a 100755
--- a/examples/admin-client/pom.xml
+++ b/examples/admin-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Examples - Admin Client</name>
examples/basic-auth/pom.xml 2(+1 -1)
diff --git a/examples/basic-auth/pom.xml b/examples/basic-auth/pom.xml
index a73db62..6e457ab 100755
--- a/examples/basic-auth/pom.xml
+++ b/examples/basic-auth/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Examples - Basic Auth</name>
diff --git a/examples/broker/facebook-authentication/pom.xml b/examples/broker/facebook-authentication/pom.xml
index 8b47ee5..975968b 100755
--- a/examples/broker/facebook-authentication/pom.xml
+++ b/examples/broker/facebook-authentication/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>keycloak-examples-broker-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Broker Examples - Facebook Authentication</name>
diff --git a/examples/broker/google-authentication/pom.xml b/examples/broker/google-authentication/pom.xml
index d22496b..be71066 100755
--- a/examples/broker/google-authentication/pom.xml
+++ b/examples/broker/google-authentication/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>keycloak-examples-broker-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Broker Examples - Google Authentication</name>
examples/broker/pom.xml 2(+1 -1)
diff --git a/examples/broker/pom.xml b/examples/broker/pom.xml
index 70f06e2..b9aba5a 100755
--- a/examples/broker/pom.xml
+++ b/examples/broker/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Broker Examples</name>
diff --git a/examples/broker/saml-broker-authentication/pom.xml b/examples/broker/saml-broker-authentication/pom.xml
index 57704cb..aa6ee47 100755
--- a/examples/broker/saml-broker-authentication/pom.xml
+++ b/examples/broker/saml-broker-authentication/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>keycloak-examples-broker-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Broker Examples - SAML Identity Provider Brokering</name>
diff --git a/examples/broker/twitter-authentication/pom.xml b/examples/broker/twitter-authentication/pom.xml
index 83ea633..372ce2b 100755
--- a/examples/broker/twitter-authentication/pom.xml
+++ b/examples/broker/twitter-authentication/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>keycloak-examples-broker-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Broker Examples - Twitter Authentication</name>
diff --git a/examples/cors/angular-product-app/pom.xml b/examples/cors/angular-product-app/pom.xml
index 49c6ca7..b4dbf08 100755
--- a/examples/cors/angular-product-app/pom.xml
+++ b/examples/cors/angular-product-app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-cors-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/cors/database-service/pom.xml b/examples/cors/database-service/pom.xml
index 2c22c0b..df482be 100755
--- a/examples/cors/database-service/pom.xml
+++ b/examples/cors/database-service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-cors-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/cors/pom.xml 2(+1 -1)
diff --git a/examples/cors/pom.xml b/examples/cors/pom.xml
index 32cd21d..6613cb7 100755
--- a/examples/cors/pom.xml
+++ b/examples/cors/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Examples - CORS</name>
diff --git a/examples/demo-template/admin-access-app/pom.xml b/examples/demo-template/admin-access-app/pom.xml
index cfabf9b..74f5ad3 100755
--- a/examples/demo-template/admin-access-app/pom.xml
+++ b/examples/demo-template/admin-access-app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/angular-product-app/pom.xml b/examples/demo-template/angular-product-app/pom.xml
index 20df4ab..14871df 100755
--- a/examples/demo-template/angular-product-app/pom.xml
+++ b/examples/demo-template/angular-product-app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/angular-product-app/src/main/webapp/js/app.js b/examples/demo-template/angular-product-app/src/main/webapp/js/app.js
index 710e846..e119136 100755
--- a/examples/demo-template/angular-product-app/src/main/webapp/js/app.js
+++ b/examples/demo-template/angular-product-app/src/main/webapp/js/app.js
@@ -33,7 +33,7 @@ angular.element(document).ready(function ($http) {
keycloakAuth.init({ onLoad: 'login-required' }).success(function () {
auth.loggedIn = true;
auth.authz = keycloakAuth;
- auth.logoutUrl = keycloakAuth.authServerUrl + "/realms/demo/tokens/logout?redirect_uri=/angular-product/index.html";
+ auth.logoutUrl = keycloakAuth.authServerUrl + "/realms/demo/protocol/openid-connect/logout?redirect_uri=/angular-product/index.html";
module.factory('Auth', function() {
return auth;
});
diff --git a/examples/demo-template/customer-app/pom.xml b/examples/demo-template/customer-app/pom.xml
index 4c52e05..4ad3339 100755
--- a/examples/demo-template/customer-app/pom.xml
+++ b/examples/demo-template/customer-app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml
index 0db6ffc..b15672a 100755
--- a/examples/demo-template/customer-app-cli/pom.xml
+++ b/examples/demo-template/customer-app-cli/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/customer-app-filter/pom.xml b/examples/demo-template/customer-app-filter/pom.xml
index fb17b6b..6c141fa 100755
--- a/examples/demo-template/customer-app-filter/pom.xml
+++ b/examples/demo-template/customer-app-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/customer-app-js/pom.xml b/examples/demo-template/customer-app-js/pom.xml
index 035cb24..d0fd979 100755
--- a/examples/demo-template/customer-app-js/pom.xml
+++ b/examples/demo-template/customer-app-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml
index f3465e7..298929f 100755
--- a/examples/demo-template/database-service/pom.xml
+++ b/examples/demo-template/database-service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/example-ear/pom.xml b/examples/demo-template/example-ear/pom.xml
index 1188da8..6c03852 100755
--- a/examples/demo-template/example-ear/pom.xml
+++ b/examples/demo-template/example-ear/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/offline-access-app/pom.xml b/examples/demo-template/offline-access-app/pom.xml
index 8c715dd..990cea2 100644
--- a/examples/demo-template/offline-access-app/pom.xml
+++ b/examples/demo-template/offline-access-app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/demo-template/pom.xml 2(+1 -1)
diff --git a/examples/demo-template/pom.xml b/examples/demo-template/pom.xml
index ef1cf5f..eb5b8c8 100755
--- a/examples/demo-template/pom.xml
+++ b/examples/demo-template/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Examples</name>
diff --git a/examples/demo-template/product-app/pom.xml b/examples/demo-template/product-app/pom.xml
index 93d2425..c055d20 100755
--- a/examples/demo-template/product-app/pom.xml
+++ b/examples/demo-template/product-app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/service-account/pom.xml b/examples/demo-template/service-account/pom.xml
index 33f9e5e..4dbe8a4 100644
--- a/examples/demo-template/service-account/pom.xml
+++ b/examples/demo-template/service-account/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/testrealm.json b/examples/demo-template/testrealm.json
index fdebfc7..1917a02 100755
--- a/examples/demo-template/testrealm.json
+++ b/examples/demo-template/testrealm.json
@@ -69,7 +69,8 @@
],
"realmRoles": [ "user","admin" ],
"clientRoles": {
- "realm-management": [ "realm-admin" ]
+ "realm-management": [ "realm-admin" ],
+ "account": [ "manage-account" ]
}
},
{
diff --git a/examples/demo-template/third-party/pom.xml b/examples/demo-template/third-party/pom.xml
index 7a7ba61..f15a607 100755
--- a/examples/demo-template/third-party/pom.xml
+++ b/examples/demo-template/third-party/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml
index 9c25818..8ee3f86 100755
--- a/examples/demo-template/third-party-cdi/pom.xml
+++ b/examples/demo-template/third-party-cdi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-demo-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/fuse/camel/pom.xml 2(+1 -1)
diff --git a/examples/fuse/camel/pom.xml b/examples/fuse/camel/pom.xml
index 68f88f7..5edfef7 100755
--- a/examples/fuse/camel/pom.xml
+++ b/examples/fuse/camel/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-fuse-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/fuse/customer-app-fuse/pom.xml b/examples/fuse/customer-app-fuse/pom.xml
index 196227c..2185351 100755
--- a/examples/fuse/customer-app-fuse/pom.xml
+++ b/examples/fuse/customer-app-fuse/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-fuse-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/fuse/cxf-jaxrs/pom.xml 2(+1 -1)
diff --git a/examples/fuse/cxf-jaxrs/pom.xml b/examples/fuse/cxf-jaxrs/pom.xml
index c4a4ec1..67462c5 100755
--- a/examples/fuse/cxf-jaxrs/pom.xml
+++ b/examples/fuse/cxf-jaxrs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-fuse-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/fuse/cxf-jaxws/pom.xml 2(+1 -1)
diff --git a/examples/fuse/cxf-jaxws/pom.xml b/examples/fuse/cxf-jaxws/pom.xml
index 16545de..37e10b9 100755
--- a/examples/fuse/cxf-jaxws/pom.xml
+++ b/examples/fuse/cxf-jaxws/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-fuse-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/fuse/features/pom.xml 2(+1 -1)
diff --git a/examples/fuse/features/pom.xml b/examples/fuse/features/pom.xml
index a733867..a82fc2b 100755
--- a/examples/fuse/features/pom.xml
+++ b/examples/fuse/features/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-fuse-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/fuse/pom.xml 2(+1 -1)
diff --git a/examples/fuse/pom.xml b/examples/fuse/pom.xml
index f04011b..fa5b564 100755
--- a/examples/fuse/pom.xml
+++ b/examples/fuse/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Fuse examples</name>
diff --git a/examples/fuse/product-app-fuse/pom.xml b/examples/fuse/product-app-fuse/pom.xml
index 5fa2684..ca7f49b 100755
--- a/examples/fuse/product-app-fuse/pom.xml
+++ b/examples/fuse/product-app-fuse/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-fuse-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/js-console/pom.xml 2(+1 -1)
diff --git a/examples/js-console/pom.xml b/examples/js-console/pom.xml
index c777505..8a6c157 100755
--- a/examples/js-console/pom.xml
+++ b/examples/js-console/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/kerberos/pom.xml 2(+1 -1)
diff --git a/examples/kerberos/pom.xml b/examples/kerberos/pom.xml
index 9d9dc25..226ea63 100755
--- a/examples/kerberos/pom.xml
+++ b/examples/kerberos/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Examples - Kerberos Credential Delegation</name>
examples/ldap/pom.xml 2(+1 -1)
diff --git a/examples/ldap/pom.xml b/examples/ldap/pom.xml
index d3767e3..2a09808 100644
--- a/examples/ldap/pom.xml
+++ b/examples/ldap/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
examples/multi-tenant/pom.xml 2(+1 -1)
diff --git a/examples/multi-tenant/pom.xml b/examples/multi-tenant/pom.xml
index f046804..0d1e380 100755
--- a/examples/multi-tenant/pom.xml
+++ b/examples/multi-tenant/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak Examples - Multi Tenant</name>
examples/pom.xml 2(+1 -1)
diff --git a/examples/pom.xml b/examples/pom.xml
index 11d480b..dd91c30 100755
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Examples</name>
diff --git a/examples/providers/authenticator/pom.xml b/examples/providers/authenticator/pom.xml
index 42fe6c5..35f30a0 100755
--- a/examples/providers/authenticator/pom.xml
+++ b/examples/providers/authenticator/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-providers-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Authenticator Example</name>
diff --git a/examples/providers/event-listener-sysout/pom.xml b/examples/providers/event-listener-sysout/pom.xml
index 3f4fb25..8050ef7 100755
--- a/examples/providers/event-listener-sysout/pom.xml
+++ b/examples/providers/event-listener-sysout/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-providers-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Event Listener System.out Example</name>
diff --git a/examples/providers/event-store-mem/pom.xml b/examples/providers/event-store-mem/pom.xml
index e22a302..be6d636 100755
--- a/examples/providers/event-store-mem/pom.xml
+++ b/examples/providers/event-store-mem/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-providers-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Event Store In-Mem Example</name>
diff --git a/examples/providers/federation-provider/pom.xml b/examples/providers/federation-provider/pom.xml
index 1bcf250..8823071 100755
--- a/examples/providers/federation-provider/pom.xml
+++ b/examples/providers/federation-provider/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-providers-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Properties Authentication Provider Example</name>
examples/providers/pom.xml 2(+1 -1)
diff --git a/examples/providers/pom.xml b/examples/providers/pom.xml
index b6601a4..1c3c418 100755
--- a/examples/providers/pom.xml
+++ b/examples/providers/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Provider Examples</name>
examples/saml/pom.xml 2(+1 -1)
diff --git a/examples/saml/pom.xml b/examples/saml/pom.xml
index dbf2cd0..74c2ba5 100755
--- a/examples/saml/pom.xml
+++ b/examples/saml/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Provider Examples</name>
diff --git a/examples/saml/post-with-encryption/pom.xml b/examples/saml/post-with-encryption/pom.xml
index c6f7d6e..2f84cb5 100755
--- a/examples/saml/post-with-encryption/pom.xml
+++ b/examples/saml/post-with-encryption/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-saml-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>saml-post-encryption</artifactId>
diff --git a/examples/saml/post-with-signature/pom.xml b/examples/saml/post-with-signature/pom.xml
index 0f2c676..6f0740b 100755
--- a/examples/saml/post-with-signature/pom.xml
+++ b/examples/saml/post-with-signature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-saml-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>sales-post-sig</artifactId>
diff --git a/examples/saml/redirect-with-signature/pom.xml b/examples/saml/redirect-with-signature/pom.xml
index d7b56cd..f069408 100755
--- a/examples/saml/redirect-with-signature/pom.xml
+++ b/examples/saml/redirect-with-signature/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-saml-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>saml-redirect-signatures</artifactId>
examples/saml/servlet-filter/pom.xml 2(+1 -1)
diff --git a/examples/saml/servlet-filter/pom.xml b/examples/saml/servlet-filter/pom.xml
index 0d3aa7d..c67f6d4 100755
--- a/examples/saml/servlet-filter/pom.xml
+++ b/examples/saml/servlet-filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-examples-saml-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>saml-servlet-filter</artifactId>
examples/themes/pom.xml 2(+1 -1)
diff --git a/examples/themes/pom.xml b/examples/themes/pom.xml
index 92b7225..6a5ce62 100755
--- a/examples/themes/pom.xml
+++ b/examples/themes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-examples-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Themes Examples</name>
diff --git a/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css b/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css
index eba035d..e58ebb4 100755
--- a/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css
+++ b/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css
@@ -18,4 +18,5 @@
#kc-logo-wrapper {
background: url("../img/red-hat-logo.png") no-repeat top right;
height: 45px;
+ width: 200px;
}
diff --git a/examples/themes/src/main/resources/theme/sunrise/login/resources/css/styles.css b/examples/themes/src/main/resources/theme/sunrise/login/resources/css/styles.css
index 5449354..325a9cf 100644
--- a/examples/themes/src/main/resources/theme/sunrise/login/resources/css/styles.css
+++ b/examples/themes/src/main/resources/theme/sunrise/login/resources/css/styles.css
@@ -40,18 +40,6 @@ div#kc-content {
margin-left: -225px;
}
-h2#kc-header {
- position: fixed;
- top: 50px;
- left: 0;
- width: 100%;
- text-align: center;
- margin: 0 auto;
- color: rgba(255, 255, 255, 0.08);
- text-shadow: none;
- font-size: 80px;
-}
-
div#kc-form {
float: left;
width: 350px;
@@ -154,15 +142,7 @@ div.feedback-error {
}
div#kc-header {
- background-image: url('../img/logo.png');
- background-repeat: no-repeat;
- height: 500px;
- position: absolute;
- left: 30px;
- top: 30px;
- width: 500px;
- z-index: -1;
- text-indent: -9999px;
+ display: none;
}
div#kc-registration {
@@ -210,4 +190,4 @@ a.zocial {
border-radius: 0;
padding-top: 0.2em;
padding-bottom: 0.2em;
-}
\ No newline at end of file
+}
federation/kerberos/pom.xml 2(+1 -1)
diff --git a/federation/kerberos/pom.xml b/federation/kerberos/pom.xml
index 6ece100..8634b56 100755
--- a/federation/kerberos/pom.xml
+++ b/federation/kerberos/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
federation/ldap/pom.xml 2(+1 -1)
diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml
index a80200a..a47374c 100755
--- a/federation/ldap/pom.xml
+++ b/federation/ldap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/model/LDAPDn.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/model/LDAPDn.java
index 239639c..a872b77 100644
--- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/model/LDAPDn.java
+++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/model/LDAPDn.java
@@ -23,6 +23,8 @@ import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.naming.ldap.Rdn;
+
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
@@ -127,7 +129,7 @@ public class LDAPDn {
}
public void addFirst(String rdnName, String rdnValue) {
- rdnValue = escape(rdnValue);
+ rdnValue = Rdn.escapeValue(rdnValue);
entries.addFirst(new Entry(rdnName, rdnValue));
}
@@ -135,26 +137,6 @@ public class LDAPDn {
entries.addLast(new Entry(rdnName, rdnValue));
}
- // Need to escape "john,dot" to be "john\,dot"
- private String escape(String rdnValue) {
- if (rdnValue.contains(",")) {
- StringBuilder result = new StringBuilder();
- boolean first = true;
- for (String split : rdnValue.split(",")) {
- if (!first) {
- result.append("\\,");
- } else {
- first = false;
- }
- result.append(split);
- }
- return result.toString();
- } else {
- return rdnValue;
- }
- }
-
-
private static class Entry {
private final String attrName;
private final String attrValue;
diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/store/ldap/LDAPOperationManager.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/store/ldap/LDAPOperationManager.java
index cf2b7ca..59b76be 100644
--- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/store/ldap/LDAPOperationManager.java
+++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/idm/store/ldap/LDAPOperationManager.java
@@ -480,15 +480,6 @@ public class LDAPOperationManager {
env.put(Context.INITIAL_CONTEXT_FACTORY, this.config.getFactoryName());
env.put(Context.SECURITY_AUTHENTICATION, authType);
- String protocol = this.config.getSecurityProtocol();
-
- if (protocol != null) {
- env.put(Context.SECURITY_PROTOCOL, protocol);
- if ("ssl".equals(protocol)) {
- env.put("java.naming.ldap.factory.socket", "org.keycloak.connections.truststore.SSLSocketFactory");
- }
- }
-
String bindDN = this.config.getBindDN();
char[] bindCredential = null;
@@ -510,6 +501,9 @@ public class LDAPOperationManager {
logger.warn("LDAP URL is null. LDAPOperationManager won't work correctly");
}
+ String useTruststoreSpi = this.config.getUseTruststoreSpi();
+ LDAPConstants.setTruststoreSpiIfNeeded(useTruststoreSpi, url, env);
+
String connectionPooling = this.config.getConnectionPooling();
if (connectionPooling != null) {
env.put("com.sun.jndi.ldap.connect.pool", connectionPooling);
diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPConfig.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPConfig.java
index 537f6c8..15af133 100644
--- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPConfig.java
+++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPConfig.java
@@ -58,9 +58,8 @@ public class LDAPConfig {
}
}
- public String getSecurityProtocol() {
- // hardcoded for now
- return config.get(LDAPConstants.SECURITY_PROTOCOL);
+ public String getUseTruststoreSpi() {
+ return config.get(LDAPConstants.USE_TRUSTSTORE_SPI);
}
public String getUsersDn() {
diff --git a/federation/ldap/src/test/java/org/keycloak/federation/ldap/idm/model/LDAPDnTest.java b/federation/ldap/src/test/java/org/keycloak/federation/ldap/idm/model/LDAPDnTest.java
index cd7938c..620a166 100644
--- a/federation/ldap/src/test/java/org/keycloak/federation/ldap/idm/model/LDAPDnTest.java
+++ b/federation/ldap/src/test/java/org/keycloak/federation/ldap/idm/model/LDAPDnTest.java
@@ -31,9 +31,9 @@ public class LDAPDnTest {
dn.addFirst("ou", "People");
Assert.assertEquals("ou=People,dc=keycloak,dc=org", dn.toString());
- dn.addFirst("uid", "Johny,Depp");
- Assert.assertEquals("uid=Johny\\,Depp,ou=People,dc=keycloak,dc=org", dn.toString());
- Assert.assertEquals(LDAPDn.fromString("uid=Johny\\,Depp,ou=People,dc=keycloak,dc=org"), dn);
+ dn.addFirst("uid", "Johny,Depp+Pepp");
+ Assert.assertEquals("uid=Johny\\,Depp\\+Pepp,ou=People,dc=keycloak,dc=org", dn.toString());
+ Assert.assertEquals(LDAPDn.fromString("uid=Johny\\,Depp\\+Pepp,ou=People,dc=keycloak,dc=org"), dn);
Assert.assertEquals("ou=People,dc=keycloak,dc=org", dn.getParentDn());
@@ -44,6 +44,6 @@ public class LDAPDnTest {
Assert.assertFalse(dn.isDescendantOf(dn));
Assert.assertEquals("uid", dn.getFirstRdnAttrName());
- Assert.assertEquals("Johny\\,Depp", dn.getFirstRdnAttrValue());
+ Assert.assertEquals("Johny\\,Depp\\+Pepp", dn.getFirstRdnAttrValue());
}
}
federation/pom.xml 2(+1 -1)
diff --git a/federation/pom.xml b/federation/pom.xml
index 26c89a0..c60cd1c 100755
--- a/federation/pom.xml
+++ b/federation/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/admin-client/pom.xml 2(+1 -1)
diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml
index fb85f1f..00b5c27 100755
--- a/integration/admin-client/pom.xml
+++ b/integration/admin-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-integration-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration/client-registration/pom.xml b/integration/client-registration/pom.xml
index 0a4087b..b0d72f6 100755
--- a/integration/client-registration/pom.xml
+++ b/integration/client-registration/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-integration-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
integration/pom.xml 2(+1 -1)
diff --git a/integration/pom.xml b/integration/pom.xml
index 09ddf07..adf1219 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Keycloak Integration</name>
model/infinispan/pom.xml 2(+1 -1)
diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml
index a66369a..87f1711 100755
--- a/model/infinispan/pom.xml
+++ b/model/infinispan/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java
index 8602834..7630225 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java
@@ -269,7 +269,8 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
@Override
public void removeUserSession(RealmModel realm, UserSessionModel session) {
- removeUserSession(realm, session.getId(), false);
+ UserSessionEntity entity = getUserSessionEntity(session, false);
+ removeUserSession(realm, entity, false);
}
@Override
@@ -280,9 +281,10 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
protected void removeUserSessions(RealmModel realm, UserModel user, boolean offline) {
Cache<String, SessionEntity> cache = getCache(offline);
- Iterator<String> itr = cache.entrySet().stream().filter(UserSessionPredicate.create(realm.getId()).user(user.getId())).map(Mappers.sessionId()).iterator();
+ Iterator<SessionEntity> itr = cache.entrySet().stream().filter(UserSessionPredicate.create(realm.getId()).user(user.getId())).map(Mappers.sessionEntity()).iterator();
while (itr.hasNext()) {
- removeUserSession(realm, itr.next(), offline);
+ UserSessionEntity userSessionEntity = (UserSessionEntity) itr.next();
+ removeUserSession(realm, userSessionEntity, offline);
}
}
@@ -486,12 +488,11 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
}
}
- protected void removeUserSession(RealmModel realm, String userSessionId, boolean offline) {
+ protected void removeUserSession(RealmModel realm, UserSessionEntity sessionEntity, boolean offline) {
Cache<String, SessionEntity> cache = getCache(offline);
- tx.remove(cache, userSessionId);
+ tx.remove(cache, sessionEntity.getId());
- UserSessionEntity sessionEntity = (UserSessionEntity) cache.get(userSessionId);
if (sessionEntity.getClientSessions() != null) {
for (String clientSessionId : sessionEntity.getClientSessions()) {
tx.remove(cache, clientSessionId);
@@ -547,6 +548,15 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
return models;
}
+ UserSessionEntity getUserSessionEntity(UserSessionModel userSession, boolean offline) {
+ if (userSession instanceof UserSessionAdapter) {
+ return ((UserSessionAdapter) userSession).getEntity();
+ } else {
+ Cache<String, SessionEntity> cache = getCache(offline);
+ return (UserSessionEntity) cache.get(userSession.getId());
+ }
+ }
+
@Override
public UserSessionModel createOfflineUserSession(UserSessionModel userSession) {
@@ -566,8 +576,9 @@ public class InfinispanUserSessionProvider implements UserSessionProvider {
}
@Override
- public void removeOfflineUserSession(RealmModel realm, String userSessionId) {
- removeUserSession(realm, userSessionId, true);
+ public void removeOfflineUserSession(RealmModel realm, UserSessionModel userSession) {
+ UserSessionEntity userSessionEntity = getUserSessionEntity(userSession, true);
+ removeUserSession(realm, userSessionEntity, true);
}
@Override
diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java
index a06f575..6bf1358 100644
--- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java
@@ -45,6 +45,10 @@ public class Mappers {
return new SessionIdMapper();
}
+ public static Function<Map.Entry<String, SessionEntity>, SessionEntity> sessionEntity() {
+ return new SessionEntityMapper();
+ }
+
public static Function<Map.Entry<LoginFailureKey, LoginFailureEntity>, LoginFailureKey> loginFailureId() {
return new LoginFailureIdMapper();
}
@@ -76,6 +80,13 @@ public class Mappers {
}
}
+ private static class SessionEntityMapper implements Function<Map.Entry<String, SessionEntity>, SessionEntity>, Serializable {
+ @Override
+ public SessionEntity apply(Map.Entry<String, SessionEntity> entry) {
+ return entry.getValue();
+ }
+ }
+
private static class LoginFailureIdMapper implements Function<Map.Entry<LoginFailureKey, LoginFailureEntity>, LoginFailureKey>, Serializable {
@Override
public LoginFailureKey apply(Map.Entry<LoginFailureKey, LoginFailureEntity> entry) {
model/jpa/pom.xml 2(+1 -1)
diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
index 6b03eec..57baeea 100755
--- a/model/jpa/pom.xml
+++ b/model/jpa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java
new file mode 100644
index 0000000..959c751
--- /dev/null
+++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016 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.connections.jpa.updater.liquibase.custom;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import liquibase.exception.CustomChangeException;
+import liquibase.statement.core.UpdateStatement;
+import liquibase.structure.core.Table;
+
+/**
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class JpaUpdate1_9_0_Final extends CustomKeycloakTask {
+
+ @Override
+ protected void generateStatementsImpl() throws CustomChangeException {
+ String userFederationProviderTableName = database.correctObjectName("USER_FEDERATION_PROVIDER", Table.class);
+
+ try {
+ PreparedStatement statement = jdbcConnection.prepareStatement("select REALM_ID, USERFEDERATIONPROVIDERS_ID from " + getTableName("FED_PROVIDERS"));
+
+ try {
+ ResultSet resultSet = statement.executeQuery();
+ try {
+ while (resultSet.next()) {
+ String realmId = resultSet.getString(1);
+ String userFederationProviderId = resultSet.getString(2);
+
+ UpdateStatement updateStatement = new UpdateStatement(null, null, userFederationProviderTableName)
+ .addNewColumnValue("REALM_ID", realmId)
+ .setWhereClause("ID='" + userFederationProviderId + "'");
+ statements.add(updateStatement);
+ }
+ } finally {
+ resultSet.close();
+ }
+ } finally {
+ statement.close();
+ }
+
+ confirmationMessage.append("Updated " + statements.size() + " records in USER_FEDERATION_PROVIDER table");
+ } catch (Exception e) {
+ throw new CustomChangeException(getTaskId() + ": Exception when updating data from previous version", e);
+ }
+ }
+
+ @Override
+ protected String getTaskId() {
+ return "Update 1.9.0.Final";
+ }
+}
diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml
index 5b3b2b4..d86b502 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.0.xml
@@ -60,6 +60,8 @@
<where>ACCESS_TOKEN_LIFE_IMPLICIT is NULL</where>
</update>
+ <customChange class="org.keycloak.connections.jpa.updater.liquibase.custom.JpaUpdate1_9_0_Final"/>
+
<dropForeignKeyConstraint baseTableName="REALM_CLIENT" constraintName="FK_93S3P0DIUXAWWQQSA528UBY2Q"/>
<dropForeignKeyConstraint baseTableName="REALM_CLIENT" constraintName="FK_M6QGA3RFME47335JY8JXYXH3I"/>
<dropUniqueConstraint tableName="REALM_CLIENT" constraintName="UK_M6QGA3RFME47335JY8JXYXH3I" />
model/mongo/pom.xml 2(+1 -1)
diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml
index edee624..be0bd9b 100755
--- a/model/mongo/pom.xml
+++ b/model/mongo/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
model/pom.xml 2(+1 -1)
diff --git a/model/pom.xml b/model/pom.xml
index 4fe4c76..3aeb364 100755
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Keycloak Model Parent</name>
pom.xml 7(+5 -2)
diff --git a/pom.xml b/pom.xml
old mode 100755
new mode 100644
index 91ba3c8..8486817
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
</description>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -108,6 +108,9 @@
<minify.plugin.version>1.7.2</minify.plugin.version>
<osgi.bundle.plugin.version>2.3.7</osgi.bundle.plugin.version>
<wildfly.plugin.version>1.0.1.Final</wildfly.plugin.version>
+
+ <!-- Surefire Settings -->
+ <surefire.memory.settings>-Xms512m -Xmx2048m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m</surefire.memory.settings>
</properties>
<url>http://keycloak.org</url>
@@ -1221,7 +1224,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
- <argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=1024m</argLine>
+ <argLine>${surefire.memory.settings}</argLine>
</configuration>
</plugin>
<plugin>
proxy/launcher/pom.xml 2(+1 -1)
diff --git a/proxy/launcher/pom.xml b/proxy/launcher/pom.xml
index 3453ae6..e1876eb 100755
--- a/proxy/launcher/pom.xml
+++ b/proxy/launcher/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
proxy/pom.xml 2(+1 -1)
diff --git a/proxy/pom.xml b/proxy/pom.xml
index f9949b2..cee6f92 100755
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Model Parent</name>
proxy/proxy-server/pom.xml 2(+1 -1)
diff --git a/proxy/proxy-server/pom.xml b/proxy/proxy-server/pom.xml
index 898ccb4..4d3227f 100755
--- a/proxy/proxy-server/pom.xml
+++ b/proxy/proxy-server/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
saml-core/pom.xml 2(+1 -1)
diff --git a/saml-core/pom.xml b/saml-core/pom.xml
index b0940bf..365c7aa 100755
--- a/saml-core/pom.xml
+++ b/saml-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
server-spi/pom.xml 2(+1 -1)
diff --git a/server-spi/pom.xml b/server-spi/pom.xml
index 58628a9..69f1c3c 100755
--- a/server-spi/pom.xml
+++ b/server-spi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/server-spi/src/main/java/org/keycloak/models/LDAPConstants.java b/server-spi/src/main/java/org/keycloak/models/LDAPConstants.java
index a8830b6..b560e18 100644
--- a/server-spi/src/main/java/org/keycloak/models/LDAPConstants.java
+++ b/server-spi/src/main/java/org/keycloak/models/LDAPConstants.java
@@ -17,6 +17,8 @@
package org.keycloak.models;
+import java.util.Map;
+
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
@@ -38,7 +40,6 @@ public class LDAPConstants {
public static final String USER_OBJECT_CLASSES = "userObjectClasses";
public static final String CONNECTION_URL = "connectionUrl";
- public static final String SECURITY_PROTOCOL = "securityProtocol";
public static final String BASE_DN = "baseDn"; // used for tests only
public static final String USERS_DN = "usersDn";
public static final String BIND_DN = "bindDn";
@@ -48,6 +49,11 @@ public class LDAPConstants {
public static final String AUTH_TYPE_NONE = "none";
public static final String AUTH_TYPE_SIMPLE = "simple";
+ public static final String USE_TRUSTSTORE_SPI = "useTruststoreSpi";
+ public static final String USE_TRUSTSTORE_ALWAYS = "always";
+ public static final String USE_TRUSTSTORE_NEVER = "never";
+ public static final String USE_TRUSTSTORE_LDAPS_ONLY = "ldapsOnly";
+
public static final String SEARCH_SCOPE = "searchScope";
public static final String CONNECTION_POOLING = "connectionPooling";
public static final String PAGINATION = "pagination";
@@ -119,4 +125,21 @@ public class LDAPConstants {
return ENTRY_UUID;
}
+
+
+
+ public static void setTruststoreSpiIfNeeded(String useTruststoreSpi, String url, Map<String, Object> env) {
+ boolean shouldSetTruststore;
+ if (useTruststoreSpi != null && useTruststoreSpi.equals(LDAPConstants.USE_TRUSTSTORE_ALWAYS)) {
+ shouldSetTruststore = true;
+ } else if (useTruststoreSpi != null && useTruststoreSpi.equals(LDAPConstants.USE_TRUSTSTORE_NEVER)) {
+ shouldSetTruststore = false;
+ } else {
+ shouldSetTruststore = (url != null && url.startsWith("ldaps"));
+ }
+
+ if (shouldSetTruststore) {
+ env.put("java.naming.ldap.factory.socket", "org.keycloak.truststore.SSLSocketFactory");
+ }
+ }
}
diff --git a/server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java b/server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java
index 57cd49c..d824584 100755
--- a/server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java
+++ b/server-spi/src/main/java/org/keycloak/models/UserSessionProvider.java
@@ -61,7 +61,7 @@ public interface UserSessionProvider extends Provider {
UserSessionModel getOfflineUserSession(RealmModel realm, String userSessionId);
// Removes the attached clientSessions as well
- void removeOfflineUserSession(RealmModel realm, String userSessionId);
+ void removeOfflineUserSession(RealmModel realm, UserSessionModel userSession);
ClientSessionModel createOfflineClientSession(ClientSessionModel clientSession);
ClientSessionModel getOfflineClientSession(RealmModel realm, String clientSessionId);
services/pom.xml 2(+1 -1)
diff --git a/services/pom.xml b/services/pom.xml
index c2d4392..ff4377a 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
index 36c4caa..b169f7c 100755
--- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
@@ -181,9 +181,7 @@ public class AuthenticationManager {
String authMethod = clientSession.getAuthMethod();
if (authMethod == null) continue; // must be a keycloak service like account
redirectClients.add(clientSession);
- continue;
- }
- if (client instanceof ClientModel && !client.isFrontchannelLogout()) {
+ } else {
String authMethod = clientSession.getAuthMethod();
if (authMethod == null) continue; // must be a keycloak service like account
LoginProtocol protocol = session.getProvider(LoginProtocol.class, authMethod);
diff --git a/services/src/main/java/org/keycloak/services/managers/LDAPConnectionTestManager.java b/services/src/main/java/org/keycloak/services/managers/LDAPConnectionTestManager.java
index 441dca2..e4c7ce6 100755
--- a/services/src/main/java/org/keycloak/services/managers/LDAPConnectionTestManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/LDAPConnectionTestManager.java
@@ -16,13 +16,14 @@
*/
package org.keycloak.services.managers;
-import org.keycloak.services.ServicesLogger;
-
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
import java.util.Hashtable;
+import org.keycloak.models.LDAPConstants;
+import org.keycloak.services.ServicesLogger;
+
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
@@ -33,7 +34,7 @@ public class LDAPConnectionTestManager {
public static final String TEST_CONNECTION = "testConnection";
public static final String TEST_AUTHENTICATION = "testAuthentication";
- public boolean testLDAP(String action, String connectionUrl, String bindDn, String bindCredential) {
+ public boolean testLDAP(String action, String connectionUrl, String bindDn, String bindCredential, String useTruststoreSpi) {
if (!TEST_CONNECTION.equals(action) && !TEST_AUTHENTICATION.equals(action)) {
logger.unknownAction(action);
return false;
@@ -43,10 +44,20 @@ public class LDAPConnectionTestManager {
try {
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+
+ if (connectionUrl == null) {
+ logger.errorf("Unknown connection URL");
+ return false;
+ }
env.put(Context.PROVIDER_URL, connectionUrl);
if (TEST_AUTHENTICATION.equals(action)) {
env.put(Context.SECURITY_AUTHENTICATION, "simple");
+
+ if (bindDn == null) {
+ logger.error("Unknown bind DN");
+ return false;
+ }
env.put(Context.SECURITY_PRINCIPAL, bindDn);
char[] bindCredentialChar = null;
@@ -56,6 +67,8 @@ public class LDAPConnectionTestManager {
env.put(Context.SECURITY_CREDENTIALS, bindCredentialChar);
}
+ LDAPConstants.setTruststoreSpiIfNeeded(useTruststoreSpi, connectionUrl, env);
+
ldapContext = new InitialLdapContext(env, null);
return true;
} catch (Exception ne) {
diff --git a/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java b/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java
index 3989bc4..e764adf 100644
--- a/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java
@@ -117,7 +117,7 @@ public class UserSessionManager {
kcSession.sessions().removeOfflineClientSession(realm, clientSession.getId());
persister.removeClientSession(clientSession.getId(), true);
- checkOfflineUserSessionHasClientSessions(realm, user, clientSession.getUserSession().getId(), clientSessions);
+ checkOfflineUserSessionHasClientSessions(realm, user, clientSession.getUserSession(), clientSessions);
anyRemoved = true;
}
}
@@ -129,7 +129,7 @@ public class UserSessionManager {
if (logger.isTraceEnabled()) {
logger.tracef("Removing offline user session '%s' for user '%s' ", userSession.getId(), userSession.getLoginUsername());
}
- kcSession.sessions().removeOfflineUserSession(userSession.getRealm(), userSession.getId());
+ kcSession.sessions().removeOfflineUserSession(userSession.getRealm(), userSession);
persister.removeUserSession(userSession.getId(), true);
}
@@ -165,7 +165,8 @@ public class UserSessionManager {
}
// Check if userSession has any offline clientSessions attached to it. Remove userSession if not
- private void checkOfflineUserSessionHasClientSessions(RealmModel realm, UserModel user, String userSessionId, List<ClientSessionModel> clientSessions) {
+ private void checkOfflineUserSessionHasClientSessions(RealmModel realm, UserModel user, UserSessionModel userSession, List<ClientSessionModel> clientSessions) {
+ String userSessionId = userSession.getId();
for (ClientSessionModel clientSession : clientSessions) {
if (clientSession.getUserSession().getId().equals(userSessionId)) {
return;
@@ -175,7 +176,7 @@ public class UserSessionManager {
if (logger.isTraceEnabled()) {
logger.tracef("Removing offline userSession for user %s as it doesn't have any client sessions attached. UserSessionID: %s", user.getUsername(), userSessionId);
}
- kcSession.sessions().removeOfflineUserSession(realm, userSessionId);
+ kcSession.sessions().removeOfflineUserSession(realm, userSession);
persister.removeUserSession(userSessionId, true);
}
}
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
index f0cbe8b..0c9f4ce 100644
--- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
@@ -652,10 +652,11 @@ public class RealmAdminResource {
@GET
@NoCache
public Response testLDAPConnection(@QueryParam("action") String action, @QueryParam("connectionUrl") String connectionUrl,
- @QueryParam("bindDn") String bindDn, @QueryParam("bindCredential") String bindCredential) {
+ @QueryParam("bindDn") String bindDn, @QueryParam("bindCredential") String bindCredential,
+ @QueryParam("useTruststoreSpi") String useTruststoreSpi) {
auth.init(RealmAuth.Resource.REALM).requireManage();
- boolean result = new LDAPConnectionTestManager().testLDAP(action, connectionUrl, bindDn, bindCredential);
+ boolean result = new LDAPConnectionTestManager().testLDAP(action, connectionUrl, bindDn, bindCredential, useTruststoreSpi);
return result ? Response.noContent().build() : ErrorResponse.error("LDAP test error", Response.Status.BAD_REQUEST);
}
testsuite/docker-cluster/pom.xml 2(+1 -1)
diff --git a/testsuite/docker-cluster/pom.xml b/testsuite/docker-cluster/pom.xml
index 7117317..30a6a56 100755
--- a/testsuite/docker-cluster/pom.xml
+++ b/testsuite/docker-cluster/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
testsuite/integration/pom.xml 2(+1 -1)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 8dafd44..531a2ae 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/FederationProvidersIntegrationTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/FederationProvidersIntegrationTest.java
index f6c59b0..273a125 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/FederationProvidersIntegrationTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/ldap/base/FederationProvidersIntegrationTest.java
@@ -405,6 +405,9 @@ public class FederationProvidersIntegrationTest {
if (!skip) {
LDAPObject johnComma = FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "john,comma", "John", "Comma", "johncomma@email.org", null, "12387");
FederationTestUtils.updateLDAPPassword(ldapFedProvider, johnComma, "Password1");
+
+ LDAPObject johnPlus = FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "john+plus,comma", "John", "Plus", "johnplus@email.org", null, "12387");
+ FederationTestUtils.updateLDAPPassword(ldapFedProvider, johnPlus, "Password1");
}
} finally {
keycloakRule.stopSession(session, false);
@@ -413,6 +416,7 @@ public class FederationProvidersIntegrationTest {
if (!skip) {
// Try to import the user with comma in username into Keycloak
loginSuccessAndLogout("john,comma", "Password1");
+ loginSuccessAndLogout("john+plus,comma", "Password1");
}
}
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
index f3e2ec0..84a901a 100644
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
@@ -47,6 +48,8 @@ import org.keycloak.timer.TimerProvider;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class SyncFederationTest {
+ private static final Logger log = Logger.getLogger(SyncFederationTest.class);
+
private static UserFederationProviderModel dummyModel = null;
@ClassRule
@@ -87,16 +90,29 @@ public class SyncFederationTest {
// Cancel timer
RealmModel appRealm = session.realms().getRealmByName("test");
usersSyncManager.notifyToRefreshPeriodicSync(session, appRealm, dummyModel, true);
+ log.infof("Notified sync manager about cancel periodic sync");
+
+ // This sync is here just to ensure that we have lock (doublecheck that periodic sync, which was possibly triggered before canceling timer is finished too)
+ while (true) {
+ UserFederationSyncResult result = usersSyncManager.syncChangedUsers(session.getKeycloakSessionFactory(), appRealm.getId(), dummyModel);
+ if (result.isIgnored()) {
+ log.infof("Still waiting for lock before periodic sync is finished", result.toString());
+ sleep(1000);
+ } else {
+ break;
+ }
+ }
- // Assert that DummyUserFederationProviderFactory.syncChangedUsers was invoked
+ // Assert that DummyUserFederationProviderFactory.syncChangedUsers was invoked at least 2 times (once periodically and once for us)
int newChanged = dummyFedFactory.getChangedSyncCounter();
Assert.assertEquals(full, dummyFedFactory.getFullSyncCounter());
- Assert.assertTrue(newChanged > changed);
+ Assert.assertTrue("Assertion failed. newChanged=" + newChanged + ", changed=" + changed, newChanged > (changed + 1));
// Assert that dummy provider won't be invoked anymore
sleep(1800);
Assert.assertEquals(full, dummyFedFactory.getFullSyncCounter());
- Assert.assertEquals(newChanged, dummyFedFactory.getChangedSyncCounter());
+ int newestChanged = dummyFedFactory.getChangedSyncCounter();
+ Assert.assertEquals("Assertion failed. newChanged=" + newChanged + ", newestChanged=" + newestChanged, newChanged, newestChanged);
} finally {
keycloakRule.stopSession(session, true);
}
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
index ab9f453..3da7d23 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java
@@ -380,6 +380,25 @@ public class UserSessionProviderTest {
}
}
+ // KEYCLOAK-2508
+ @Test
+ public void testRemovingExpiredSession() {
+ UserSessionModel[] sessions = createSessions();
+ try {
+ Time.setOffset(3600000);
+ UserSessionModel userSession = sessions[0];
+ RealmModel realm = userSession.getRealm();
+ session.sessions().removeExpired(realm);
+
+ resetSession();
+
+ // Assert no exception is thrown here
+ session.sessions().removeUserSession(realm, userSession);
+ } finally {
+ Time.setOffset(0);
+ }
+ }
+
@Test
public void testGetByClient() {
UserSessionModel[] sessions = createSessions();
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 8c3beb0..ffc8bfc 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-testsuite-pom</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml
index 97d7424..47bec1b 100644
--- a/testsuite/integration-arquillian/servers/eap7/pom.xml
+++ b/testsuite/integration-arquillian/servers/eap7/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-servers</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml
index a4a3c81..1546e35 100644
--- a/testsuite/integration-arquillian/servers/pom.xml
+++ b/testsuite/integration-arquillian/servers/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/servers/wildfly/pom.xml b/testsuite/integration-arquillian/servers/wildfly/pom.xml
index 21af0f2..bd822a1 100644
--- a/testsuite/integration-arquillian/servers/wildfly/pom.xml
+++ b/testsuite/integration-arquillian/servers/wildfly/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-servers</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml b/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml
index 895be72..4a03364 100644
--- a/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml
+++ b/testsuite/integration-arquillian/servers/wildfly-balancer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-servers</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index cc84be1..ecfe1ce 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractDemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractDemoExampleAdapterTest.java
index 92c5c24..5619885 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractDemoExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractDemoExampleAdapterTest.java
@@ -246,7 +246,10 @@ public abstract class AbstractDemoExampleAdapterTest extends AbstractExampleAdap
assertTrue(oAuthGrantPage.isCurrent());
loginEventsPage.navigateTo();
- loginPage.form().login(adminUser);
+ if (!testContext.isAdminLoggedIn()) {
+ loginPage.form().login(adminUser);
+ testContext.setAdminLoggedIn(true);
+ }
loginEventsPage.table().filter();
loginEventsPage.table().filterForm().addEventType("REVOKE_GRANT");
loginEventsPage.table().update();
diff --git a/testsuite/integration-arquillian/tests/other/adapters/as7/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/as7/pom.xml
index c19c34b..e585365 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/as7/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/as7/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
index 6ee862c..6a11a45 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
index 6eed06e..187a7c1 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
index 00b871d..da9b783 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/pom.xml
index b553592..22f7336 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-other</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>integration-arquillian-tests-adapters</artifactId>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/tomcat/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/tomcat/pom.xml
index 22b7d9f..5553475 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/tomcat/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/tomcat/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml
index 09f71a2..63b4082 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/wildfly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>integration-arquillian-adapters-wildfly</artifactId>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml
index 887a4d9..1e3ca88 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/wildfly8/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/wildfly-relative/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/wildfly-relative/pom.xml
index 983e815..fb919f6 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/wildfly-relative/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/wildfly-relative/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-adapters</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/integration-arquillian/tests/other/console/pom.xml b/testsuite/integration-arquillian/tests/other/console/pom.xml
index f9ea089..b681814 100644
--- a/testsuite/integration-arquillian/tests/other/console/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/console/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-other</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>integration-arquillian-tests-console</artifactId>
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/auth_mellon.conf b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/auth_mellon.conf
index 4ab4785..6a0af54 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/auth_mellon.conf
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/auth_mellon.conf
@@ -20,8 +20,10 @@ MellonLockFile "/run/mod_auth_mellon/lock"
# It is the URL to this location that is used as the second parameter to the metadata generation script.
# This path is relative to the root of the web server.
MellonEndpointPath /mellon
+
+ MellonSessionLength 2
</Location>
<Location /auth>
- MellonEnable "auth"
+ MellonEnable "auth"
</Location>
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/mellon/http_localhost_auth.xml b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/mellon/http_localhost_auth.xml
index 45a3a88..8e1ebde 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/mellon/http_localhost_auth.xml
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker/mellon/http_localhost_auth.xml
@@ -71,9 +71,6 @@
Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
Location="http://localhost:8380/mellon/logout"/>
<SingleLogoutService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="http://localhost:8380/mellon/logout"/>
- <SingleLogoutService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
Location="http://localhost:8380/mellon/logout"/>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/auth_mellon.conf b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/auth_mellon.conf
new file mode 100644
index 0000000..31bd552
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/auth_mellon.conf
@@ -0,0 +1,31 @@
+MellonCacheSize 100
+MellonLockFile "/run/mod_auth_mellon/lock"
+
+# This is a server-wide configuration that will add information from the Mellon session to all requests.
+<Location />
+ # Add information from the mod_auth_mellon session to the request.
+ MellonEnable "info"
+
+ # Configure the SP metadata
+ # This should be the files which were created when creating SP metadata.
+ MellonSPPrivateKeyFile /etc/apache2/mellon/http_localhost_auth_.key
+
+ MellonSPCertFile /etc/apache2/mellon/http_localhost_auth_.cert
+ MellonSPMetadataFile /etc/apache2/mellon/http_localhost_auth_.xml
+
+ # IdP metadata. This should be the metadata file you got from the IdP.
+ MellonIdPMetadataFile /etc/apache2/mellon/idp-metadata.xml
+
+ # The location all endpoints should be located under.
+ # It is the URL to this location that is used as the second parameter to the metadata generation script.
+ # This path is relative to the root of the web server.
+ MellonEndpointPath /mellon
+
+ MellonVariable "cookie2"
+</Location>
+
+<Location /auth2>
+ MellonEnable "auth"
+
+ MellonCond "Role" "manager"
+</Location>
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/Dockerfile b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/Dockerfile
new file mode 100644
index 0000000..56becef
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/Dockerfile
@@ -0,0 +1,17 @@
+FROM ubuntu
+
+RUN apt-get update && apt-get install -y apache2 && apt-get install -y libapache2-mod-auth-mellon
+
+RUN mkdir /etc/apache2/mellon
+
+COPY mellon/* /etc/apache2/mellon/
+
+COPY auth_mellon.conf /etc/apache2/mods-enabled/
+
+COPY www/* /var/www/html/
+
+RUN mkdir /var/www/html/auth2
+
+COPY www/auth2/* /var/www/html/auth2/
+
+CMD /usr/sbin/apache2ctl -D FOREGROUND
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.cert b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.cert
new file mode 100644
index 0000000..b5f9541
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.cert
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICrjCCAZYCCQCrriL//w2/KDANBgkqhkiG9w0BAQsFADAZMRcwFQYDVQQDDA5s
+b2NhbGhvc3Q6ODQ4MDAeFw0xNjAyMTcxMDQzMjhaFw0yNjAyMTYxMDQzMjhaMBkx
+FzAVBgNVBAMMDmxvY2FsaG9zdDo4NDgwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAw0VE8Q0jNc2bl0OSZWvKQQIIowBie3rGgRfBB0TzO5sjBbJSQYPh
+HBWb61gB4Cx1TvCQdefgVvhB1Heq9VFdRKRtZLl2I9RaOYPpLpBXLl10yHLGUKMz
+KVT1bpKNY4hCDN46nrxiYcbi+ZLsiezAITLEsPls2KWq5IFb0Nh/8aLRv3glk1aL
+aUtSSM1c/qGk7al9rfjG6HuUutaOYtpy4dTTsMkKUmHwBTeMkSYzLnmNVgyRFN8Q
+WPf02B1TtL5cEfrm7frWsSKxUmVcmz5pz3akjd5HD3tNJC1RGCoWQG61g7hW25y1
+MRHcYXlJajSFp9KmGbkB30OpTJgky7NpGQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQApi0LyRNInVXfKqdAo1dMRzVso5CPSVuNUd/YwdRS5aYtGUx44SA2kGnuzo9XP
+c0OSJzuMMPRuwkL91Du8283rQT1wERvJrt1Zbs90RAwNNvpTZ4uzgZp/Kxlr8tQ8
+LuUsUcbBgNuI9LV51po0yZlxXGu/pfs7HNRVV2zfItkAO7OKj00f+Mn0+JLhJ9PJ
+oYvfPFQnAU3oFkYlc7FIYUeFKbFFG9KCkwb39vkuIHjcCEVFBCkdERefTBBptmXd
+emOI+tY7m1pzpkVzNDGX0OtEoGDokZHKL9xJUPU5Ao15OhVY0bp84uf1wjVvDVrg
+/8HfSSKirVjrlumRGariq8aw
+-----END CERTIFICATE-----
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.key b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.key
new file mode 100644
index 0000000..4393127
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDDRUTxDSM1zZuX
+Q5Jla8pBAgijAGJ7esaBF8EHRPM7myMFslJBg+EcFZvrWAHgLHVO8JB15+BW+EHU
+d6r1UV1EpG1kuXYj1Fo5g+kukFcuXXTIcsZQozMpVPVuko1jiEIM3jqevGJhxuL5
+kuyJ7MAhMsSw+WzYparkgVvQ2H/xotG/eCWTVotpS1JIzVz+oaTtqX2t+Mboe5S6
+1o5i2nLh1NOwyQpSYfAFN4yRJjMueY1WDJEU3xBY9/TYHVO0vlwR+ubt+taxIrFS
+ZVybPmnPdqSN3kcPe00kLVEYKhZAbrWDuFbbnLUxEdxheUlqNIWn0qYZuQHfQ6lM
+mCTLs2kZAgMBAAECggEARTJu090L9Sz/TgMsBbTE33SRCvI/8/H2FhkM1j6g0yaO
+qp4eeAj75K/jqOpu/7nBeE/XYXDiFu+ypFAjzPsgSgramS7/poLB1k/gehe8TTnh
+AIdrr3el0afBsYVNhU/r2BOIQmgPlQaduENQfy/eheUvvmclI0DR5lfQ6ZlO/ZlO
+s/agiziupR9ceHYCTkQpc9GI/byvVBdXIp9PSMjNhBcYv3SUP1FnhWoV2tlAZwOm
+VfB6yvZtNLp952AvsKxun6lmQQDsNhiWzCGw6cHf/aFPjEttLKHv0u6mobpM/d95
+AF+bifCweJZnfrYCE2sHTX8rzXoQ6laP6m0d8bYlgQKBgQDgsHUXSGCQYTvcmwQF
+CMhk5arQGjg7PHzFj0Mv/45b1X19MYnTRNpFx5G2Rpa4+5EKEVguUZlUXeVAxfx5
+nn/R6GCSqcOqf+Fb4nRDJrYABJIVCywEeUqRdZjt3VsFBIcXykTItVC4eBDlwNIy
+5ELB8QL7pgRAso3LVBfRdv+SjQKBgQDee1UEkncP9JfzslhCqSUXjgCnPGMDmCsh
+bMLhE5PNiVYMymjitJPY50weBOeJt2e0SBGWwPdWF7yEm11bWyjEDgA0lOndiuLV
+hHvCHUmbRQOh968+4dzSBvUb4llxcQfncs8MPI+ZJeyXghSENY1KzqNLbQcMb49k
+y0uWRqLTvQKBgQCST9Wvl53p5qdIfFkdvh5gNX4JjUlYqYbGTwf9VXiqLFdPEtch
+EBDip5YnD8hOJOLJn4nAf7pMyefjSgmiWKf7VEqutoWHnUZuwwPaRnb1hARsV54O
+O71nAyDWo/IFTnF5+GjaGde6h9TZB7rZEPK3v+2lWPIj/yF+agAokkjScQKBgQCs
+KVAe26AazrGPOSEnZHB5i79hqk8MhwJJOTqMpXOoh2/5MeB8HjSSklnKmQz6+tvb
+HDHQML609mVBUGCrwx0Gqbbq+ZkHgOQLShvimHtPFda7zUjlJi6UsCGYVE3WhRsS
+tTsXQv30Cu7MRzLNJAuUKdcfFN1xeBrEarSxMzPpGQKBgQCGyCSxoHafI78fuLB8
+lfMif3QcILxn409GxypMEc5G7iWyo+vfoMmRNjcr6zZ1luvmTqHl7mAroUpJ9X33
+6Ctw4O3r/utS03AwwOaEfpmlxMQVu5ySFICqZjMHHjvbUFQE2KPlQOqcjChT4S3n
+2vRK05BKbdFqlCprQtFtkA3q+g==
+-----END PRIVATE KEY-----
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.xml b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.xml
new file mode 100644
index 0000000..d69e131
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/http_localhost_auth_.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<EntityDescriptor
+ entityID="http://localhost:8480/auth2"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <SPSSODescriptor
+ AuthnRequestsSigned="false"
+ WantAssertionsSigned="false"
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIICrjCCAZYCCQCrriL//w2/KDANBgkqhkiG9w0BAQsFADAZMRcwFQYDVQQDDA5s
+b2NhbGhvc3Q6ODQ4MDAeFw0xNjAyMTcxMDQzMjhaFw0yNjAyMTYxMDQzMjhaMBkx
+FzAVBgNVBAMMDmxvY2FsaG9zdDo4NDgwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAw0VE8Q0jNc2bl0OSZWvKQQIIowBie3rGgRfBB0TzO5sjBbJSQYPh
+HBWb61gB4Cx1TvCQdefgVvhB1Heq9VFdRKRtZLl2I9RaOYPpLpBXLl10yHLGUKMz
+KVT1bpKNY4hCDN46nrxiYcbi+ZLsiezAITLEsPls2KWq5IFb0Nh/8aLRv3glk1aL
+aUtSSM1c/qGk7al9rfjG6HuUutaOYtpy4dTTsMkKUmHwBTeMkSYzLnmNVgyRFN8Q
+WPf02B1TtL5cEfrm7frWsSKxUmVcmz5pz3akjd5HD3tNJC1RGCoWQG61g7hW25y1
+MRHcYXlJajSFp9KmGbkB30OpTJgky7NpGQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQApi0LyRNInVXfKqdAo1dMRzVso5CPSVuNUd/YwdRS5aYtGUx44SA2kGnuzo9XP
+c0OSJzuMMPRuwkL91Du8283rQT1wERvJrt1Zbs90RAwNNvpTZ4uzgZp/Kxlr8tQ8
+LuUsUcbBgNuI9LV51po0yZlxXGu/pfs7HNRVV2zfItkAO7OKj00f+Mn0+JLhJ9PJ
+oYvfPFQnAU3oFkYlc7FIYUeFKbFFG9KCkwb39vkuIHjcCEVFBCkdERefTBBptmXd
+emOI+tY7m1pzpkVzNDGX0OtEoGDokZHKL9xJUPU5Ao15OhVY0bp84uf1wjVvDVrg
+/8HfSSKirVjrlumRGariq8aw</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIICrjCCAZYCCQCrriL//w2/KDANBgkqhkiG9w0BAQsFADAZMRcwFQYDVQQDDA5s
+b2NhbGhvc3Q6ODQ4MDAeFw0xNjAyMTcxMDQzMjhaFw0yNjAyMTYxMDQzMjhaMBkx
+FzAVBgNVBAMMDmxvY2FsaG9zdDo4NDgwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAw0VE8Q0jNc2bl0OSZWvKQQIIowBie3rGgRfBB0TzO5sjBbJSQYPh
+HBWb61gB4Cx1TvCQdefgVvhB1Heq9VFdRKRtZLl2I9RaOYPpLpBXLl10yHLGUKMz
+KVT1bpKNY4hCDN46nrxiYcbi+ZLsiezAITLEsPls2KWq5IFb0Nh/8aLRv3glk1aL
+aUtSSM1c/qGk7al9rfjG6HuUutaOYtpy4dTTsMkKUmHwBTeMkSYzLnmNVgyRFN8Q
+WPf02B1TtL5cEfrm7frWsSKxUmVcmz5pz3akjd5HD3tNJC1RGCoWQG61g7hW25y1
+MRHcYXlJajSFp9KmGbkB30OpTJgky7NpGQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQApi0LyRNInVXfKqdAo1dMRzVso5CPSVuNUd/YwdRS5aYtGUx44SA2kGnuzo9XP
+c0OSJzuMMPRuwkL91Du8283rQT1wERvJrt1Zbs90RAwNNvpTZ4uzgZp/Kxlr8tQ8
+LuUsUcbBgNuI9LV51po0yZlxXGu/pfs7HNRVV2zfItkAO7OKj00f+Mn0+JLhJ9PJ
+oYvfPFQnAU3oFkYlc7FIYUeFKbFFG9KCkwb39vkuIHjcCEVFBCkdERefTBBptmXd
+emOI+tY7m1pzpkVzNDGX0OtEoGDokZHKL9xJUPU5Ao15OhVY0bp84uf1wjVvDVrg
+/8HfSSKirVjrlumRGariq8aw</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+ Location="http://localhost:8480/mellon/logout" />
+ <SingleLogoutService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="http://localhost:8480/mellon/logout"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService
+ index="0"
+ isDefault="true"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+ Location="http://localhost:8480/mellon/postResponse" />
+ <AssertionConsumerService
+ index="1"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+ Location="http://localhost:8480/mellon/artifactResponse" />
+ <AssertionConsumerService
+ index="2"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
+ Location="http://localhost:8480/mellon/paosResponse" />
+ </SPSSODescriptor>
+</EntityDescriptor>
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/idp-metadata.xml b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/idp-metadata.xml
new file mode 100755
index 0000000..da74978
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/mellon/idp-metadata.xml
@@ -0,0 +1,51 @@
+<!--
+ ~ Copyright 2016 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.
+ -->
+
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="urn:keycloak">
+ <EntityDescriptor entityID="http://localhost:8180/auth/realms/mellon-test">
+ <IDPSSODescriptor WantAuthnRequestsSigned="true"
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <NameIDFormat>
+ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
+ </NameIDFormat>
+ <NameIDFormat>
+ urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+ </NameIDFormat>
+ <NameIDFormat>
+ urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
+ </NameIDFormat>
+ <NameIDFormat>
+ urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
+ </NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+ Location="http://localhost:8180/auth/realms/mellon-test/protocol/saml"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="http://localhost:8180/auth/realms/mellon-test/protocol/saml"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="http://localhost:8180/auth/realms/mellon-test/protocol/saml"/>
+ <KeyDescriptor use="signing">
+ <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+ <dsig:X509Data>
+ <dsig:X509Certificate>
+ MIICpTCCAY0CBgFSP3CJrTANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAttZWxsb24tdGVzdDAeFw0xNjAxMTQwOTE5NDVaFw0yNjAxMTQwOTIxMjVaMBYxFDASBgNVBAMMC21lbGxvbi10ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApaZ6nndLegc+aKXNog08KdWOIZfr393e0nlqZ3SzNCYJ+IrSAWepCNvUW4W0samrtC47XBYNJwBSw9KCLNcpOeR7IC+gtmm8t9VH0QRxDEOvoLoj0zMkuaBhF+1NZdt6kc5gYVSeymkFSG/Eyz06Zo9zfhb52tUK83hYPcRE2azBDAuffnnHGg+fiCMZtMz7qCYXSoGy15odM1AypILDGxCtDpk0nPmwp6AlA7LpWLKYFEXrXhPmZGw2eDA6FqLFYgBovffJzFy1WzqpAzpKbYqVbb/yKUbv5NI4ELlOdjvXfoB7wOp3cHwnuq1G8YjR7OKLeVtszKXUPCjwFSZnFwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBwRkPh3pSAG1UWr1rJW9LMVdfu6KFsVTCMqExuJKUrH4hAPKXXi9iEAyiB/+NdnG8bgvU0xhdH9lW51J1JpH3xRtOMV+1CAZB41RFx1r/zJg0Zrdbfodv1UFJtLhSIKhKnfoSdlml2O9SHwd4VQmwz/QQqzBIS+yJDv7cOxMRszryWq5aWCPMosxwuAJzjwlF6jBHqidkd4EGTNMDK1pDZN1voiYS0ry7h7Lcq2ZbrBFzBqzHvXieym68ACDHr5hkKe065ne1hCgO/+POsAi6VU+qlSbzsD9NenHP60c9+Dt/IY9DeX6IubXChcW5A+qnb5qRWBtwXshfcsDFHYkBJ
+ </dsig:X509Certificate>
+ </dsig:X509Data>
+ </dsig:KeyInfo>
+ </KeyDescriptor>
+ </IDPSSODescriptor>
+ </EntityDescriptor>
+</EntitiesDescriptor>
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/auth2/index.html b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/auth2/index.html
new file mode 100644
index 0000000..31dfbbc
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/auth2/index.html
@@ -0,0 +1,20 @@
+<!--
+ ~ Copyright 2016 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.
+ -->
+
+<a href="/">Go to unprotected resource</a>
+<a href="/mellon/logout?ReturnTo=/">logout</a>
+Protected resource 2
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/index.html b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/index.html
new file mode 100755
index 0000000..ff4e068
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/docker2/www/index.html
@@ -0,0 +1,19 @@
+<!--
+ ~ Copyright 2016 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.
+ -->
+
+<a href="/auth2">Go to protected resource</a>
+Unprotected resource 2
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/pom.xml b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/pom.xml
index f272a34..78ef296 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/pom.xml
@@ -24,11 +24,16 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests-other</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>integration-arquillian-tests-other-mod_auth_mellon</artifactId>
<name>Mod_auth_mellon tests</name>
+ <properties>
+ <apache.mod_auth_mellon.url>http://localhost:8380</apache.mod_auth_mellon.url>
+ <apache.mod_auth_mellon2.url>http://localhost:8480</apache.mod_auth_mellon2.url>
+ </properties>
+
</project>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/README.md b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/README.md
index b6fa06b..2887ae5 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/README.md
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/README.md
@@ -1,17 +1,19 @@
# Mod_auth_mellon test
-## Docker image
+## Docker images
-Docker image contains apache + mod_auth_mellon and two html files unprotected (/) and protected (/auth).
+Each docker image contains apache + mod_auth_mellon and two html files unprotected (/) and protected (/auth).
-## Build docker image
+## Build docker images
docker build -t apache-mellon docker/
+docker build -t apache-mellon2 docker2/
## Run docker image
docker run -d -p 8380:80 apache-mellon
+docker run -d -p 8480:80 apache-mellon2
## Run tests
-mvn clean install [-Dapache.mod_auth_mellon.url=http://localhost:8380]
\ No newline at end of file
+mvn clean install [-Dapache.mod_auth_mellon.url=http://localhost:8380 -Dapache.mod_auth_mellon2.url=http://localhost:8480]
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource.java b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource.java
index fafecf7..3e8d42b 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource.java
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource.java
@@ -10,7 +10,7 @@ import java.net.URL;
/**
* @author mhajas
*/
-public class ModAuthMellonProtectedResource extends AbstractPageWithInjectedUrl{
+public class ModAuthMellonProtectedResource extends AbstractPageWithInjectedUrl {
@FindBy(linkText = "logout")
private WebElement logoutButton;
@@ -18,7 +18,7 @@ public class ModAuthMellonProtectedResource extends AbstractPageWithInjectedUrl{
@Override
public URL getInjectedUrl() {
try {
- return new URL(System.getProperty("apache.mod_auth_mellon.url","http://localhost:8380") + "/auth");
+ return new URL(System.getProperty("apache.mod_auth_mellon.url", "http://localhost:8380") + "/auth");
} catch (MalformedURLException e) {
e.printStackTrace();
}
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource2.java b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource2.java
new file mode 100644
index 0000000..7fd6c1b
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonProtectedResource2.java
@@ -0,0 +1,32 @@
+package org.keycloak.testsuite.mod_auth_mellon;
+
+import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * @author mhajas
+ */
+public class ModAuthMellonProtectedResource2 extends AbstractPageWithInjectedUrl {
+
+ @FindBy(linkText = "logout")
+ private WebElement logoutButton;
+
+ @Override
+ public URL getInjectedUrl() {
+ try {
+ return new URL(System.getProperty("apache.mod_auth_mellon2.url", "http://localhost:8480") + "/auth2");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ public void logout() {
+ logoutButton.click();
+ }
+}
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource.java b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource.java
index 76170bf..311e592 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource.java
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource.java
@@ -8,12 +8,12 @@ import java.net.URL;
/**
* @author mhajas
*/
-public class ModAuthMellonUnprotectedResource extends AbstractPageWithInjectedUrl{
+public class ModAuthMellonUnprotectedResource extends AbstractPageWithInjectedUrl {
@Override
public URL getInjectedUrl() {
try {
- return new URL(System.getProperty("apache.mod_auth_mellon.url","http://localhost:8380/"));
+ return new URL(System.getProperty("apache.mod_auth_mellon.url", "http://localhost:8380/"));
} catch (MalformedURLException e) {
e.printStackTrace();
}
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource2.java b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource2.java
new file mode 100644
index 0000000..1b5482e
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/main/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonUnprotectedResource2.java
@@ -0,0 +1,23 @@
+package org.keycloak.testsuite.mod_auth_mellon;
+
+import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * @author mhajas
+ */
+public class ModAuthMellonUnprotectedResource2 extends AbstractPageWithInjectedUrl {
+
+ @Override
+ public URL getInjectedUrl() {
+ try {
+ return new URL(System.getProperty("apache.mod_auth_mellon2.url", "http://localhost:8480/"));
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+}
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonTest.java b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonTest.java
index f19b57b..8166a22 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonTest.java
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/java/org/keycloak/testsuite/mod_auth_mellon/ModAuthMellonTest.java
@@ -6,11 +6,11 @@ import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.testsuite.AbstractAuthTest;
import org.keycloak.testsuite.util.URLAssert;
-import javax.xml.transform.TransformerException;
import java.util.List;
import static org.junit.Assert.assertTrue;
import static org.keycloak.testsuite.util.IOUtil.loadRealm;
+import static org.keycloak.testsuite.util.WaitUtils.pause;
/**
* @author mhajas
@@ -22,26 +22,69 @@ public class ModAuthMellonTest extends AbstractAuthTest {
@Page
private ModAuthMellonUnprotectedResource modAuthMellonUnprotectedResourcePage;
+ @Page
+ private ModAuthMellonProtectedResource2 modAuthMellonProtectedResourcePage2;
+
+ @Page
+ private ModAuthMellonUnprotectedResource2 modAuthMellonUnprotectedResourcePage2;
+
@Override
public void addTestRealms(List<RealmRepresentation> testRealms) {
testRealms.add(loadRealm("/mellon-realm.json"));
}
- @Test
- public void modAuthMellonTest() throws TransformerException {
+ @Override
+ public void setDefaultPageUriParameters() {
+ super.setDefaultPageUriParameters();
testRealmPage.setAuthRealm("mellon-test");
testRealmSAMLRedirectLoginPage.setAuthRealm("mellon-test");
+ }
- modAuthMellonUnprotectedResourcePage.navigateTo();
- assertTrue(driver.getPageSource().contains("Unprotected resource"));
-
+ @Test
+ public void singleLoginAndLogoutTest() {
modAuthMellonProtectedResourcePage.navigateTo();
URLAssert.assertCurrentUrlStartsWith(testRealmSAMLRedirectLoginPage);
testRealmSAMLRedirectLoginPage.form().login(bburkeUser);
assertTrue(driver.getPageSource().contains("Protected resource"));
+ modAuthMellonProtectedResourcePage2.navigateTo();
+ assertTrue(driver.getPageSource().contains("Protected resource 2"));
+
+ modAuthMellonProtectedResourcePage2.logout();
+ assertTrue(driver.getPageSource().contains("Unprotected resource 2"));
+
+ modAuthMellonProtectedResourcePage2.navigateTo();
+ URLAssert.assertCurrentUrlStartsWith(testRealmSAMLRedirectLoginPage);
+
+ pause(2000); //session length
+
+ modAuthMellonProtectedResourcePage.navigateTo();
+ URLAssert.assertCurrentUrlStartsWith(testRealmSAMLRedirectLoginPage);
+ }
+
+ @Test
+ public void unauthorizedSSO() {
+ modAuthMellonProtectedResourcePage2.navigateTo();
+ URLAssert.assertCurrentUrlStartsWith(testRealmSAMLRedirectLoginPage);
+ testRealmSAMLRedirectLoginPage.form().login("unauthorized", "password");
+ assertTrue(driver.getPageSource().contains("Forbidden"));
+
+ modAuthMellonProtectedResourcePage.navigateTo();
+ assertTrue(driver.getPageSource().contains("Protected resource"));
modAuthMellonProtectedResourcePage.logout();
- assertTrue(driver.getPageSource().contains("Unprotected resource"));
+ }
+
+ @Test
+ public void sessionExpiration() {
+ RealmRepresentation realm = testRealmResource().toRepresentation();
+ realm.setSsoSessionIdleTimeout(2);
+ testRealmResource().update(realm);
+
+ modAuthMellonProtectedResourcePage.navigateTo();
+ testRealmSAMLRedirectLoginPage.form().login(bburkeUser);
+ assertTrue(driver.getPageSource().contains("Protected resource"));
+
+ pause(2000); //session length
modAuthMellonProtectedResourcePage.navigateTo();
URLAssert.assertCurrentUrlStartsWith(testRealmSAMLRedirectLoginPage);
diff --git a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/resources/mellon-realm.json b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/resources/mellon-realm.json
index 7c2c624..05c6caa 100644
--- a/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/resources/mellon-realm.json
+++ b/testsuite/integration-arquillian/tests/other/mod_auth_mellon/src/test/resources/mellon-realm.json
@@ -1,11 +1,11 @@
{
"id" : "mellon-test",
"realm" : "mellon-test",
- "notBefore" : 1453206021,
+ "notBefore" : 1455704705,
"revokeRefreshToken" : false,
"accessTokenLifespan" : 300,
"accessTokenLifespanForImplicitFlow" : 900,
- "ssoSessionIdleTimeout" : 1800,
+ "ssoSessionIdleTimeout" : 2,
"ssoSessionMaxLifespan" : 36000,
"offlineSessionIdleTimeout" : 2592000,
"accessCodeLifespan" : 60,
@@ -32,8 +32,8 @@
"codeSecret" : "6ed3c059-96b4-46d2-a385-c25ea96853ca",
"roles" : {
"realm" : [ {
- "id" : "6314a145-4654-45b8-bc05-3b6a01e76236",
- "name" : "test-Role",
+ "id" : "a0d0115b-3baf-484c-88ce-99de03bf6c78",
+ "name" : "manager",
"scopeParamRequired" : false,
"composite" : false
}, {
@@ -130,6 +130,7 @@
} ],
"http://localhost:8380/auth" : [ ],
"security-admin-console" : [ ],
+ "http://localhost:8480/auth2" : [ ],
"admin-cli" : [ ],
"broker" : [ {
"id" : "b0fbb4b2-6632-4c26-8292-c90a64dbf145",
@@ -163,16 +164,39 @@
"otpPolicyLookAheadWindow" : 1,
"otpPolicyPeriod" : 30,
"users" : [ {
- "id" : "df34636d-0ade-4843-9d85-68784c541bc9",
- "createdTimestamp" : 1452774520942,
+ "id" : "b35d3909-3549-4f35-ad0f-918a7c1febb1",
+ "createdTimestamp" : 1455795133502,
"username" : "bburke",
"enabled" : true,
"totp" : false,
"emailVerified" : false,
"credentials" : [ {
"type" : "password",
- "hashedSaltedValue" : "J53IPqrQcatayK0PB3vY+sxz6Zc9rUwdFiSbMyaLNmvtcCkJ3WElIFAcsLoA7i+rwvQu/VrN+JGi32sxEzQVNg==",
- "salt" : "sfDAWuC3Ue2DB9+WNmRWRw==",
+ "hashedSaltedValue" : "EpVg7wGyRQ4RnG3aCLmytH+zdTp+qCUEvJ9Yqsxm30i8gJmEsXRMjbRkyU58ewcXMB4ZyJsmQJsWPGdANRvAww==",
+ "salt" : "2UuR1SdDCrhQ89UBFmEMuw==",
+ "hashIterations" : 1,
+ "counter" : 0,
+ "algorithm" : "pbkdf2",
+ "digits" : 0
+ } ],
+ "requiredActions" : [ ],
+ "realmRoles" : [ "manager", "offline_access" ],
+ "clientRoles" : {
+ "account" : [ "view-profile", "manage-account" ]
+ },
+ "groups" : [ ]
+ }, {
+ "id" : "1dd66fff-71b5-4849-b782-cf612198f53e",
+ "createdTimestamp" : 1455795084424,
+ "username" : "unauthorized",
+ "enabled" : true,
+ "totp" : false,
+ "emailVerified" : false,
+ "email" : "",
+ "credentials" : [ {
+ "type" : "password",
+ "hashedSaltedValue" : "IYB496W8mrwAzUDz8ehqiY6SnzjZs3OvLLrUdJwXUwbOBkRFUJqsCPbEsFlDUSX7BK8MZmD7cdPIBWT/g1m9XA==",
+ "salt" : "qRdAqSdsUCR3bO9VJU47JA==",
"hashIterations" : 1,
"counter" : 0,
"algorithm" : "pbkdf2",
@@ -299,12 +323,13 @@
"useTemplateScope" : false,
"useTemplateMappers" : false
}, {
- "id" : "23254f13-034e-4aa2-8d11-f475c48c5469",
+ "id" : "cb6eb8e4-73bf-4ccc-b817-c4f8547ae5eb",
"clientId" : "http://localhost:8380/auth",
+ "adminUrl" : "http://localhost:8380/mellon",
"surrogateAuthRequired" : false,
"enabled" : true,
"clientAuthenticatorType" : "client-secret",
- "secret" : "c2ffb410-6f8b-4f76-a3c7-c5ab21349fa5",
+ "secret" : "0f0aff29-3677-4b88-920f-90cce19230aa",
"redirectUris" : [ "http://localhost:8380/mellon/postResponse" ],
"webOrigins" : [ "http://localhost:8380" ],
"notBefore" : 0,
@@ -321,6 +346,7 @@
"saml.assertion.signature" : "true",
"saml.force.post.binding" : "true",
"saml.multivalued.roles" : "false",
+ "saml_single_logout_service_url_post" : "",
"saml.encrypt" : "true",
"saml_assertion_consumer_url_post" : "http://localhost:8380/mellon/postResponse",
"saml.server.signature" : "true",
@@ -337,46 +363,35 @@
"fullScopeAllowed" : true,
"nodeReRegistrationTimeout" : -1,
"protocolMappers" : [ {
- "id" : "e9cc0f08-519b-445f-9134-38811bf94b0c",
- "name" : "username",
+ "id" : "d625890e-1a84-49a7-9bac-bad1db194882",
+ "name" : "family name",
"protocol" : "openid-connect",
"protocolMapper" : "oidc-usermodel-property-mapper",
"consentRequired" : true,
- "consentText" : "${username}",
+ "consentText" : "${familyName}",
"config" : {
- "user.attribute" : "username",
+ "user.attribute" : "lastName",
"id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "preferred_username",
+ "claim.name" : "family_name",
"jsonType.label" : "String"
}
}, {
- "id" : "f4663aad-3083-42b0-b6cb-6f88f623a8be",
- "name" : "full name",
- "protocol" : "openid-connect",
- "protocolMapper" : "oidc-full-name-mapper",
- "consentRequired" : true,
- "consentText" : "${fullName}",
- "config" : {
- "id.token.claim" : "true",
- "access.token.claim" : "true"
- }
- }, {
- "id" : "adb045fd-1f27-41cc-b80f-99592899cef7",
- "name" : "family name",
+ "id" : "b567a20e-2e03-4b64-917b-2793a74b4244",
+ "name" : "email",
"protocol" : "openid-connect",
"protocolMapper" : "oidc-usermodel-property-mapper",
"consentRequired" : true,
- "consentText" : "${familyName}",
+ "consentText" : "${email}",
"config" : {
- "user.attribute" : "lastName",
+ "user.attribute" : "email",
"id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "family_name",
+ "claim.name" : "email",
"jsonType.label" : "String"
}
}, {
- "id" : "bcfb2c33-8da8-49ad-9166-cbadd0079bd5",
+ "id" : "4be3487c-c7ff-409f-a672-138d604eed4b",
"name" : "given name",
"protocol" : "openid-connect",
"protocolMapper" : "oidc-usermodel-property-mapper",
@@ -390,21 +405,32 @@
"jsonType.label" : "String"
}
}, {
- "id" : "0d969f92-4339-427a-9160-94ce11220628",
- "name" : "email",
+ "id" : "8819f0d3-4db4-42a4-aed4-27b8dea9bbf7",
+ "name" : "username",
"protocol" : "openid-connect",
"protocolMapper" : "oidc-usermodel-property-mapper",
"consentRequired" : true,
- "consentText" : "${email}",
+ "consentText" : "${username}",
"config" : {
- "user.attribute" : "email",
+ "user.attribute" : "username",
"id.token.claim" : "true",
"access.token.claim" : "true",
- "claim.name" : "email",
+ "claim.name" : "preferred_username",
"jsonType.label" : "String"
}
}, {
- "id" : "31edca8e-05fa-492c-b586-e66f12726398",
+ "id" : "d74f0c8f-7b6d-4ef5-ac57-31cef5d125e7",
+ "name" : "full name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-full-name-mapper",
+ "consentRequired" : true,
+ "consentText" : "${fullName}",
+ "config" : {
+ "id.token.claim" : "true",
+ "access.token.claim" : "true"
+ }
+ }, {
+ "id" : "6353424c-e417-47d3-95b1-878e649e7e49",
"name" : "role list",
"protocol" : "saml",
"protocolMapper" : "saml-role-list-mapper",
@@ -538,6 +564,128 @@
"useTemplateScope" : false,
"useTemplateMappers" : false
}, {
+ "id" : "cda86e1f-00bd-4727-b4b3-b35357161964",
+ "clientId" : "http://localhost:8480/auth2",
+ "adminUrl" : "http://localhost:8480/mellon",
+ "surrogateAuthRequired" : false,
+ "enabled" : true,
+ "clientAuthenticatorType" : "client-secret",
+ "secret" : "e75b6e1b-030f-4630-8e6f-631f4891c79a",
+ "redirectUris" : [ "http://localhost:8480/mellon/postResponse" ],
+ "webOrigins" : [ "http://localhost:8480" ],
+ "notBefore" : 0,
+ "bearerOnly" : false,
+ "consentRequired" : false,
+ "standardFlowEnabled" : true,
+ "implicitFlowEnabled" : false,
+ "directAccessGrantsEnabled" : false,
+ "serviceAccountsEnabled" : false,
+ "publicClient" : false,
+ "frontchannelLogout" : true,
+ "protocol" : "saml",
+ "attributes" : {
+ "saml.assertion.signature" : "false",
+ "saml.force.post.binding" : "true",
+ "saml.multivalued.roles" : "false",
+ "saml_single_logout_service_url_post" : "",
+ "saml.encrypt" : "false",
+ "saml_assertion_consumer_url_post" : "http://localhost:8480/mellon/postResponse",
+ "saml.server.signature" : "true",
+ "saml.signing.certificate" : "MIICrjCCAZYCCQCrriL//w2/KDANBgkqhkiG9w0BAQsFADAZMRcwFQYDVQQDDA5sb2NhbGhvc3Q6ODQ4MDAeFw0xNjAyMTcxMDQzMjhaFw0yNjAyMTYxMDQzMjhaMBkxFzAVBgNVBAMMDmxvY2FsaG9zdDo4NDgwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw0VE8Q0jNc2bl0OSZWvKQQIIowBie3rGgRfBB0TzO5sjBbJSQYPhHBWb61gB4Cx1TvCQdefgVvhB1Heq9VFdRKRtZLl2I9RaOYPpLpBXLl10yHLGUKMzKVT1bpKNY4hCDN46nrxiYcbi+ZLsiezAITLEsPls2KWq5IFb0Nh/8aLRv3glk1aLaUtSSM1c/qGk7al9rfjG6HuUutaOYtpy4dTTsMkKUmHwBTeMkSYzLnmNVgyRFN8QWPf02B1TtL5cEfrm7frWsSKxUmVcmz5pz3akjd5HD3tNJC1RGCoWQG61g7hW25y1MRHcYXlJajSFp9KmGbkB30OpTJgky7NpGQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQApi0LyRNInVXfKqdAo1dMRzVso5CPSVuNUd/YwdRS5aYtGUx44SA2kGnuzo9XPc0OSJzuMMPRuwkL91Du8283rQT1wERvJrt1Zbs90RAwNNvpTZ4uzgZp/Kxlr8tQ8LuUsUcbBgNuI9LV51po0yZlxXGu/pfs7HNRVV2zfItkAO7OKj00f+Mn0+JLhJ9PJoYvfPFQnAU3oFkYlc7FIYUeFKbFFG9KCkwb39vkuIHjcCEVFBCkdERefTBBptmXdemOI+tY7m1pzpkVzNDGX0OtEoGDokZHKL9xJUPU5Ao15OhVY0bp84uf1wjVvDVrg/8HfSSKirVjrlumRGariq8aw",
+ "saml_single_logout_service_url_redirect" : "http://localhost:8480/mellon/logout",
+ "saml.signature.algorithm" : "RSA_SHA1",
+ "saml_force_name_id_format" : "false",
+ "saml.client.signature" : "true",
+ "saml.encryption.certificate" : "MIICrjCCAZYCCQCrriL//w2/KDANBgkqhkiG9w0BAQsFADAZMRcwFQYDVQQDDA5sb2NhbGhvc3Q6ODQ4MDAeFw0xNjAyMTcxMDQzMjhaFw0yNjAyMTYxMDQzMjhaMBkxFzAVBgNVBAMMDmxvY2FsaG9zdDo4NDgwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw0VE8Q0jNc2bl0OSZWvKQQIIowBie3rGgRfBB0TzO5sjBbJSQYPhHBWb61gB4Cx1TvCQdefgVvhB1Heq9VFdRKRtZLl2I9RaOYPpLpBXLl10yHLGUKMzKVT1bpKNY4hCDN46nrxiYcbi+ZLsiezAITLEsPls2KWq5IFb0Nh/8aLRv3glk1aLaUtSSM1c/qGk7al9rfjG6HuUutaOYtpy4dTTsMkKUmHwBTeMkSYzLnmNVgyRFN8QWPf02B1TtL5cEfrm7frWsSKxUmVcmz5pz3akjd5HD3tNJC1RGCoWQG61g7hW25y1MRHcYXlJajSFp9KmGbkB30OpTJgky7NpGQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQApi0LyRNInVXfKqdAo1dMRzVso5CPSVuNUd/YwdRS5aYtGUx44SA2kGnuzo9XPc0OSJzuMMPRuwkL91Du8283rQT1wERvJrt1Zbs90RAwNNvpTZ4uzgZp/Kxlr8tQ8LuUsUcbBgNuI9LV51po0yZlxXGu/pfs7HNRVV2zfItkAO7OKj00f+Mn0+JLhJ9PJoYvfPFQnAU3oFkYlc7FIYUeFKbFFG9KCkwb39vkuIHjcCEVFBCkdERefTBBptmXdemOI+tY7m1pzpkVzNDGX0OtEoGDokZHKL9xJUPU5Ao15OhVY0bp84uf1wjVvDVrg/8HfSSKirVjrlumRGariq8aw",
+ "saml.authnstatement" : "true",
+ "saml_name_id_format" : "username",
+ "saml_signature_canonicalization_method" : "http://www.w3.org/2001/10/xml-exc-c14n#"
+ },
+ "fullScopeAllowed" : true,
+ "nodeReRegistrationTimeout" : -1,
+ "protocolMappers" : [ {
+ "id" : "875d9e9f-cd71-40d3-9e63-1c8d6665b63c",
+ "name" : "given name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : true,
+ "consentText" : "${givenName}",
+ "config" : {
+ "user.attribute" : "firstName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "given_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "324e28d0-fb0a-4cc1-9916-d5cd10221b23",
+ "name" : "full name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-full-name-mapper",
+ "consentRequired" : true,
+ "consentText" : "${fullName}",
+ "config" : {
+ "id.token.claim" : "true",
+ "access.token.claim" : "true"
+ }
+ }, {
+ "id" : "9d5b4f3f-79f0-4d62-a13b-53f44587fb1f",
+ "name" : "username",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : true,
+ "consentText" : "${username}",
+ "config" : {
+ "user.attribute" : "username",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "preferred_username",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "af50e3ab-8959-467f-84fe-f7a9ac9d4383",
+ "name" : "email",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : true,
+ "consentText" : "${email}",
+ "config" : {
+ "user.attribute" : "email",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "email",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "7a7a7fab-d464-451c-9025-bfc4f4629189",
+ "name" : "family name",
+ "protocol" : "openid-connect",
+ "protocolMapper" : "oidc-usermodel-property-mapper",
+ "consentRequired" : true,
+ "consentText" : "${familyName}",
+ "config" : {
+ "user.attribute" : "lastName",
+ "id.token.claim" : "true",
+ "access.token.claim" : "true",
+ "claim.name" : "family_name",
+ "jsonType.label" : "String"
+ }
+ }, {
+ "id" : "86731f18-9114-428b-bf9e-102e2931adc6",
+ "name" : "role list",
+ "protocol" : "saml",
+ "protocolMapper" : "saml-role-list-mapper",
+ "consentRequired" : false,
+ "config" : {
+ "single" : "false",
+ "attribute.nameformat" : "Basic",
+ "attribute.name" : "Role"
+ }
+ } ],
+ "useTemplateConfig" : false,
+ "useTemplateScope" : false,
+ "useTemplateMappers" : false
+ }, {
"id" : "14abd995-d10a-4da3-85cf-0c6fbb65ce41",
"clientId" : "admin-cli",
"name" : "${client_admin-cli}",
@@ -860,310 +1008,9 @@
"smtpServer" : { },
"eventsEnabled" : true,
"eventsListeners" : [ "jboss-logging" ],
- "enabledEventTypes" : [ "SEND_RESET_PASSWORD", "UPDATE_TOTP", "REMOVE_TOTP", "REVOKE_GRANT", "LOGIN_ERROR", "CLIENT_LOGIN", "RESET_PASSWORD_ERROR", "CODE_TO_TOKEN_ERROR", "CUSTOM_REQUIRED_ACTION", "UPDATE_PROFILE_ERROR", "IMPERSONATE", "LOGIN", "UPDATE_PASSWORD_ERROR", "REGISTER", "LOGOUT", "CLIENT_REGISTER", "UPDATE_PASSWORD", "FEDERATED_IDENTITY_LINK_ERROR", "CLIENT_DELETE", "IDENTITY_PROVIDER_FIRST_LOGIN", "VERIFY_EMAIL", "CLIENT_DELETE_ERROR", "CLIENT_LOGIN_ERROR", "REMOVE_FEDERATED_IDENTITY_ERROR", "EXECUTE_ACTIONS", "SEND_IDENTITY_PROVIDER_LINK_ERROR", "SEND_VERIFY_EMAIL", "EXECUTE_ACTIONS_ERROR", "REMOVE_FEDERATED_IDENTITY", "IDENTITY_PROVIDER_POST_LOGIN", "UPDATE_EMAIL", "REGISTER_ERROR", "LOGOUT_ERROR", "UPDATE_EMAIL_ERROR", "CLIENT_UPDATE_ERROR", "UPDATE_PROFILE", "FEDERATED_IDENTITY_LINK", "CLIENT_REGISTER_ERROR", "SEND_VERIFY_EMAIL_ERROR", "SEND_IDENTITY_PROVIDER_LINK", "RESET_PASSWORD", "REMOVE_TOTP_ERROR", "VERIFY_EMAIL_ERROR", "SEND_RESET_PASSWORD_ERROR", "CLIENT_UPDATE", "IDENTITY_PROVIDER_POST_LOGIN_ERROR", "CUSTOM_REQUIRED_ACTION_ERROR", "UPDATE_TOTP_ERROR", "CODE_TO_TOKEN", "IDENTITY_PROVIDER_FIRST_LOGIN_ERROR" ],
+ "enabledEventTypes" : [ ],
"adminEventsEnabled" : false,
"adminEventsDetailsEnabled" : false,
"internationalizationEnabled" : false,
- "supportedLocales" : [ ],
- "authenticationFlows" : [ {
- "alias" : "Handle Existing Account",
- "description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "idp-confirm-link",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "idp-email-verification",
- "autheticatorFlow" : false,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 20
- }, {
- "flowAlias" : "Verify Existing Account by Re-authentication",
- "autheticatorFlow" : true,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 30
- } ]
- }, {
- "alias" : "Verify Existing Account by Re-authentication",
- "description" : "Reauthentication of existing account",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "idp-username-password-form",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "auth-otp-form",
- "autheticatorFlow" : false,
- "requirement" : "OPTIONAL",
- "userSetupAllowed" : false,
- "priority" : 20
- } ]
- }, {
- "alias" : "browser",
- "description" : "browser based authentication",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "auth-cookie",
- "autheticatorFlow" : false,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "auth-spnego",
- "autheticatorFlow" : false,
- "requirement" : "DISABLED",
- "userSetupAllowed" : false,
- "priority" : 20
- }, {
- "flowAlias" : "forms",
- "autheticatorFlow" : true,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 30
- } ]
- }, {
- "alias" : "clients",
- "description" : "Base authentication for clients",
- "providerId" : "client-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "client-secret",
- "autheticatorFlow" : false,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "client-jwt",
- "autheticatorFlow" : false,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 20
- } ]
- }, {
- "alias" : "direct grant",
- "description" : "OpenID Connect Resource Owner Grant",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "direct-grant-validate-username",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "direct-grant-validate-password",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 20
- }, {
- "authenticator" : "direct-grant-validate-otp",
- "autheticatorFlow" : false,
- "requirement" : "OPTIONAL",
- "userSetupAllowed" : false,
- "priority" : 30
- } ]
- }, {
- "alias" : "first broker login",
- "description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticatorConfig" : "review profile config",
- "authenticator" : "idp-review-profile",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticatorConfig" : "create unique user config",
- "authenticator" : "idp-create-user-if-unique",
- "autheticatorFlow" : false,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 20
- }, {
- "flowAlias" : "Handle Existing Account",
- "autheticatorFlow" : true,
- "requirement" : "ALTERNATIVE",
- "userSetupAllowed" : false,
- "priority" : 30
- } ]
- }, {
- "alias" : "forms",
- "description" : "Username, password, otp and other auth forms.",
- "providerId" : "basic-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "auth-username-password-form",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "auth-otp-form",
- "autheticatorFlow" : false,
- "requirement" : "OPTIONAL",
- "userSetupAllowed" : false,
- "priority" : 20
- } ]
- }, {
- "alias" : "registration",
- "description" : "registration flow",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "registration-page-form",
- "flowAlias" : "registration form",
- "autheticatorFlow" : true,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- } ]
- }, {
- "alias" : "registration form",
- "description" : "registration form",
- "providerId" : "form-flow",
- "topLevel" : false,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "registration-user-creation",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 20
- }, {
- "authenticator" : "registration-profile-action",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 40
- }, {
- "authenticator" : "registration-password-action",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 50
- }, {
- "authenticator" : "registration-recaptcha-action",
- "autheticatorFlow" : false,
- "requirement" : "DISABLED",
- "userSetupAllowed" : false,
- "priority" : 60
- } ]
- }, {
- "alias" : "reset credentials",
- "description" : "Reset credentials for a user if they forgot their password or something",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "reset-credentials-choose-user",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- }, {
- "authenticator" : "reset-credential-email",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 20
- }, {
- "authenticator" : "reset-password",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 30
- }, {
- "authenticator" : "reset-otp",
- "autheticatorFlow" : false,
- "requirement" : "OPTIONAL",
- "userSetupAllowed" : false,
- "priority" : 40
- } ]
- }, {
- "alias" : "saml ecp",
- "description" : "SAML ECP Profile Authentication Flow",
- "providerId" : "basic-flow",
- "topLevel" : true,
- "builtIn" : true,
- "authenticationExecutions" : [ {
- "authenticator" : "http-basic-authenticator",
- "autheticatorFlow" : false,
- "requirement" : "REQUIRED",
- "userSetupAllowed" : false,
- "priority" : 10
- } ]
- } ],
- "authenticatorConfig" : [ {
- "alias" : "create unique user config",
- "config" : {
- "require.password.update.after.registration" : "false"
- }
- }, {
- "alias" : "review profile config",
- "config" : {
- "update.profile.on.first.login" : "missing"
- }
- } ],
- "requiredActions" : [ {
- "alias" : "CONFIGURE_TOTP",
- "name" : "Configure Totp",
- "providerId" : "CONFIGURE_TOTP",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "UPDATE_PASSWORD",
- "name" : "Update Password",
- "providerId" : "UPDATE_PASSWORD",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "UPDATE_PROFILE",
- "name" : "Update Profile",
- "providerId" : "UPDATE_PROFILE",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "VERIFY_EMAIL",
- "name" : "Verify Email",
- "providerId" : "VERIFY_EMAIL",
- "enabled" : true,
- "defaultAction" : false,
- "config" : { }
- }, {
- "alias" : "terms_and_conditions",
- "name" : "Terms and Conditions",
- "providerId" : "terms_and_conditions",
- "enabled" : false,
- "defaultAction" : false,
- "config" : { }
- } ],
- "browserFlow" : "browser",
- "registrationFlow" : "registration",
- "directGrantFlow" : "direct grant",
- "resetCredentialsFlow" : "reset credentials",
- "clientAuthenticationFlow" : "clients"
+ "supportedLocales" : [ ]
}
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/other/pom.xml b/testsuite/integration-arquillian/tests/other/pom.xml
index 45137c5..19648b7 100644
--- a/testsuite/integration-arquillian/tests/other/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian-tests</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>integration-arquillian-tests-other</artifactId>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index e569881..b2438dd 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.keycloak.testsuite</groupId>
<artifactId>integration-arquillian</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
@@ -52,7 +52,6 @@
<auth.server.management.port>10090</auth.server.management.port>
<auth.server.management.port.jmx>10099</auth.server.management.port.jmx>
<auth.server.ssl.required>false</auth.server.ssl.required>
- <apache.mod_auth_mellon.url>http://localhost:8380</apache.mod_auth_mellon.url>
<startup.timeout.sec>60</startup.timeout.sec>
<browser>phantomjs</browser>
testsuite/jetty/jetty81/pom.xml 2(+1 -1)
diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml
index 8700028..74289d6 100755
--- a/testsuite/jetty/jetty81/pom.xml
+++ b/testsuite/jetty/jetty81/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/jetty/jetty91/pom.xml 2(+1 -1)
diff --git a/testsuite/jetty/jetty91/pom.xml b/testsuite/jetty/jetty91/pom.xml
index 181e575..97ee5f1 100755
--- a/testsuite/jetty/jetty91/pom.xml
+++ b/testsuite/jetty/jetty91/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/jetty/jetty92/pom.xml 2(+1 -1)
diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml
index 0a24ecd..5e67dd1 100755
--- a/testsuite/jetty/jetty92/pom.xml
+++ b/testsuite/jetty/jetty92/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/jetty/pom.xml 2(+1 -1)
diff --git a/testsuite/jetty/pom.xml b/testsuite/jetty/pom.xml
index fa32ea5..474ce25 100755
--- a/testsuite/jetty/pom.xml
+++ b/testsuite/jetty/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Keycloak SAML Jetty Testsuite Integration</name>
testsuite/performance/pom.xml 2(+1 -1)
diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml
index f18dce2..169e17a 100755
--- a/testsuite/performance/pom.xml
+++ b/testsuite/performance/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/pom.xml 2(+1 -1)
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index bc054ce..329fe7f 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/proxy/pom.xml 2(+1 -1)
diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml
index 52c83ef..6ec2ef1 100755
--- a/testsuite/proxy/pom.xml
+++ b/testsuite/proxy/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/stress/pom.xml 2(+1 -1)
diff --git a/testsuite/stress/pom.xml b/testsuite/stress/pom.xml
index f7ea824..7bd00ae 100755
--- a/testsuite/stress/pom.xml
+++ b/testsuite/stress/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/tomcat6/pom.xml 2(+1 -1)
diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml
index 9584809..e8146dd 100755
--- a/testsuite/tomcat6/pom.xml
+++ b/testsuite/tomcat6/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/tomcat7/pom.xml 2(+1 -1)
diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml
index 4e17e56..b7f871a 100755
--- a/testsuite/tomcat7/pom.xml
+++ b/testsuite/tomcat7/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
testsuite/tomcat8/pom.xml 2(+1 -1)
diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml
index 8c3248f..54cd055 100755
--- a/testsuite/tomcat8/pom.xml
+++ b/testsuite/tomcat8/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
themes/pom.xml 2(+1 -1)
diff --git a/themes/pom.xml b/themes/pom.xml
index 1161795..2a50591 100755
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index 6d547f7..57836f5 100644
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -653,6 +653,8 @@ custom-user-ldap-filter=Custom User LDAP Filter
ldap.custom-user-ldap-filter.tooltip=Additional LDAP Filter for filtering searched users. Leave this empty if you don't need additional filter. Make sure that it starts with '(' and ends with ')'
search-scope=Search Scope
ldap.search-scope.tooltip=For one level, we search for users just in DNs specified by User DNs. For subtree, we search in whole of their subtree. See LDAP documentation for more details
+use-truststore-spi=Use Truststore SPI
+ldap.use-truststore-spi.tooltip=Specifies whether LDAP connection will use the truststore SPI with the truststore configured in keycloak-server.json. 'Always' means that it will always use it. 'Never' means that it won't use it. 'Only for ldaps' means that it will use if your connection URL use ldaps. Note even if keycloak-server.json is not configured, the default Java cacerts or certificate specified by 'javax.net.ssl.trustStore' property will be used.
connection-pooling=Connection Pooling
ldap.connection-pooling.tooltip=Does Keycloak should use connection pooling for accessing LDAP server
ldap.pagination.tooltip=Does the LDAP server support pagination.
diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
index 405e4e9..0fc333a 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
@@ -771,6 +771,12 @@ module.controller('LDAPCtrl', function($scope, $location, $route, Notifications,
{ "id": "2", "name": "Subtree" }
];
+ $scope.useTruststoreOptions = [
+ { "id": "always", "name": "Always" },
+ { "id": "ldapsOnly", "name": "Only for ldaps" },
+ { "id": "never", "name": "Never" }
+ ];
+
var DEFAULT_BATCH_SIZE = "1000";
$scope.create = !instance.providerName;
@@ -793,6 +799,7 @@ module.controller('LDAPCtrl', function($scope, $location, $route, Notifications,
instance.config.authType = 'simple';
instance.config.batchSizeForSync = DEFAULT_BATCH_SIZE;
instance.config.searchScope = "1";
+ instance.config.useTruststoreSpi = "ldapsOnly";
$scope.fullSyncEnabled = false;
$scope.changedSyncEnabled = false;
@@ -815,6 +822,9 @@ module.controller('LDAPCtrl', function($scope, $location, $route, Notifications,
if (!instance.config.searchScope) {
instance.config.searchScope = '1';
}
+ if (!instance.config.useTruststoreSpi) {
+ instance.config.useTruststoreSpi = "ldapsOnly";
+ }
$scope.fullSyncEnabled = (instance.fullSyncPeriod && instance.fullSyncPeriod > 0);
$scope.changedSyncEnabled = (instance.changedSyncPeriod && instance.changedSyncPeriod > 0);
@@ -939,7 +949,8 @@ module.controller('LDAPCtrl', function($scope, $location, $route, Notifications,
realm: $scope.realm.realm,
connectionUrl: ldapConfig.connectionUrl,
bindDn: ldapConfig.bindDn,
- bindCredential: ldapConfig.bindCredential
+ bindCredential: ldapConfig.bindCredential,
+ useTruststoreSpi: ldapConfig.useTruststoreSpi
};
};
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html b/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
index 4a2dc92..5c046b7 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html
@@ -163,6 +163,19 @@
</div>
<kc-tooltip>{{:: 'ldap.search-scope.tooltip' | translate}}</kc-tooltip>
</div>
+ <div class="form-group">
+ <label class="col-md-2 control-label" for="useTruststoreSpi">{{:: 'use-truststore-spi' | translate}}</label>
+ <div class="col-md-6">
+ <div>
+ <select class="form-control" id="useTruststoreSpi"
+ ng-model="instance.config.useTruststoreSpi"
+ ng-options="useTruststoreSpi.id as useTruststoreSpi.name for useTruststoreSpi in useTruststoreOptions"
+ required>
+ </select>
+ </div>
+ </div>
+ <kc-tooltip>{{:: 'ldap.use-truststore-spi.tooltip' | translate}}</kc-tooltip>
+ </div>
<div class="form-group clearfix">
<label class="col-md-2 control-label" for="connectionPooling">{{:: 'connection-pooling' | translate}}</label>
<div class="col-md-6">
util/embedded-ldap/pom.xml 2(+1 -1)
diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml
index ce18ccb..e62d23a 100644
--- a/util/embedded-ldap/pom.xml
+++ b/util/embedded-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
util/pom.xml 2(+1 -1)
diff --git a/util/pom.xml b/util/pom.xml
index 1d5d080..c7bfddd 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
wildfly/adduser/pom.xml 2(+1 -1)
diff --git a/wildfly/adduser/pom.xml b/wildfly/adduser/pom.xml
index 1497839..98e9557 100755
--- a/wildfly/adduser/pom.xml
+++ b/wildfly/adduser/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-wildfly-adduser</artifactId>
diff --git a/wildfly/adduser/src/main/java/org/keycloak/wildfly/adduser/AddUser.java b/wildfly/adduser/src/main/java/org/keycloak/wildfly/adduser/AddUser.java
index 9232f9e..a95ea5e 100644
--- a/wildfly/adduser/src/main/java/org/keycloak/wildfly/adduser/AddUser.java
+++ b/wildfly/adduser/src/main/java/org/keycloak/wildfly/adduser/AddUser.java
@@ -36,6 +36,7 @@ import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.util.JsonSerialization;
+import java.io.Console;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -73,12 +74,16 @@ public class AddUser {
printHelp(command);
} else {
try {
+ String password = command.getPassword();
checkRequired(command, "user");
- checkRequired(command, "password");
+
+ if(isEmpty(command, "password")){
+ password = promptForInput();
+ }
File addUserFile = getAddUserFile(command);
- createUser(addUserFile, command.getRealm(), command.getUser(), command.getPassword(), command.getRoles(), command.getIterations());
+ createUser(addUserFile, command.getRealm(), command.getUser(), password, command.getRoles(), command.getIterations());
} catch (Exception e) {
System.err.println(e.getMessage());
System.exit(1);
@@ -207,8 +212,7 @@ public class AddUser {
}
private static void checkRequired(Command command, String field) throws Exception {
- Method m = command.getClass().getMethod("get" + Character.toUpperCase(field.charAt(0)) + field.substring(1));
- if (m.invoke(command) == null) {
+ if (isEmpty(command, field)) {
Option option = command.getClass().getDeclaredField(field).getAnnotation(Option.class);
String optionName;
if (option != null && option.shortName() != '\u0000') {
@@ -220,6 +224,27 @@ public class AddUser {
}
}
+ private static Boolean isEmpty(Command command, String field) throws Exception {
+ Method m = command.getClass().getMethod("get" + Character.toUpperCase(field.charAt(0)) + field.substring(1));
+ if (m.invoke(command) == null) {
+ return true;
+ }
+ return false;
+ }
+
+ private static String promptForInput() throws Exception {
+ Console console = System.console();
+ if (console == null) {
+ throw new Exception("Couldn't get Console instance");
+ }
+ console.printf("Press ctrl-d (Unix) or ctrl-z (Windows) to exit\n");
+ char passwordArray[] = console.readPassword("Password: ");
+
+ if(passwordArray == null) System.exit(0);
+
+ return new String(passwordArray);
+ }
+
private static void printHelp(Command command) throws CommandNotFoundException {
CommandRegistry registry = new AeshCommandRegistryBuilder().command(command).create();
CommandContainer commandContainer = registry.getCommand(command.getClass().getAnnotation(CommandDefinition.class).name(), null);
wildfly/extensions/pom.xml 2(+1 -1)
diff --git a/wildfly/extensions/pom.xml b/wildfly/extensions/pom.xml
index 7de1aef..03873a5 100755
--- a/wildfly/extensions/pom.xml
+++ b/wildfly/extensions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-wildfly-extensions</artifactId>
wildfly/pom.xml 2(+1 -1)
diff --git a/wildfly/pom.xml b/wildfly/pom.xml
index 0c55f62..d3dee35 100755
--- a/wildfly/pom.xml
+++ b/wildfly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<name>Keycloak WildFly Integration</name>
wildfly/server-subsystem/pom.xml 2(+1 -1)
diff --git a/wildfly/server-subsystem/pom.xml b/wildfly/server-subsystem/pom.xml
index 4f7ce1e..ff2d413 100755
--- a/wildfly/server-subsystem/pom.xml
+++ b/wildfly/server-subsystem/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-parent</artifactId>
- <version>1.9.0.Final-SNAPSHOT</version>
+ <version>1.9.1.Final-SNAPSHOT</version>
</parent>
<artifactId>keycloak-wildfly-server-subsystem</artifactId>