keycloak-memoizeit
Changes
distribution/modules/lib.xml 7(+6 -1)
distribution/modules/pom.xml 65(+45 -20)
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml 6(+6 -0)
integration/keycloak-feature-pack/pom.xml 83(+83 -0)
integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml 39(+39 -0)
integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml 38(+38 -0)
integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml 38(+38 -0)
integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml 44(+44 -0)
integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml 46(+46 -0)
integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-subsystem/main/module.xml 47(+47 -0)
integration/pom.xml 1(+1 -0)
integration/wildfly-subsystem/pom.xml 28(+1 -27)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AddProviderHandler.java 35(+35 -0)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerAddHandler.java 40(+19 -21)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerDefinition.java 14(+5 -9)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerRemoveHandler.java 35(+28 -7)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerUtil.java 331(+259 -72)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerWriteAttributeHandler.java 61(+59 -2)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/ManageOverlayHandler.java 99(+99 -0)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java 23(+11 -12)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigService.java 37(+16 -21)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java 33(+1 -32)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakStructureProcessor.java 80(+0 -80)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakSubsystemAdd.java 1(+0 -1)
integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/SecureDeploymentDefinition.java 1(+1 -0)
integration/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/extension/LocalDescriptions.properties 4(+3 -1)
pom.xml 94(+53 -41)
Details
diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 0e788d8..acaa91f 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -48,7 +48,7 @@
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/deployments/auth-server.war/WEB-INF/classes/META-INF</directory>
- <outputDirectory>keycloak/standalone/configuration</outputDirectory>
+ <outputDirectory>keycloak/modules/system/layers/base/org/keycloak/keycloak-wildfly-subsystem/main/overlays</outputDirectory>
<includes>
<include>keycloak-server.json</include>
</includes>
diff --git a/distribution/appliance-dist/src/main/xslt/standalone.xsl b/distribution/appliance-dist/src/main/xslt/standalone.xsl
index 7b8ba53..7ed378f 100755
--- a/distribution/appliance-dist/src/main/xslt/standalone.xsl
+++ b/distribution/appliance-dist/src/main/xslt/standalone.xsl
@@ -34,7 +34,12 @@
<xsl:template match="node()[name(.)='profile']">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
- <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
+ <auth-server name="main-auth-server">
+ <enabled>true</enabled>
+ <web-context>auth</web-context>
+ </auth-server>
+ </subsystem>
</xsl:copy>
</xsl:template>
@@ -56,7 +61,7 @@
<!-- for some reason, Wildfly 8 final decided to turn off management-native which means jboss-as-maven-plugin no
- longer works -->
+ longer works -->
<xsl:template match="node()[name(.)='management-interfaces']">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
@@ -67,13 +72,24 @@
</xsl:template>
<!-- for some reason, Wildfly 8 final decided to turn off management-native which means jboss-as-maven-plugin no
- longer works -->
+ longer works -->
<xsl:template match="node()[name(.)='socket-binding-group']">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<socket-binding name="management-native" interface="management" port="9999"/>
</xsl:copy>
</xsl:template>
+
+ <xsl:template match="node()[name(.)='server' and name(..) != 'subsystem' ]">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ <deployment-overlays>
+ <deployment-overlay name="main-auth-server.war-keycloak-overlay">
+ <deployment name="main-auth-server.war"/>
+ </deployment-overlay>
+ </deployment-overlays>
+ </xsl:copy>
+ </xsl:template>
<xsl:template match="@*|node()">
<xsl:copy>
distribution/modules/lib.xml 7(+6 -1)
diff --git a/distribution/modules/lib.xml b/distribution/modules/lib.xml
index 6e2f849..3d9438a 100755
--- a/distribution/modules/lib.xml
+++ b/distribution/modules/lib.xml
@@ -52,7 +52,12 @@
<!-- Process the resource -->
<resources/>
-
+
+ <!-- Add keycloak version property to module xml -->
+ <replace file="${module.repo.output.dir}/${current.module.path}/${module.xml}"
+ token="$${project.version}"
+ value="${project.version}"/>
+
<!-- Some final cleanup -->
<replace file="${module.repo.output.dir}/${current.module.path}/${module.xml}">
<replacetoken>
distribution/modules/pom.xml 65(+45 -20)
diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index afc41ed..503ea21 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+~ JBoss, Home of Professional Open Source.
+~ Copyright 2010, Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags. See the copyright.txt file in the
+~ distribution for a full listing of individual contributors.
+~
+~ This is free software; you can redistribute it and/or modify it
+~ under the terms of the GNU Lesser General Public License as
+~ published by the Free Software Foundation; either version 2.1 of
+~ the License, or (at your option) any later version.
+~
+~ This software is distributed in the hope that it will be useful,
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+~ Lesser General Public License for more details.
+~
+~ You should have received a copy of the GNU Lesser General Public
+~ License along with this software; if not, write to the Free
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -211,6 +211,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-server</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/modules/org/keycloak/keycloak-wildfly-subsystem/main/auth-server</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml
index 22d6bea..4761479 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml
@@ -23,7 +23,13 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-wildfly-subsystem">
+ <properties>
+ <property name="keycloak-version" value="${project.version}"/>
+ </properties>
+
<resources>
+ <resource-root path="auth-server"/>
+ <resource-root path="overlays"/>
<!-- Insert resources here -->
</resources>
integration/keycloak-feature-pack/pom.xml 83(+83 -0)
diff --git a/integration/keycloak-feature-pack/pom.xml b/integration/keycloak-feature-pack/pom.xml
new file mode 100644
index 0000000..b256030
--- /dev/null
+++ b/integration/keycloak-feature-pack/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright 2013 JBoss Inc
+~
+~ 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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-parent</artifactId>
+ <version>1.1.0-Alpha1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>keycloak-feature-pack</artifactId>
+ <name>Keycloak Feature Pack</name>
+ <description/>
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+ <!-- feature pack dependencies -->
+ <dependency>
+ <groupId>org.wildfly.core</groupId>
+ <artifactId>wildfly-core-feature-pack</artifactId>
+ <type>zip</type>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- module and copy artifact dependencies -->
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.8.1</version>
+ <configuration>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <enableAssertions>true</enableAssertions>
+ <argLine>-Xmx512m</argLine>
+ <systemProperties>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ </systemProperties>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml
new file mode 100644
index 0000000..0def605
--- /dev/null
+++ b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-adapter-core">
+ <resources>
+ <artifact name="${org.keycloak:keycloak-adapter-core}"/>
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.apache.httpcomponents" />
+ <module name="org.jboss.logging"/>
+ <module name="org.keycloak.keycloak-core"/>
+ </dependencies>
+
+</module>
diff --git a/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml
new file mode 100644
index 0000000..da3e18b
--- /dev/null
+++ b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-core">
+ <resources>
+ <artifact name="${org.keycloak:keycloak-core}"/>
+ </resources>
+ <dependencies>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.bouncycastle"/>
+ <module name="net.iharder.base64"/>
+ <module name="javax.api"/>
+ </dependencies>
+
+</module>
diff --git a/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml
new file mode 100644
index 0000000..89b0a6d
--- /dev/null
+++ b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-jboss-adapter-core/main/module.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-jboss-adapter-core">
+ <resources>
+ <artifact name="${org.keycloak:keycloak-jboss-adapter-core}"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.picketbox"/>
+ <module name="org.keycloak.keycloak-adapter-core"/>
+ <module name="org.keycloak.keycloak-core"/>
+ </dependencies>
+
+</module>
diff --git a/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml
new file mode 100644
index 0000000..dedbd94
--- /dev/null
+++ b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-undertow-adapter/main/module.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-undertow-adapter">
+ <resources>
+ <artifact name="${org.keycloak:keycloak-undertow-adapter}"/>
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.bouncycastle"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.apache.httpcomponents" />
+ <module name="javax.servlet.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="io.undertow.core"/>
+ <module name="io.undertow.servlet"/>
+ <module name="org.keycloak.keycloak-adapter-core"/>
+ <module name="org.keycloak.keycloak-core"/>
+ </dependencies>
+
+</module>
diff --git a/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml
new file mode 100644
index 0000000..ceb9b4b
--- /dev/null
+++ b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-adapter/main/module.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-wildfly-adapter">
+ <resources>
+ <artifact name="${org.keycloak:keycloak-wildfly-adapter}"/>
+ </resources>
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.bouncycastle"/>
+ <module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
+ <module name="org.apache.httpcomponents" />
+ <module name="javax.servlet.api"/>
+ <module name="org.jboss.logging"/>
+ <module name="io.undertow.core"/>
+ <module name="io.undertow.servlet"/>
+ <module name="org.picketbox"/>
+ <module name="org.keycloak.keycloak-undertow-adapter"/>
+ <module name="org.keycloak.keycloak-adapter-core"/>
+ <module name="org.keycloak.keycloak-core"/>
+ </dependencies>
+
+</module>
diff --git a/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-subsystem/main/module.xml b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-subsystem/main/module.xml
new file mode 100644
index 0000000..9ccd15f
--- /dev/null
+++ b/integration/keycloak-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-wildfly-subsystem/main/module.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-wildfly-subsystem">
+ <properties>
+ <property name="keycloak-version" value="${project.version}"/>
+ </properties>
+
+ <resources>
+ <artifact name="${org.keycloak:keycloak-wildfly-subsystem}"/>
+ <resource-root path="auth-server"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.jboss.staxmapper"/>
+ <module name="org.jboss.as.controller"/>
+ <module name="org.jboss.as.server"/>
+ <module name="org.jboss.modules"/>
+ <module name="org.jboss.msc"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.jboss.vfs"/>
+ <module name="org.jboss.as.web-common"/>
+ <module name="org.jboss.metadata.web"/>
+ </dependencies>
+</module>
integration/pom.xml 1(+1 -0)
diff --git a/integration/pom.xml b/integration/pom.xml
index 0c52175..06997d2 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -28,5 +28,6 @@
<module>js</module>
<module>installed</module>
<module>admin-client</module>
+ <module>keycloak-feature-pack</module>
</modules>
</project>
integration/wildfly-subsystem/pom.xml 28(+1 -27)
diff --git a/integration/wildfly-subsystem/pom.xml b/integration/wildfly-subsystem/pom.xml
index 5247515..ed0a337 100755
--- a/integration/wildfly-subsystem/pom.xml
+++ b/integration/wildfly-subsystem/pom.xml
@@ -55,33 +55,7 @@
<include>**/*TestCase.java</include>
</includes>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-server</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/classes/deployments</outputDirectory>
- <destFileName>auth-server.war</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </plugin>
</plugins>
</build>
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AddProviderHandler.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AddProviderHandler.java
new file mode 100644
index 0000000..4d63272
--- /dev/null
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AddProviderHandler.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @author tags. All rights reserved.
+ *
+ * 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.subsystem.extension.authserver;
+
+import org.jboss.as.controller.AbstractModelUpdateHandler;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.dmr.ModelNode;
+
+/**
+ *
+ * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc.
+ */
+public class AddProviderHandler extends AbstractModelUpdateHandler {
+
+ @Override
+ protected void updateModel(ModelNode operation, ModelNode model) throws OperationFailedException {
+
+ }
+
+}
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerAddHandler.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerAddHandler.java
index 62c738e..23ade1e 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerAddHandler.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerAddHandler.java
@@ -21,11 +21,7 @@ import org.jboss.as.controller.AbstractAddStepHandler;
import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.service.ServiceController;
-
-import java.util.List;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
@@ -41,7 +37,8 @@ public final class AuthServerAddHandler extends AbstractAddStepHandler {
public static AuthServerAddHandler INSTANCE = new AuthServerAddHandler();
- private AuthServerAddHandler() {}
+ private AuthServerAddHandler() {
+ }
@Override
protected void populateModel(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
@@ -55,12 +52,6 @@ public final class AuthServerAddHandler extends AbstractAddStepHandler {
attr.validateAndSet(operation, model);
}
-/* String serverJsonAttrName = AuthServerDefinition.KEYCLOAK_SERVER_JSON.getName();
- ModelNode keycloakServerJson = model.get(serverJsonAttrName);
- if (!keycloakServerJson.isDefined()) {
- model.get(serverJsonAttrName).set(AuthServerUtil.getDefaultAuthServerJson());
- } */
-
System.out.println("**************************");
System.out.println("operation");
System.out.println(operation.toString());
@@ -69,20 +60,27 @@ public final class AuthServerAddHandler extends AbstractAddStepHandler {
System.out.println(model.toString());
System.out.println("**************************");
- if (!requiresRuntime(context)) return; // not sure I really need this
+ // returns early if on domain controller
+ if (!requiresRuntime(context)) return;
+
+ // don't want to try to start server on host controller
+ if (!context.isNormalServer()) return;
+
+
+ ModelNode webContextNode = model.get(AuthServerDefinition.WEB_CONTEXT.getName());
+ if (!webContextNode.isDefined()) webContextNode = AuthServerDefinition.WEB_CONTEXT.getDefaultValue();
+ String webContext = webContextNode.asString();
ModelNode isEnabled = model.get("enabled");
- if (!isEnabled.isDefined() || isEnabled.asBoolean()) {
- String deploymentName = AuthServerUtil.addStepToStartAuthServer(context, operation);
- //String json = model.get(serverJsonAttrName).asString();
- ModelNode webContextNode = model.get(AuthServerDefinition.WEB_CONTEXT.getName());
- if (!webContextNode.isDefined()) webContextNode = AuthServerDefinition.WEB_CONTEXT.getDefaultValue();
- String webContext = webContextNode.asString();
- KeycloakAdapterConfigService.INSTANCE.addServerDeployment(deploymentName, json, webContext);
- }
+ boolean enabled = isEnabled.isDefined() && isEnabled.asBoolean();
+
+ AuthServerUtil authServerUtil = new AuthServerUtil(operation);
+ authServerUtil.addStepToUploadAuthServer(context, enabled);
+ KeycloakAdapterConfigService.INSTANCE.addServerDeployment(authServerUtil.getDeploymentName(), webContext);
}
@Override
- protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) throws OperationFailedException {
+ protected boolean requiresRuntimeVerification() {
+ return false;
}
}
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerDefinition.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerDefinition.java
index 685a910..c7e7ae3 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerDefinition.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerDefinition.java
@@ -31,6 +31,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
import org.jboss.as.controller.operations.validation.ParameterValidator;
import org.jboss.as.controller.registry.OperationEntry;
import org.keycloak.subsystem.extension.KeycloakAdapterConfigService;
@@ -49,7 +50,7 @@ public class AuthServerDefinition extends SimpleResourceDefinition {
new SimpleAttributeDefinitionBuilder("enabled", ModelType.BOOLEAN, true)
.setXmlName("enabled")
.setAllowExpression(true)
- .setDefaultValue(new ModelNode(true))
+ .setDefaultValue(new ModelNode(false))
.setRestartAllServices()
.build();
@@ -62,18 +63,12 @@ public class AuthServerDefinition extends SimpleResourceDefinition {
.setRestartAllServices()
.build();
- /* protected static final SimpleAttributeDefinition KEYCLOAK_SERVER_JSON =
- new SimpleAttributeDefinitionBuilder("keycloak-server-json", ModelType.STRING, true)
- .setXmlName("keycloak-server-json")
- .setAllowExpression(true)
- .setRestartAllServices()
- .build(); */
+ protected static final ResourceDescriptionResolver rscDescriptionResolver = KeycloakExtension.getResourceDescriptionResolver(TAG_NAME);
public static final List<SimpleAttributeDefinition> ALL_ATTRIBUTES = new ArrayList<SimpleAttributeDefinition>();
static {
ALL_ATTRIBUTES.add(ENABLED);
ALL_ATTRIBUTES.add(WEB_CONTEXT);
- //ALL_ATTRIBUTES.add(KEYCLOAK_SERVER_JSON);
}
private static final Map<String, SimpleAttributeDefinition> DEFINITION_LOOKUP = new HashMap<String, SimpleAttributeDefinition>();
@@ -87,7 +82,7 @@ public class AuthServerDefinition extends SimpleResourceDefinition {
public AuthServerDefinition() {
super(PathElement.pathElement(TAG_NAME),
- KeycloakExtension.getResourceDescriptionResolver(TAG_NAME),
+ rscDescriptionResolver,
AuthServerAddHandler.INSTANCE,
AuthServerRemoveHandler.INSTANCE,
null,
@@ -98,6 +93,7 @@ public class AuthServerDefinition extends SimpleResourceDefinition {
public void registerOperations(ManagementResourceRegistration resourceRegistration) {
super.registerOperations(resourceRegistration);
resourceRegistration.registerOperationHandler(GenericSubsystemDescribeHandler.DEFINITION, GenericSubsystemDescribeHandler.INSTANCE);
+ resourceRegistration.registerOperationHandler(ManageOverlayHandler.DEFINITION, ManageOverlayHandler.INSTANCE);
}
@Override
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerRemoveHandler.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerRemoveHandler.java
index 7f92ab2..8b5dc5a 100644
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerRemoveHandler.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerRemoveHandler.java
@@ -20,11 +20,16 @@ package org.keycloak.subsystem.extension.authserver;
import org.jboss.as.controller.AbstractRemoveStepHandler;
import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.OperationStepHandler;
+import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.PathElement;
import org.jboss.as.controller.operations.common.Util;
import org.jboss.dmr.ModelNode;
import org.keycloak.subsystem.extension.KeycloakAdapterConfigService;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
+import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration;
/**
* Remove an auth-server from a realm.
@@ -38,17 +43,33 @@ public final class AuthServerRemoveHandler extends AbstractRemoveStepHandler {
private AuthServerRemoveHandler() {}
@Override
- protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException {
+ protected void performRemove(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException {
//KeycloakAdapterConfigService.INSTANCE.removeAuthServer()
System.out.println("*** performRuntime ** operation");
System.out.println(operation.toString());
System.out.println("*** performRuntime ** model");
System.out.println(model.toString());
- String deploymentName = Util.getNameFromAddress(operation.get(ADDRESS));
- System.out.println("*** authServerName=" + deploymentName);
- if (!deploymentName.toLowerCase().endsWith(".war")) {
- deploymentName += ".war";
- }
+
+ String deploymentName = AuthServerUtil.getDeploymentName(operation);
KeycloakAdapterConfigService.INSTANCE.removeServerDeployment(deploymentName);
+
+ if (requiresRuntime(context)) { // don't do this on a domain controller
+ addStepToRemoveAuthServer(context, deploymentName);
+ }
+
+ super.performRemove(context, operation, model);
+ }
+
+ private void addStepToRemoveAuthServer(OperationContext context, String deploymentName) {
+ PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT, deploymentName));
+ ModelNode op = Util.createOperation(REMOVE, deploymentAddress);
+ System.out.println("**** Removing deployment *****");
+ System.out.println(op.toString());
+ context.addStep(op, getRemoveHandler(context, deploymentAddress), OperationContext.Stage.MODEL);
+ }
+
+ private OperationStepHandler getRemoveHandler(OperationContext context, PathAddress address) {
+ ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration();
+ return rootResourceRegistration.getOperationHandler(address, REMOVE);
}
}
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerUtil.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerUtil.java
index a7a4fd7..30b170b 100644
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerUtil.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerUtil.java
@@ -16,11 +16,10 @@
*/
package org.keycloak.subsystem.extension.authserver;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
+import java.util.Iterator;
import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.OperationFailedException;
import org.jboss.as.controller.OperationStepHandler;
@@ -29,9 +28,14 @@ import org.jboss.as.controller.PathElement;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CONTENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOY;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ENABLED;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PERSISTENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REDEPLOY;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ROLLBACK_ON_RUNTIME_FAILURE;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RUNTIME_NAME;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.UNDEPLOY;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.URL;
import org.jboss.as.controller.operations.common.Util;
import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration;
@@ -43,6 +47,7 @@ import org.jboss.modules.Resource;
import org.jboss.modules.filter.PathFilter;
/**
+ * Utility methods that help assemble and start an auth server.
*
* @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc.
*/
@@ -50,119 +55,301 @@ public class AuthServerUtil {
private static final ModuleIdentifier KEYCLOAK_SUBSYSTEM = ModuleIdentifier.create("org.keycloak.keycloak-wildfly-subsystem");
- private static URL authServerUrl = null;
+ private final String authServerName;
+ private final PathAddress pathAddress;
+ private String deploymentName;
- private static String defaultAuthServerJson = "";
+ //private String overlayName;
+ private Module subsysModule;
+ private String keycloakVersion;
- static String getDefaultAuthServerJson() {
- if (authServerUrl == null) getWarUrl();
- return defaultAuthServerJson;
+ //private File overlaysDir;
+ private URL authServerUrl = null;
+ //private URL serverConfig = null;
+ //private Set<URL> spiUrls = new HashSet<URL>();
+
+ AuthServerUtil(ModelNode operation) {
+ this.authServerName = getAuthServerName(operation);
+ this.pathAddress = getPathAddress(operation);
+ this.deploymentName = getDeploymentName(operation);
+
+ //this.overlayName = deploymentName + "-keycloak-overlay";
+ setModule();
+ findAuthServerUrl();
+ //findSpiUrls();
+
+ System.out.println("&&&&& " + authServerName + " authServerUrl=" + authServerUrl);
+// System.out.println("&&&&& " + authServerName + " spiUrls=" + spiUrls);
+// System.out.println("&&&&& " + authServerName + " serverConfig=" + serverConfig);
}
- // Can return the URL, null, or throw IllegalStateException
- // This also finds the defaultAuthServerJson and sets the instance var for it.
- private static URL getWarUrl() throws IllegalStateException {
- if (authServerUrl != null) { // only need to find this once
- return authServerUrl;
+ String getDeploymentName() {
+ return this.deploymentName;
+ }
+
+ private void setModule() {
+ try {
+ this.subsysModule = Module.getModuleFromCallerModuleLoader(KEYCLOAK_SUBSYSTEM);
+ this.keycloakVersion = subsysModule.getProperty("keycloak-version");
+ } catch (ModuleLoadException e) {
+ throw new IllegalStateException("Can't find Keycloak subsystem.", e);
}
+ }
- Module module;
+ /*private void findSpiUrls() throws IllegalStateException {
try {
- module = Module.getModuleFromCallerModuleLoader(KEYCLOAK_AUTH_SERVER);
+ Iterator<Resource> rscIterator = this.subsysModule.iterateResources(new PathFilter() {
+ @Override
+ public boolean accept(String string) {
+ return string.equals(AuthServerUtil.this.authServerName);
+ }
+ });
+
+ while (rscIterator.hasNext()) {
+ Resource rsc = rscIterator.next();
+ System.out.println("rsc.getName()=" + rsc.getName());
+ URL url = rsc.getURL();
+
+ if (isJar(rsc)) {
+ this.spiUrls.add(url);
+ }
+ if (isServerConfig(rsc)) {
+ this.serverConfig = url;
+ }
+ }
} catch (ModuleLoadException e) {
- throw new IllegalStateException("Keycloak Auth Server not installed as a module.", e);
+ throw new IllegalStateException(e);
}
+ }*/
- URL warUrl = null;
+ private void findAuthServerUrl() throws IllegalStateException {
try {
- java.util.Iterator<org.jboss.modules.Resource> rscIterator = module.iterateResources(new PathFilter() {
+ Iterator<org.jboss.modules.Resource> rscIterator = this.subsysModule.iterateResources(new PathFilter() {
@Override
public boolean accept(String string) {
- return true;
+ return string.equals("");
}
});
- // There should be only one war resource, the auth server
while (rscIterator.hasNext()) {
Resource rsc = rscIterator.next();
System.out.println("rsc.getName()=" + rsc.getName());
URL url = rsc.getURL();
- if (url.toExternalForm().toLowerCase().endsWith(".war")) {
- warUrl = url;
- setDefaultAuthServerJson(rsc);
+ String parent = "";
+ try {
+ parent = new File(url.toURI()).getParent();
+ } catch (URISyntaxException e) {
+ continue;
+ } catch (IllegalArgumentException e) {
+ continue;
+ }
+
+ if (isAuthServer(rsc, parent)) {
+ this.authServerUrl = url;
+ //File mainDir = new File(parent).getParentFile();
+ //this.overlaysDir = new File(mainDir, "overlays");
break;
}
}
} catch (ModuleLoadException e) {
throw new IllegalStateException(e);
- } catch (IOException e) {
- throw new IllegalStateException(e);
}
+ }
- authServerUrl = warUrl;
- System.out.println("&&&&& authServerUrl=" + authServerUrl);
- return authServerUrl;
+ private boolean isAuthServer(Resource rsc, String parent) {
+ return rsc.getName().equals("keycloak-server-" + keycloakVersion + ".war")
+ && parent.toLowerCase().endsWith("auth-server");
}
- // return deploymentName this will be started under
- static String addStepToStartAuthServer(OperationContext context, ModelNode operation) throws OperationFailedException {
+ /*private boolean isServerConfig(Resource rsc) {
+ return rsc.getName().endsWith("/keycloak-server.json");
+ }
- PathAddress authServerAddr = PathAddress.pathAddress(operation.get(ADDRESS));
- String deploymentName = authServerAddr.getElement(1).getValue();
- if (!deploymentName.toLowerCase().endsWith(".war")) {
- deploymentName += ".war";
- }
+ private boolean isJar(Resource rsc) {
+ return rsc.getName().toLowerCase().endsWith(".jar");
+ }
- PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT, deploymentName));
+ boolean serverOverlayDirExists() {
+ return new File(overlaysDir, authServerName).exists();
+ }
+
+ private boolean hasOverlays() {
+ return (this.serverConfig != null) || (!this.spiUrls.isEmpty());
+ }*/
+
+ void addStepToUploadAuthServer(OperationContext context, boolean isEnabled) throws OperationFailedException {
+ PathAddress deploymentAddress = deploymentAddress();
ModelNode op = Util.createOperation(ADD, deploymentAddress);
- op.get(ENABLED).set(true);
+ op.get(ENABLED).set(isEnabled);
op.get(PERSISTENT).set(false); // prevents writing this deployment out to standalone.xml
- URL warUrl = null;
- try {
- warUrl = getWarUrl();
- } catch (IllegalStateException e) {
- throw new OperationFailedException(e);
- }
-
- if (warUrl == null) {
- throw new OperationFailedException("Keycloak Auth Server WAR not found in keycloak-auth-server module");
+ if (authServerUrl == null) {
+ throw new OperationFailedException("Keycloak Auth Server WAR not found in keycloak-wildfly-subsystem module");
}
- String urlString = warUrl.toExternalForm();
- System.out.println(warUrl);
+ String urlString = authServerUrl.toExternalForm();
ModelNode contentItem = new ModelNode();
contentItem.get(URL).set(urlString);
op.get(CONTENT).add(contentItem);
- System.out.println("****** operation ************");
+
+ System.out.println("*** add auth server operation");
System.out.println(op.toString());
- ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration();
- OperationStepHandler handler = rootResourceRegistration.getOperationHandler(deploymentAddress, ADD);
- context.addStep(op, handler, OperationContext.Stage.MODEL);
+ context.addStep(op, getHandler(context, deploymentAddress, ADD), OperationContext.Stage.MODEL);
- return deploymentName;
+ /*File authServerOverlaysDir = new File(this.overlaysDir, authServerName);
+ System.out.println("authServerOverlaysDir" + authServerOverlaysDir.getAbsolutePath());
+ if (!authServerOverlaysDir.exists()) {
+ authServerOverlaysDir.mkdir();
+ addOverlay(context);
+ linkToDeployment(context);
+ }*/
}
- private static void setDefaultAuthServerJson(Resource rsc) throws IOException {
- JarInputStream jarStream = null;
- try {
- jarStream = new JarInputStream(rsc.openStream());
- JarEntry je;
- while ((je = jarStream.getNextJarEntry()) != null) {
- if (!je.getName().equals("WEB-INF/classes/META-INF/keycloak-server.json")) continue;
-
- int len = 0;
- byte[] buffer = new byte[1024];
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- while ((len = jarStream.read(buffer)) != -1) {
- baos.write(buffer, 0, len);
- }
+ void addStepToRedeployAuthServer(OperationContext context) {
+ addDeploymentAction(context, REDEPLOY);
+ }
+
+ void addStepToUndeployAuthServer(OperationContext context) {
+ addDeploymentAction(context, UNDEPLOY);
+ }
+
+ void addStepToDeployAuthServer(OperationContext context) {
+ addDeploymentAction(context, DEPLOY);
+ }
+
+ private void addDeploymentAction(OperationContext context, String operation) {
+ PathAddress deploymentAddress = deploymentAddress();
+ ModelNode op = Util.createOperation(operation, deploymentAddress);
+ op.get(RUNTIME_NAME).set(deploymentName);
+ System.out.println(">>>> operation=" + operation);
+ System.out.println(op.toString());
+ context.addStep(op, getHandler(context, deploymentAddress, operation), OperationContext.Stage.MODEL);
+ }
- defaultAuthServerJson = baos.toString();
- return;
+ private PathAddress deploymentAddress() {
+ return PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT, deploymentName));
+ }
+
+ /*void addStepsToAssembleOverlay(OperationContext context) throws OperationFailedException {
+ if (hasOverlays()) {
+ addOverlay(context);
+ addKeycloakServerJson(context);
+ addSpiJars(context);
+ linkToDeployment(context);
+ }
+ removeOverlayDir();
+ }
+
+ private void removeOverlayDir() {
+ // TODO implement as operation
+ }
+
+ private void addOverlay(OperationContext context) throws OperationFailedException {
+ if (!hasOverlays()) return;
+
+ PathAddress overlayAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT_OVERLAY, overlayName));
+
+ ModelNode addOp = Util.createOperation(ADD, overlayAddress);
+ //addOp.get(PERSISTENT).set(false);
+
+ addRollbackFalse(addOp);
+ System.out.println("*** add overlay operation");
+ System.out.println(addOp.toString());
+ context.addStep(addOp, getAddHandler(context, overlayAddress), OperationContext.Stage.MODEL);
+ }
+
+ private void addKeycloakServerJson(OperationContext context) throws OperationFailedException {
+ if (this.serverConfig == null) {
+ return;
+ }
+
+ addOveralyContent(context, this.serverConfig, "/WEB-INF/classes/META-INF/keycloak-server.json");
+ addChangeToOperation(context, this.serverConfig, ManageOverlayHandler.changeToEnum.deployed);
+ }
+
+ private void addSpiJars(OperationContext context) throws OperationFailedException {
+ if (this.spiUrls.isEmpty()) {
+ return;
+ }
+
+ for (URL source : this.spiUrls) {
+ try {
+ String fileName = new java.io.File(source.toURI()).getName();
+ addOveralyContent(context, source, "/WEB-INF/lib/" + fileName);
+ } catch (URISyntaxException e) {
+ throw new OperationFailedException(e);
+ } catch (IllegalArgumentException e) {
+ throw new OperationFailedException(e);
}
- } finally {
- jarStream.close();
}
}
+
+ private void linkToDeployment(OperationContext context) throws OperationFailedException {
+ if (!hasOverlays()) return;
+
+ PathAddress linkAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT_OVERLAY, overlayName),
+ PathElement.pathElement(DEPLOYMENT, deploymentName));
+ ModelNode op = Util.createOperation(ADD, linkAddress);
+
+ addRollbackFalse(op);
+ System.out.println("*** link to deployment operation");
+ System.out.println(op.toString());
+ context.addStep(op, getAddHandler(context, linkAddress), OperationContext.Stage.MODEL);
+ }
+
+ private void addOveralyContent(OperationContext context, URL source, String destination) throws OperationFailedException {
+ PathAddress contentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT_OVERLAY, overlayName),
+ PathElement.pathElement(CONTENT, destination));
+ ModelNode op = Util.createOperation(ADD, contentAddress);
+
+ ModelNode contentItem = new ModelNode();
+ contentItem.get(URL).set(source.toExternalForm());
+ op.get(CONTENT).set(contentItem);
+
+ addRollbackFalse(op);
+ System.out.println("*** add content operation");
+ System.out.println(op.toString());
+
+ context.addStep(op, getAddHandler(context, contentAddress), OperationContext.Stage.MODEL);
+ }
+
+ private void addChangeToOperation(OperationContext context, URL source, ManageOverlayHandler.changeToEnum changeTo) {
+ ModelNode op = Util.createOperation(ManageOverlayHandler.OP, this.pathAddress);
+ op.get(ManageOverlayHandler.URL.getName()).set(source.toExternalForm());
+ op.get(ManageOverlayHandler.CHANGE_TO.getName()).set(changeTo.toString());
+
+ System.out.println("************change-to operation********************");
+ System.out.println(op.toString());
+ context.addStep(op, ManageOverlayHandler.INSTANCE, OperationContext.Stage.RUNTIME, false);
+ }*/
+
+ private OperationStepHandler getHandler(OperationContext context, PathAddress address, String opName) {
+ ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration();
+ return rootResourceRegistration.getOperationHandler(address, opName);
+ //return new IgnoreIfResourceExistsHandler(handler);
+ }
+
+ private void addRollbackFalse(ModelNode modelNode) {
+ modelNode.get(ROLLBACK_ON_RUNTIME_FAILURE).set(false);
+ }
+
+ static String getDeploymentName(ModelNode operation) {
+ String deploymentName = Util.getNameFromAddress(operation.get(ADDRESS));
+ System.out.println("*** authServerName=" + deploymentName);
+ if (!deploymentName.toLowerCase().endsWith(".war")) {
+ deploymentName += ".war";
+ }
+
+ return deploymentName;
+ }
+
+ static String getAuthServerName(ModelNode operation) {
+ PathAddress pathAddr = getPathAddress(operation);
+ return pathAddr.getElement(pathAddr.size() - 1).getValue();
+ }
+
+ static PathAddress getPathAddress(ModelNode operation) {
+ return PathAddress.pathAddress(operation.get(ADDRESS));
+ }
+
}
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerWriteAttributeHandler.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerWriteAttributeHandler.java
index b7e53ea..11cedce 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerWriteAttributeHandler.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerWriteAttributeHandler.java
@@ -21,14 +21,19 @@ import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.SimpleAttributeDefinition;
import java.util.List;
-import org.jboss.as.controller.ReloadRequiredWriteAttributeHandler;
+import org.jboss.as.controller.ModelOnlyWriteAttributeHandler;
+import org.jboss.as.controller.OperationContext;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.registry.Resource;
+import org.jboss.dmr.ModelNode;
+import org.keycloak.subsystem.extension.KeycloakAdapterConfigService;
/**
* Update an attribute on an Auth Server.
*
* @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc.
*/
-public class AuthServerWriteAttributeHandler extends ReloadRequiredWriteAttributeHandler {
+public class AuthServerWriteAttributeHandler extends ModelOnlyWriteAttributeHandler { //extends ReloadRequiredWriteAttributeHandler {
public AuthServerWriteAttributeHandler(List<SimpleAttributeDefinition> definitions) {
this(definitions.toArray(new AttributeDefinition[definitions.size()]));
@@ -38,4 +43,56 @@ public class AuthServerWriteAttributeHandler extends ReloadRequiredWriteAttribut
super(definitions);
}
+ @Override
+ protected void finishModelStage(OperationContext context, ModelNode operation, String attributeName, ModelNode newValue, ModelNode oldValue, Resource model) throws OperationFailedException {
+ if (!context.isNormalServer() || attribNotChanging(attributeName, newValue, oldValue)) {
+ super.finishModelStage(context, operation, attributeName, newValue, oldValue, model);
+ return;
+ }
+
+ System.out.println("**** finishModelStage *****");
+ System.out.println("** operation **");
+ System.out.println(operation.toString());
+ System.out.println("** attributeName=" + attributeName);
+ System.out.println("** oldValue=" + oldValue);
+ System.out.println("** newValue=" + newValue);
+
+ AuthServerUtil authServerUtil = new AuthServerUtil(operation);
+ boolean isEnabled = isEnabled(model); // is server currently enabled?
+
+ if (attributeName.equals(AuthServerDefinition.WEB_CONTEXT.getName())) {
+ String deploymentName = AuthServerUtil.getDeploymentName(operation);
+ KeycloakAdapterConfigService.INSTANCE.removeServerDeployment(deploymentName);
+ KeycloakAdapterConfigService.INSTANCE.addServerDeployment(deploymentName, newValue.asString());
+ if (isEnabled) {
+ authServerUtil.addStepToRedeployAuthServer(context);
+ }
+ }
+
+ if (attributeName.equals(AuthServerDefinition.ENABLED.getName())) {
+ if (!isEnabled) { // we are disabling
+ authServerUtil.addStepToUndeployAuthServer(context);
+ } else { // we are enabling
+ authServerUtil.addStepToDeployAuthServer(context);
+ }
+ }
+
+ super.finishModelStage(context, operation, attributeName, newValue, oldValue, model);
+ }
+
+ // Is auth server currently enabled?
+ private boolean isEnabled(Resource model) {
+ ModelNode authServer = model.getModel();
+ ModelNode isEnabled = authServer.get(AuthServerDefinition.ENABLED.getName());
+ if (!isEnabled.isDefined()) isEnabled = AuthServerDefinition.ENABLED.getDefaultValue();
+ return isEnabled.asBoolean();
+ }
+
+ private boolean attribNotChanging(String attributeName, ModelNode newValue, ModelNode oldValue) {
+ SimpleAttributeDefinition attribDef = AuthServerDefinition.lookup(attributeName);
+ if (!oldValue.isDefined()) oldValue = attribDef.getDefaultValue();
+ if (!newValue.isDefined()) newValue = attribDef.getDefaultValue();
+ return newValue.equals(oldValue);
+ }
+
}
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/ManageOverlayHandler.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/ManageOverlayHandler.java
new file mode 100755
index 0000000..d347071
--- /dev/null
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/ManageOverlayHandler.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @author tags. All rights reserved.
+ *
+ * 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.subsystem.extension.authserver;
+
+import org.jboss.as.controller.AttributeDefinition;
+import org.jboss.as.controller.OperationContext;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.ServiceVerificationHandler;
+import org.jboss.dmr.ModelNode;
+import org.jboss.msc.service.ServiceController;
+
+import java.util.List;
+import java.util.Set;
+import org.jboss.as.controller.AbstractRuntimeOnlyHandler;
+import org.jboss.as.controller.OperationDefinition;
+import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.PathElement;
+import org.jboss.as.controller.ResourceDefinition;
+import org.jboss.as.controller.SimpleAttributeDefinition;
+import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
+import org.jboss.as.controller.SimpleOperationDefinitionBuilder;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADDRESS;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT_OVERLAY;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
+import org.jboss.as.controller.operations.validation.EnumValidator;
+import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration;
+import org.jboss.as.controller.registry.Resource;
+import org.jboss.dmr.ModelType;
+import org.keycloak.subsystem.extension.KeycloakAdapterConfigService;
+
+/**
+ * Rename the extension of an overlay in the overlays/<auth server> directory.
+ *
+ * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc.
+ */
+public final class ManageOverlayHandler extends AbstractRuntimeOnlyHandler {
+
+ public static final String OP = "change-to";
+
+ public static ManageOverlayHandler INSTANCE = new ManageOverlayHandler();
+
+ public enum changeToEnum {deployed, undeployed};
+
+ protected static final SimpleAttributeDefinition URL =
+ new SimpleAttributeDefinitionBuilder("url", ModelType.STRING, false)
+ .setAllowExpression(false)
+ .build();
+
+ protected static final SimpleAttributeDefinition CHANGE_TO =
+ new SimpleAttributeDefinitionBuilder(OP, ModelType.STRING, false)
+ .setAllowExpression(false)
+ .setValidator(new EnumValidator(changeToEnum.class, false, false))
+ .build();
+
+ public static OperationDefinition DEFINITION = new SimpleOperationDefinitionBuilder("manage-overlay", AuthServerDefinition.rscDescriptionResolver)
+ .addParameter(URL)
+ .addParameter(CHANGE_TO)
+ .build();
+
+ private ManageOverlayHandler() {
+ }
+
+ @Override
+ protected void executeRuntimeStep(OperationContext context, ModelNode mn) throws OperationFailedException {
+ System.out.println("Executing!!!!");
+ PathAddress pathAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT_OVERLAY, "main-auth-server.war-keycloak-overlay"));
+ //PathAddress pathAddress = PathAddress.pathAddress(PathElement.pathElement("path", "user.dir"));
+ ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration();
+
+ Resource resource = context.readResourceFromRoot(pathAddress);
+ Set<PathElement> childAddrs = rootResourceRegistration.getChildAddresses(pathAddress);
+ Set<String> children = rootResourceRegistration.getChildNames(pathAddress);
+
+
+ System.out.println("***************");
+ System.out.println("childAddrs=" + childAddrs);
+ System.out.println("children=" + children);
+ System.out.println("model=" + resource.getModel());
+ System.out.println("children=" + resource.getChildrenNames("deployment"));
+ context.completeStep(OperationContext.ResultHandler.NOOP_RESULT_HANDLER);
+ }
+
+}
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java
index cc5b73c..ea26666 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigDeploymentProcessor.java
@@ -31,7 +31,10 @@ import org.keycloak.subsystem.logging.KeycloakLogger;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.jboss.as.ee.component.EEModuleDescription;
+import org.jboss.as.server.deployment.Attachments;
+import org.jboss.as.server.deployment.MountedDeploymentOverlay;
/**
* Pass authentication data (keycloak.json) as a servlet context param so it can be read by the KeycloakServletExtension.
@@ -53,7 +56,7 @@ public class KeycloakAdapterConfigDeploymentProcessor implements DeploymentUnitP
// not sure if we need this yet, keeping here just in case
protected void addSecurityDomain(DeploymentUnit deploymentUnit, KeycloakAdapterConfigService service) {
String deploymentName = deploymentUnit.getName();
- if (!service.isKeycloakDeployment(deploymentName)) {
+ if (!service.isSecureDeployment(deploymentName)) {
return;
}
WarMetaData warMetaData = deploymentUnit.getAttachment(WarMetaData.ATTACHMENT_KEY);
@@ -74,14 +77,18 @@ public class KeycloakAdapterConfigDeploymentProcessor implements DeploymentUnitP
DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
String deploymentName = deploymentUnit.getName();
- System.out.println(">>>>> deploymentName=" + deploymentName);
KeycloakAdapterConfigService service = KeycloakAdapterConfigService.find(phaseContext.getServiceRegistry());
//log.info("********* CHECK KEYCLOAK DEPLOYMENT: " + deploymentName);
- if (service.isKeycloakDeployment(deploymentName)) {
-
+ if (service.isSecureDeployment(deploymentName)) {
addKeycloakAuthData(phaseContext, deploymentName, service);
}
+ if (service.isKeycloakServerDeployment(deploymentName)) {
+ final EEModuleDescription description = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.EE_MODULE_DESCRIPTION);
+ String webContext = service.getWebContext(deploymentName);
+ if (webContext == null) throw new DeploymentUnitProcessingException("Can't determine web context/module for Keycloak Auth Server");
+ description.setModuleName(webContext);
+ }
// FYI, Undertow Extension will find deployments that have auth-method set to KEYCLOAK
// todo notsure if we need this
@@ -102,14 +109,6 @@ public class KeycloakAdapterConfigDeploymentProcessor implements DeploymentUnitP
warMetaData.setMergedJBossWebMetaData(webMetaData);
}
- if (service.isKeycloakServerDeployment(deploymentName)) {
- final EEModuleDescription description = deploymentUnit.getAttachment(org.jboss.as.ee.component.Attachments.EE_MODULE_DESCRIPTION);
- String webContext = service.getWebContext(deploymentName);
- if (webContext == null) throw new DeploymentUnitProcessingException("Can't determine web context/module for Keycloak Auth Server");
- description.setModuleName(webContext);
- return;
- }
-
LoginConfigMetaData loginConfig = webMetaData.getLoginConfig();
if (loginConfig == null) {
loginConfig = new LoginConfigMetaData();
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigService.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigService.java
index ee91ef3..762f05e 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigService.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakAdapterConfigService.java
@@ -51,11 +51,11 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
public static final KeycloakAdapterConfigService INSTANCE = new KeycloakAdapterConfigService();
private Map<String, ModelNode> realms = new HashMap<String, ModelNode>();
- private Map<String, ModelNode> deployments = new HashMap<String, ModelNode>();
- // key=server deployment name; value=json
- private Map<String, String> serverDeployments = new HashMap<String, String>();
- // key=server deployment name; value=web-context
+ // keycloak-secured deployments
+ private Map<String, ModelNode> secureDeployments = new HashMap<String, ModelNode>();
+
+ // key=auth-server deployment name; value=web-context
private Map<String, String> webContexts = new HashMap<String, String>();
private KeycloakAdapterConfigService() {
@@ -77,8 +77,8 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
return this;
}
- public void addServerDeployment(String deploymentName, String json, String webContext) {
- this.serverDeployments.put(deploymentName, json);
+ public void addServerDeployment(String deploymentName, String webContext) {
+ System.out.println("**** adding Server deployment=" + deploymentName);
this.webContexts.put(deploymentName, webContext);
}
@@ -87,7 +87,6 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
}
public void removeServerDeployment(String deploymentName) {
- this.serverDeployments.remove(deploymentName);
this.webContexts.remove(deploymentName);
}
@@ -110,16 +109,16 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
public void addSecureDeployment(ModelNode operation, ModelNode model) {
ModelNode deployment = model.clone();
- this.deployments.put(deploymentNameFromOp(operation), deployment);
+ this.secureDeployments.put(deploymentNameFromOp(operation), deployment);
}
public void updateSecureDeployment(ModelNode operation, String attrName, ModelNode resolvedValue) {
- ModelNode deployment = this.deployments.get(deploymentNameFromOp(operation));
+ ModelNode deployment = this.secureDeployments.get(deploymentNameFromOp(operation));
deployment.get(attrName).set(resolvedValue);
}
public void removeSecureDeployment(ModelNode operation) {
- this.deployments.remove(deploymentNameFromOp(operation));
+ this.secureDeployments.remove(deploymentNameFromOp(operation));
}
public void addCredential(ModelNode operation, ModelNode model) {
@@ -131,7 +130,7 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
String credentialName = credentialNameFromOp(operation);
credentials.get(credentialName).set(model.get("value").asString());
- ModelNode deployment = this.deployments.get(deploymentNameFromOp(operation));
+ ModelNode deployment = this.secureDeployments.get(deploymentNameFromOp(operation));
deployment.get(CREDENTIALS_JSON_NAME).set(credentials);
}
@@ -156,7 +155,7 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
}
private ModelNode credentialsFromOp(ModelNode operation) {
- ModelNode deployment = this.deployments.get(deploymentNameFromOp(operation));
+ ModelNode deployment = this.secureDeployments.get(deploymentNameFromOp(operation));
return deployment.get(CREDENTIALS_JSON_NAME);
}
@@ -187,17 +186,13 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
}
public String getRealmName(String deploymentName) {
- ModelNode deployment = this.deployments.get(deploymentName);
+ ModelNode deployment = this.secureDeployments.get(deploymentName);
return deployment.get(RealmDefinition.TAG_NAME).asString();
}
public String getJSON(String deploymentName) {
- if (serverDeployments.containsKey(deploymentName)) {
- return serverDeployments.get(deploymentName);
- }
-
- ModelNode deployment = this.deployments.get(deploymentName);
+ ModelNode deployment = this.secureDeployments.get(deploymentName);
String realmName = deployment.get(RealmDefinition.TAG_NAME).asString();
ModelNode realm = this.realms.get(realmName);
@@ -220,14 +215,14 @@ public final class KeycloakAdapterConfigService implements Service<KeycloakAdapt
}
}
- public boolean isKeycloakDeployment(String deploymentName) {
+ public boolean isSecureDeployment(String deploymentName) {
//log.info("********* CHECK KEYCLOAK DEPLOYMENT: deployments.size()" + deployments.size());
- return this.serverDeployments.containsKey(deploymentName) || this.deployments.containsKey(deploymentName);
+ return this.secureDeployments.containsKey(deploymentName);
}
public boolean isKeycloakServerDeployment(String deploymentName) {
- return this.serverDeployments.containsKey(deploymentName);
+ return this.webContexts.containsKey(deploymentName);
}
static KeycloakAdapterConfigService find(ServiceRegistry registry) {
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java
index 941236b..4666b3f 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakDependencyProcessor.java
@@ -17,10 +17,6 @@
package org.keycloak.subsystem.extension;
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -28,14 +24,9 @@ import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.server.deployment.DeploymentUnitProcessor;
import org.jboss.as.server.deployment.module.ModuleDependency;
import org.jboss.as.server.deployment.module.ModuleSpecification;
-import org.jboss.as.server.deployment.module.MountHandle;
-import org.jboss.as.server.deployment.module.ResourceRoot;
-import org.jboss.as.server.deployment.module.TempFileProviderService;
import org.jboss.modules.Module;
import org.jboss.modules.ModuleIdentifier;
import org.jboss.modules.ModuleLoader;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VirtualFile;
/**
*
@@ -57,29 +48,7 @@ public class KeycloakDependencyProcessor implements DeploymentUnitProcessor {
String deploymentName = deploymentUnit.getName();
KeycloakAdapterConfigService service = KeycloakAdapterConfigService.find(phaseContext.getServiceRegistry());
- if (service.isKeycloakDeployment(deploymentName)) {
- addModules(deploymentUnit);
- }
-
- for (ResourceRoot root : deploymentUnit.getAttachment(Attachments.RESOURCE_ROOTS)) {
- System.out.println("*** resource root=" + root);
- }
-
-
- }
-
- private void addProvider(DeploymentUnit deploymentUnit) throws IOException, URISyntaxException {
- System.out.println("#2");
- deploymentUnit.addToAttachmentList(Attachments.RESOURCE_ROOTS, providerRoot());
- System.out.println("#4");
- }
-
- private ResourceRoot providerRoot() throws IOException, URISyntaxException {
- System.out.println("#3");
- URI uri = new URI("file:/C:/GitHub/keycloak-temp/keycloak-appliance-dist-all-1.1.0-Alpha1-SNAPSHOT/keycloak/modules/system/layers/base/org/keycloak/keycloak-auth-server/main/./federation-properties-example.jar");
- VirtualFile archive = VFS.getChild(uri);
- Closeable closeable = VFS.mountZip(archive.getPhysicalFile(), archive, TempFileProviderService.provider());
- return new ResourceRoot(archive.getName(), archive, new MountHandle(closeable));
+ addModules(deploymentUnit);
}
private void addModules(DeploymentUnit deploymentUnit) {
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakSubsystemAdd.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakSubsystemAdd.java
index 8197658..00fc6c5 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakSubsystemAdd.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/KeycloakSubsystemAdd.java
@@ -51,7 +51,6 @@ class KeycloakSubsystemAdd extends AbstractBoottimeAddStepHandler {
context.addStep(new AbstractDeploymentChainStep() {
@Override
protected void execute(DeploymentProcessorTarget processorTarget) {
- processorTarget.addDeploymentProcessor(KeycloakExtension.SUBSYSTEM_NAME, Phase.STRUCTURE, 0, new KeycloakStructureProcessor());
processorTarget.addDeploymentProcessor(KeycloakExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, 0, new KeycloakDependencyProcessor());
processorTarget.addDeploymentProcessor(KeycloakExtension.SUBSYSTEM_NAME,
KeycloakAdapterConfigDeploymentProcessor.PHASE,
diff --git a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/SecureDeploymentDefinition.java b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/SecureDeploymentDefinition.java
index 2254dd6..3c70a60 100755
--- a/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/SecureDeploymentDefinition.java
+++ b/integration/wildfly-subsystem/src/main/java/org/keycloak/subsystem/extension/SecureDeploymentDefinition.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.keycloak.subsystem.extension.authserver.ManageOverlayHandler;
/**
* Defines attributes and operations for a secure-deployment.
diff --git a/integration/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/extension/LocalDescriptions.properties b/integration/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/extension/LocalDescriptions.properties
index 533234b..45c4c6e 100755
--- a/integration/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/extension/LocalDescriptions.properties
+++ b/integration/wildfly-subsystem/src/main/resources/org/keycloak/subsystem/extension/LocalDescriptions.properties
@@ -9,8 +9,10 @@ keycloak.subsystem.secure-deployment=A deployment secured by Keycloak.
keycloak.auth-server=A Keycloak Auth Server
keycloak.auth-server.add=Add an Auth Server to the subsystem.
keycloak.auth-server.remove=Remove an Auth Server from the subsystem.
+keycloak.auth-server.manage-overlay=Internal use only. Do not call from CLI!!
+keycloak.auth-server.manage-overlay.url=Internal use only. Do not call from CLI!! The overlay URL that needs its extension to be changed.
+keycloak.auth-server.manage-overlay.change-to=Internal use only. Do not call from CLI!! The extension the overlay will be changed to.
keycloak.auth-server.enabled=Enable or disable the Auth Server.
-keycloak.auth-server.keycloak-server-json=Externalized version of keycloak-server.json
keycloak.auth-server.web-context=Web context the auth-server will use. Also, the module name of the auth-server deployment.
keycloak.realm=A Keycloak realm.
pom.xml 94(+53 -41)
diff --git a/pom.xml b/pom.xml
index 80d627c..6318743 100755
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<slf4j.version>1.5.10</slf4j.version>
<jboss.version>7.1.1.Final</jboss.version>
<wildfly.version>8.1.0.Final</wildfly.version>
- <wildfly.core.version>1.0.0.Alpha5</wildfly.core.version>
+ <wildfly.core.version>1.0.0.Alpha9</wildfly.core.version>
<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
<google.zxing.version>2.2</google.zxing.version>
<google.client.version>1.14.1-beta</google.client.version>
@@ -346,24 +346,24 @@
<version>${twitter4j.version}</version>
</dependency>
- <!-- QR Code Generator -->
+ <!-- QR Code Generator -->
<dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>core</artifactId>
- <version>${google.zxing.version}</version>
- </dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>${google.zxing.version}</version>
+ </dependency>
<dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>javase</artifactId>
- <version>${google.zxing.version}</version>
- </dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>javase</artifactId>
+ <version>${google.zxing.version}</version>
+ </dependency>
- <!-- Email Test Servers -->
- <dependency>
- <groupId>com.icegreen</groupId>
- <artifactId>greenmail</artifactId>
- <version>1.3.1b</version>
- </dependency>
+ <!-- Email Test Servers -->
+ <dependency>
+ <groupId>com.icegreen</groupId>
+ <artifactId>greenmail</artifactId>
+ <version>1.3.1b</version>
+ </dependency>
<!-- Encrypted ZIP -->
<dependency>
@@ -372,18 +372,18 @@
<version>${winzipaes.version}</version>
</dependency>
- <!-- Selenium -->
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>${selenium.version}</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-chrome-driver</artifactId>
- <version>${selenium.version}</version>
+ <!-- Selenium -->
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
+ <version>${selenium.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-chrome-driver</artifactId>
+ <version>${selenium.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
@@ -423,12 +423,12 @@
<version>${mysql.version}</version>
</dependency>
<!-- the dependency seems to override Resteasy 3.0.5's depending on 4.2.1
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${keycloak.apache.httpcomponents.version}</version>
- </dependency>
- -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${keycloak.apache.httpcomponents.version}</version>
+ </dependency>
+ -->
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller</artifactId>
@@ -452,6 +452,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.wildfly.core</groupId>
+ <artifactId>wildfly-core-feature-pack</artifactId>
+ <type>pom</type>
+ <version>${wildfly.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.core</groupId>
+ <artifactId>wildfly-core-feature-pack</artifactId>
+ <type>zip</type>
+ <version>${wildfly.core.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-undertow</artifactId>
<version>${wildfly.version}</version>
@@ -597,14 +609,14 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.lazerycode.jmeter</groupId>
<artifactId>jmeter-maven-plugin</artifactId>
diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
index 89e5d40..a2d5a60 100755
--- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
@@ -41,7 +41,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
-import org.keycloak.adapters.AdapterConstants;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -58,7 +57,7 @@ public class KeycloakApplication extends Application {
protected String contextPath;
public KeycloakApplication(@Context ServletContext context, @Context Dispatcher dispatcher) {
- loadConfig(context);
+ loadConfig();
this.sessionFactory = createSessionFactory();
@@ -103,26 +102,6 @@ public class KeycloakApplication extends Application {
return uriInfo.getBaseUriBuilder().replacePath(getContextPath()).build();
}
- private static void loadConfig(ServletContext context) {
- String json = context.getInitParameter(AdapterConstants.AUTH_DATA_PARAM_NAME);
- if (json == null) {
- loadConfig(); // from file
- } else {
- loadConfig(json); // from ServletContext/Keycloak subsystem
- }
- }
-
- private static void loadConfig(String json) {
- try {
- JsonNode node = new ObjectMapper().readTree(json);
- Config.init(new JsonConfigProvider(node));
- } catch (IOException e) {
- throw new RuntimeException("Failed to load config", e);
- }
-
- log.info("Loaded config from Keycloak subsystem");
- }
-
public static void loadConfig() {
try {
URL config = null;