libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Update the Keycloak SAML adapter subsystem to no longer use the AttributeDefinition#getAttributeMarshaller method

Browse source 
Closes https://github.com/keycloak/keycloak/issues/22593

Signed-off-by: Peter Skopek <pskopek@redhat.com>
This commit is contained in:
Farah Juma 2023-08-21 22:23:08 +02:00 committed by Alexander Schwartz
parent 7aec0031b8
commit ec08a7bb73
4 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
View file

@ -140,6 +140,11 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId> <artifactId>wildfly-subsystem-test-framework</artifactId>

5
adapters/saml/wildfly/wildfly-subsystem/pom.xml
View file

@ -86,6 +86,11 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test-framework</artifactId> <artifactId>wildfly-subsystem-test-framework</artifactId>

20
adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakSubsystemParser.java
View file

@ -498,7 +498,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
writer.writeAttribute(Constants.XML.ENTITY_ID, sp.getName()); writer.writeAttribute(Constants.XML.ENTITY_ID, sp.getName());
ModelNode spAttributes = sp.getValue(); ModelNode spAttributes = sp.getValue();
for (SimpleAttributeDefinition attr : ServiceProviderDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : ServiceProviderDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(spAttributes, false, writer); attr.getMarshaller().marshallAsAttribute(attr, spAttributes, false, writer);
} }
writeKeys(writer, spAttributes.get(Constants.Model.KEY)); writeKeys(writer, spAttributes.get(Constants.Model.KEY));
writePrincipalNameMapping(writer, spAttributes); writePrincipalNameMapping(writer, spAttributes);
@ -521,7 +521,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
ModelNode idpAttributes = idp.getValue(); ModelNode idpAttributes = idp.getValue();
for (SimpleAttributeDefinition attr : IdentityProviderDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : IdentityProviderDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(idpAttributes, false, writer); attr.getMarshaller().marshallAsAttribute(attr, idpAttributes, false, writer);
} }
writeSingleSignOn(writer, idpAttributes.get(Constants.Model.SINGLE_SIGN_ON)); writeSingleSignOn(writer, idpAttributes.get(Constants.Model.SINGLE_SIGN_ON));
@ -539,7 +539,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
} }
writer.writeStartElement(Constants.XML.SINGLE_SIGN_ON); writer.writeStartElement(Constants.XML.SINGLE_SIGN_ON);
for (SimpleAttributeDefinition attr : SingleSignOnDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : SingleSignOnDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(model, false, writer); attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
} }
writer.writeEndElement(); writer.writeEndElement();
} }
@ -550,7 +550,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
} }
writer.writeStartElement(Constants.XML.SINGLE_LOGOUT); writer.writeStartElement(Constants.XML.SINGLE_LOGOUT);
for (SimpleAttributeDefinition attr : SingleLogoutDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : SingleLogoutDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(model, false, writer); attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
} }
writer.writeEndElement(); writer.writeEndElement();
} }
@ -569,10 +569,10 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
ModelNode keyAttributes = key.getValue(); ModelNode keyAttributes = key.getValue();
for (SimpleAttributeDefinition attr : KeyDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : KeyDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(keyAttributes, false, writer); attr.getMarshaller().marshallAsAttribute(attr, keyAttributes, false, writer);
} }
for (SimpleAttributeDefinition attr : KeyDefinition.ELEMENTS) { for (SimpleAttributeDefinition attr : KeyDefinition.ELEMENTS) {
attr.marshallAsElement(keyAttributes, false, writer); attr.getMarshaller().marshallAsElement(attr, keyAttributes, false, writer);
} }
writeKeyStore(writer, keyAttributes.get(Constants.Model.KEY_STORE)); writeKeyStore(writer, keyAttributes.get(Constants.Model.KEY_STORE));
@ -599,7 +599,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
return; return;
} }
writer.writeStartElement(Constants.XML.ALLOWED_CLOCK_SKEW); writer.writeStartElement(Constants.XML.ALLOWED_CLOCK_SKEW);
AllowedClockSkew.ALLOWED_CLOCK_SKEW_UNIT.marshallAsAttribute(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); ModelNode allowedClockSkewValue = allowedClockSkew.get(Constants.Model.ALLOWED_CLOCK_SKEW_VALUE);
char[] chars = allowedClockSkewValue.asString().toCharArray(); char[] chars = allowedClockSkewValue.asString().toCharArray();
writer.writeCharacters(chars, 0, chars.length); writer.writeCharacters(chars, 0, chars.length);
@ -612,7 +612,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
} }
writer.writeStartElement(Constants.XML.KEY_STORE); writer.writeStartElement(Constants.XML.KEY_STORE);
for (SimpleAttributeDefinition attr : KeyStoreDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : KeyStoreDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(model, false, writer); attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
} }
writePrivateKey(writer, model); writePrivateKey(writer, model);
writeCertificate(writer, model); writeCertificate(writer, model);
@ -626,7 +626,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
} }
writer.writeStartElement(Constants.XML.CERTIFICATE); writer.writeStartElement(Constants.XML.CERTIFICATE);
SimpleAttributeDefinition attr = KeyStoreCertificateDefinition.CERTIFICATE_ALIAS; SimpleAttributeDefinition attr = KeyStoreCertificateDefinition.CERTIFICATE_ALIAS;
attr.marshallAsAttribute(model, false, writer); attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
writer.writeEndElement(); writer.writeEndElement();
} }
@ -639,7 +639,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
} }
writer.writeStartElement(Constants.XML.PRIVATE_KEY); writer.writeStartElement(Constants.XML.PRIVATE_KEY);
for (SimpleAttributeDefinition attr : KeyStorePrivateKeyDefinition.ATTRIBUTES) { for (SimpleAttributeDefinition attr : KeyStorePrivateKeyDefinition.ATTRIBUTES) {
attr.marshallAsAttribute(model, false, writer); attr.getMarshaller().marshallAsAttribute(attr, model, false, writer);
} }
writer.writeEndElement(); writer.writeEndElement();
} }

6
pom.xml
View file

@ -670,6 +670,12 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${apache.httpcomponents.version}</version> <version>${apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${wildfly.common.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller</artifactId> <artifactId>wildfly-controller</artifactId>