Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support EAP8 with SAML Adapter Galleon Feature Pack #22824

Merged
merged 6 commits into from
Sep 7, 2023
Merged

Support EAP8 with SAML Adapter Galleon Feature Pack #22824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
474f7da
SAML Adapter fix for EAP8 and WF29
pskopek Aug 29, 2023
188f559
Ensure the SAML Galleon feature pack generates an appropriate license…
fjuma Aug 22, 2023
3ffeea4
Some more fixes for issue22623
jfdenise Aug 24, 2023
b42814a
Update the Keycloak SAML adapter subsystem to no longer use the Attri…
fjuma Aug 21, 2023
2a6c474
Tidy up SAML Adapter Galleon Feature Pack build
pskopek Aug 30, 2023
2dd9e2c
Set distinct wildfly-common versions for Quarkus and WildFly based mo…
pskopek Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions adapters/oidc/wildfly-elytron/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${wildfly.common.wildfly.aligned.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
7 changes: 6 additions & 1 deletion adapters/oidc/wildfly/wildfly-subsystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,15 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${wildfly.common.wildfly.aligned.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/keycloak/subsystem/adapter/extension/AbstractAdapterConfigurationAddHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ abstract class AbstractAdapterConfigurationAddHandler extends AbstractAddStepHan
private final boolean elytronEnabled;

AbstractAdapterConfigurationAddHandler(RuntimeCapability<Void> runtimeCapability, List<SimpleAttributeDefinition> attributes) {
super(runtimeCapability, attributes);
super(attributes);
elytronEnabled = runtimeCapability != null;
}

Expand Down
8 changes: 7 additions & 1 deletion adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
Expand All @@ -140,6 +140,12 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${wildfly.common.wildfly.aligned.version}</version>
</dependency>

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId>
Expand Down
8 changes: 7 additions & 1 deletion adapters/saml/wildfly/wildfly-subsystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-web-common</artifactId>
<scope>provided</scope>
</dependency>
Expand All @@ -86,6 +86,12 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${wildfly.common.wildfly.aligned.version}</version>
</dependency>

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId>
Expand Down
20 changes: 10 additions & 10 deletions .../src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakSubsystemParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ void writeSps(final XMLExtendedStreamWriter writer, final ModelNode model) throw
writer.writeAttribute(Constants.XML.ENTITY_ID, sp.getName());
ModelNode spAttributes = sp.getValue();
for (SimpleAttributeDefinition attr : ServiceProviderDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, spAttributes, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, spAttributes, false, writer);
}
writeKeys(writer, spAttributes.get(Constants.Model.KEY));
writePrincipalNameMapping(writer, spAttributes);
Expand All @@ -521,7 +521,7 @@ void writeIdentityProvider(XMLExtendedStreamWriter writer, ModelNode model) thro

ModelNode idpAttributes = idp.getValue();
for (SimpleAttributeDefinition attr : IdentityProviderDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, idpAttributes, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, idpAttributes, false, writer);
}

writeSingleSignOn(writer, idpAttributes.get(Constants.Model.SINGLE_SIGN_ON));
Expand All @@ -539,7 +539,7 @@ void writeSingleSignOn(XMLExtendedStreamWriter writer, ModelNode model) throws X
}
writer.writeStartElement(Constants.XML.SINGLE_SIGN_ON);
for (SimpleAttributeDefinition attr : SingleSignOnDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, model, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
}
writer.writeEndElement();
}
Expand All @@ -550,7 +550,7 @@ void writeSingleLogout(XMLExtendedStreamWriter writer, ModelNode model) throws X
}
writer.writeStartElement(Constants.XML.SINGLE_LOGOUT);
for (SimpleAttributeDefinition attr : SingleLogoutDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, model, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
}
writer.writeEndElement();
}
Expand All @@ -569,10 +569,10 @@ void writeKeys(XMLExtendedStreamWriter writer, ModelNode model) throws XMLStream

ModelNode keyAttributes = key.getValue();
for (SimpleAttributeDefinition attr : KeyDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, keyAttributes, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, keyAttributes, false, writer);
}
for (SimpleAttributeDefinition attr : KeyDefinition.ELEMENTS) {
attr.getAttributeMarshaller().marshallAsElement(attr, keyAttributes, false, writer);
attr.getMarshaller().marshallAsElement(attr, keyAttributes, false, writer);
}
writeKeyStore(writer, keyAttributes.get(Constants.Model.KEY_STORE));

Expand All @@ -599,7 +599,7 @@ void writeAllowedClockSkew(XMLExtendedStreamWriter writer, ModelNode allowedCloc
return;
}
writer.writeStartElement(Constants.XML.ALLOWED_CLOCK_SKEW);
AllowedClockSkew.ALLOWED_CLOCK_SKEW_UNIT.getAttributeMarshaller().marshallAsAttribute(AllowedClockSkew.ALLOWED_CLOCK_SKEW_UNIT, allowedClockSkew, false, writer);
AllowedClockSkew.ALLOWED_CLOCK_SKEW_UNIT.getMarshaller().marshallAsAttribute(AllowedClockSkew.ALLOWED_CLOCK_SKEW_UNIT, allowedClockSkew, false, writer);
ModelNode allowedClockSkewValue = allowedClockSkew.get(Constants.Model.ALLOWED_CLOCK_SKEW_VALUE);
char[] chars = allowedClockSkewValue.asString().toCharArray();
writer.writeCharacters(chars, 0, chars.length);
Expand All @@ -612,7 +612,7 @@ void writeKeyStore(XMLExtendedStreamWriter writer, ModelNode model) throws XMLSt
}
writer.writeStartElement(Constants.XML.KEY_STORE);
for (SimpleAttributeDefinition attr : KeyStoreDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, model, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
}
writePrivateKey(writer, model);
writeCertificate(writer, model);
Expand All @@ -626,7 +626,7 @@ void writeCertificate(XMLExtendedStreamWriter writer, ModelNode model) throws XM
}
writer.writeStartElement(Constants.XML.CERTIFICATE);
SimpleAttributeDefinition attr = KeyStoreCertificateDefinition.CERTIFICATE_ALIAS;
attr.getAttributeMarshaller().marshallAsAttribute(attr, model, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
writer.writeEndElement();
}

Expand All @@ -639,7 +639,7 @@ void writePrivateKey(XMLExtendedStreamWriter writer, ModelNode model) throws XML
}
writer.writeStartElement(Constants.XML.PRIVATE_KEY);
for (SimpleAttributeDefinition attr : KeyStorePrivateKeyDefinition.ATTRIBUTES) {
attr.getAttributeMarshaller().marshallAsAttribute(attr, model, false, writer);
attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
}
writer.writeEndElement();
}
Expand Down
59 changes: 47 additions & 12 deletions distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,8 @@
<packaging>pom</packaging>

<properties>
<wildfly.version>27.0.0.Final</wildfly.version>
<wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
<wildfly.core.version>19.0.0.Final</wildfly.core.version>

<feature-pack.resources.directory>${basedir}/../../saml-adapters/wildfly-adapter/wildfly-jakarta-modules/src/main/resources</feature-pack.resources.directory>
<version.org.wildfly.galleon-plugins>6.4.0.Final</version.org.wildfly.galleon-plugins>
<xmlFileSource>${basedir}/src/main/resources/licenses/keycloak/licenses.xml</xmlFileSource>
<outputDirectory>${basedir}/target/resources/packages/licenses/content/docs/licenses-keycloak</outputDirectory>
<license.directory>${project.build.directory}/resources/packages/docs.licenses/content/docs/licenses</license.directory>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -185,7 +179,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<version>${wildfly.version}</version>
<type>zip</type>
Expand Down Expand Up @@ -221,7 +215,7 @@
<plugin>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId>
<version>${version.org.wildfly.galleon-plugins}</version>
<version>${org.wildfly.galleon-plugins.version}</version>
<dependencies>
<!--
feature-spec-gen uses wildfly-embedded to generate the feature specs, hence the designated
Expand All @@ -236,7 +230,7 @@
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${wildfly.common.version}</version>
<version>${wildfly.common.wildfly.aligned.version}</version>
</dependency>
</dependencies>
<executions>
Expand All @@ -256,9 +250,50 @@
</executions>
</plugin>
<plugin>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
<groupId>org.wildfly.maven.plugins</groupId>
<artifactId>licenses-plugin</artifactId>
<version>${org.wildfly.maven.plugins.licenses-plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
<id>update-licenses-xml</id>
<goals>
<goal>insert-versions</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<generateVersionProperty>true</generateVersionProperty>
<sortByGroupIdAndArtifactId>true</sortByGroupIdAndArtifactId>
<licensesConfigFiles>
<licensesConfigFile>${basedir}/target/resources/license/licenses.xml</licensesConfigFile>
</licensesConfigFiles>
<licensesOutputFile>${license.directory}/keycloak-saml-adapter-galleon-pack-licenses.xml</licensesOutputFile>
<excludedArtifacts>wildfly-common-ee-dependency-management|wildfly-ee-galleon-pack|wildfly-legacy-ee-bom|wildfly-standard-ee-bom\z</excludedArtifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>eap8-adapters</id>
<activation>
<property>
<name>eap8-adapters</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.wildfly.galleon-plugins</groupId>
<artifactId>wildfly-galleon-maven-plugin</artifactId>
<configuration>
<config-file>wildfly-feature-pack-build-eap.xml</config-file>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
3 changes: 3 additions & 0 deletions ...ml-adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-saml/layer-spec.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@
<layer name="undertow"/>
</dependencies>
<feature spec="subsystem.keycloak-saml"/>
<packages>
<package name="docs.licenses" optional="true"/>
</packages>
</layer-spec>
30 changes: 15 additions & 15 deletions .../resources/licenses/keycloak/licenses.xml → ...k/src/main/resources/license/licenses.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>keycloak-adapter-spi</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -16,7 +16,7 @@
<artifactId>keycloak-undertow-adapter-spi</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -26,7 +26,7 @@
<artifactId>keycloak-common</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -36,7 +36,7 @@
<artifactId>keycloak-core</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -46,7 +46,7 @@
<artifactId>keycloak-crypto-default</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -56,7 +56,7 @@
<artifactId>keycloak-jboss-adapter-core</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -66,7 +66,7 @@
<artifactId>keycloak-saml-adapter-api-public</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -76,7 +76,7 @@
<artifactId>keycloak-saml-adapter-core</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -86,7 +86,7 @@
<artifactId>keycloak-saml-core</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -96,7 +96,7 @@
<artifactId>keycloak-saml-core-public</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand All @@ -106,27 +106,27 @@
<artifactId>keycloak-saml-undertow-adapter</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-elytron-adapter</artifactId>
<artifactId>keycloak-saml-wildfly-elytron-jakarta-adapter</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-subsystem</artifactId>
<artifactId>keycloak-saml-wildfly-jakarta-subsystem</artifactId>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<name>Apache License 2.0</name>
<url>https://raw.githubusercontent.com/keycloak/keycloak/999-SNAPSHOT/LICENSE.txt</url>
</license>
</licenses>
Expand Down
Loading
Loading