SAML Adapter Galleon Pack for EAP8 cannot use new metadata options for layers

Closes #35410

Signed-off-by: Peter Skopek <pskopek@redhat.com>
(cherry picked from commit aceb8bce92)
This commit is contained in:
Peter Skopek
2024-11-28 13:31:45 +01:00
committed by Marek Posolda
parent e39457d979
commit 091e732e63
9 changed files with 97 additions and 6 deletions

View File

@@ -32,7 +32,20 @@
<modules>
<module>saml-adapter-galleon-pack</module>
<module>saml-adapter-galleon-pack-layer-metadata-tests</module>
</modules>
<profiles>
<profile>
<id>upstream-adapters</id>
<activation>
<property>
<name>!eap8-adapters</name>
</property>
</activation>
<modules>
<module>saml-adapter-galleon-pack-layer-metadata-tests</module>
</modules>
</profile>
</profiles>
</project>

View File

@@ -207,6 +207,9 @@
<resource>
<directory>${basedir}/src/main/resources</directory>
</resource>
<resource>
<directory>${basedir}/src/main/layers/${saml.adapter.galleon.pack.metadata.dir}</directory>
</resource>
</resources>
</configuration>
</execution>

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="keycloak-client-saml-ejb">
<dependencies>
<layer name="keycloak-client-saml"/>
<layer name="ejb-lite"/>
</dependencies>
<feature spec="subsystem.ejb3">
<feature spec="subsystem.ejb3.application-security-domain">
<param name="application-security-domain" value="other" />
<param name="security-domain" value="KeycloakDomain"/>
</feature>
</feature>
</layer-spec>

View File

@@ -0,0 +1,43 @@
<?xml version="1.0" ?>
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="keycloak-client-saml">
<dependencies>
<layer name="keycloak-saml"/>
</dependencies>
<feature spec="subsystem.elytron.custom-realm">
<param name="custom-realm" value="KeycloakSAMLRealm"/>
<param name="class-name" value="org.keycloak.adapters.saml.elytron.KeycloakSecurityRealm"/>
<param name="module" value="org.keycloak.keycloak-saml-wildfly-elytron-adapter"/>
</feature>
<feature spec="subsystem.elytron.security-domain">
<param name="security-domain" value="KeycloakDomain"/>
<param name="default-realm" value="KeycloakSAMLRealm"/>
<param name="permission-mapper" value="default-permission-mapper"/>
<param name="security-event-listener" value="local-audit"/>
<param name="realms" value="[{realm=KeycloakSAMLRealm}]"/>
</feature>
<feature spec="subsystem.elytron.constant-realm-mapper">
<param name="constant-realm-mapper" value="keycloak-saml-realm-mapper"/>
<param name="realm-name" value="KeycloakSAMLRealm"/>
</feature>
<feature spec="subsystem.elytron.service-loader-http-server-mechanism-factory">
<param name="service-loader-http-server-mechanism-factory" value="keycloak-saml-http-server-mechanism-factory"/>
<param name="module" value="org.keycloak.keycloak-saml-wildfly-elytron-adapter"/>
</feature>
<feature spec="subsystem.elytron.aggregate-http-server-mechanism-factory">
<param name="aggregate-http-server-mechanism-factory" value="keycloak-http-server-mechanism-factory"/>
<param name="http-server-mechanism-factories" value="[keycloak-saml-http-server-mechanism-factory, global]"/>
</feature>
<feature spec="subsystem.elytron.http-authentication-factory">
<param name="http-authentication-factory" value="keycloak-http-authentication"/>
<param name="http-server-mechanism-factory" value="keycloak-http-server-mechanism-factory"/>
<param name="security-domain" value="KeycloakDomain"/>
<param name="mechanism-configurations" value="[{mechanism-name=KEYCLOAK-SAML,mechanism-realm-configurations=[{realm-name=KeycloakSAMLRealm,realm-mapper=keycloak-saml-realm-mapper}]}]"/>
</feature>
<feature spec="subsystem.undertow">
<feature spec="subsystem.undertow.application-security-domain">
<param name="application-security-domain" value="other" />
<unset param="security-domain"/>
<param name="http-authentication-factory" value="keycloak-http-authentication"/>
</feature>
</feature>
</layer-spec>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" ?>
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="keycloak-saml">
<dependencies>
<layer name="ee"/>
<layer name="elytron"/>
<layer name="undertow"/>
</dependencies>
<feature spec="subsystem.keycloak-saml"/>
<packages>
<package name="docs.licenses" optional="true"/>
</packages>
</layer-spec>

17
pom.xml
View File

@@ -221,11 +221,6 @@
<webauthn4j.version>0.21.5.RELEASE</webauthn4j.version>
<org.apache.kerby.kerby-asn1.version>2.0.3</org.apache.kerby.kerby-asn1.version>
<!-- WildFly Galleon Build related properties -->
<org.wildfly.galleon-plugins.version>6.5.2.Final</org.wildfly.galleon-plugins.version>
<org.jboss.galleon.version>5.2.2.Final</org.jboss.galleon.version>
<org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final</org.wildfly.maven.plugins.licenses-plugin.version>
<!-- Used to test SAML Galleon feature-pack layers discovery -->
<version.org.wildfly.glow>1.0.0.Alpha8</version.org.wildfly.glow>
@@ -1930,6 +1925,12 @@
<wildfly.version>${eap8.version}</wildfly.version>
<wildfly.build-tools.version>${eap8.wildfly.build-tools.version}</wildfly.build-tools.version>
<wildfly.core.version>${eap8.wildfly.core.version}</wildfly.core.version>
<!-- relative directory for galleon pack with layer spec files -->
<saml.adapter.galleon.pack.metadata.dir>non-metadata</saml.adapter.galleon.pack.metadata.dir>
<!-- WildFly Galleon Build related properties -->
<org.wildfly.galleon-plugins.version>6.4.2.Final</org.wildfly.galleon-plugins.version>
<org.jboss.galleon.version>5.1.0.Final</org.jboss.galleon.version>
<org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final</org.wildfly.maven.plugins.licenses-plugin.version>
</properties>
</profile>
<profile>
@@ -1945,6 +1946,12 @@
<wildfly.version>${upstream.wildfly.version}</wildfly.version>
<wildfly.build-tools.version>${upstream.wildfly.build-tools.version}</wildfly.build-tools.version>
<wildfly.core.version>${upstream.wildfly.core.version}</wildfly.core.version>
<!-- relative directory for galleon pack with layer spec files -->
<saml.adapter.galleon.pack.metadata.dir>metadata</saml.adapter.galleon.pack.metadata.dir>
<!-- WildFly Galleon Build related properties -->
<org.wildfly.galleon-plugins.version>6.5.2.Final</org.wildfly.galleon-plugins.version>
<org.jboss.galleon.version>5.2.2.Final</org.jboss.galleon.version>
<org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final</org.wildfly.maven.plugins.licenses-plugin.version>
</properties>
</profile>