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

KEYCLOAK-16325 Introduce SAML2NameIDBuilder for easier creation of NameIDType elements

Browse source
This commit is contained in:
Luca Leonardo Scorcia 2020-11-15 10:15:51 -05:00 committed by Hynek Mlnařík
parent 59aa31084e
commit 637773e265
7 changed files with 96 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
saml-core/src/main/java/org/keycloak/saml/SAML2AuthnRequestBuilder.java
View file

@ -21,6 +21,7 @@ import org.keycloak.dom.saml.v2.assertion.SubjectType;
import org.keycloak.dom.saml.v2.protocol.AuthnRequestType;
import org.keycloak.dom.saml.v2.protocol.ExtensionsType;
import org.keycloak.dom.saml.v2.protocol.RequestedAuthnContextType;
import org.keycloak.saml.SAML2NameIDBuilder;
import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request;
import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator;
import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil;
@ -37,7 +38,7 @@ public class SAML2AuthnRequestBuilder implements SamlProtocolExtensionsAwareBuil
private final AuthnRequestType authnRequestType;
protected String destination;
protected String issuer;
protected NameIDType issuer;
protected final List<NodeGenerator> extensions = new LinkedList<>();
public SAML2AuthnRequestBuilder destination(String destination) {
@ -45,11 +46,15 @@ public class SAML2AuthnRequestBuilder implements SamlProtocolExtensionsAwareBuil
return this;
}
public SAML2AuthnRequestBuilder issuer(String issuer) {
public SAML2AuthnRequestBuilder issuer(NameIDType issuer) {
this.issuer = issuer;
return this;
}
public SAML2AuthnRequestBuilder issuer(String issuer) {
return issuer(SAML2NameIDBuilder.value(issuer).build());
}
@Override
public SAML2AuthnRequestBuilder addExtension(NodeGenerator extension) {
this.extensions.add(extension);
@ -132,11 +137,8 @@ public class SAML2AuthnRequestBuilder implements SamlProtocolExtensionsAwareBuil
public AuthnRequestType createAuthnRequest() {
AuthnRequestType res = this.authnRequestType;
NameIDType nameIDType = new NameIDType();
nameIDType.setValue(this.issuer);
res.setIssuer(nameIDType);
res.setIssuer(issuer);
res.setDestination(URI.create(this.destination));
if (! this.extensions.isEmpty()) {

11
saml-core/src/main/java/org/keycloak/saml/SAML2ErrorResponseBuilder.java
View file

@ -40,7 +40,7 @@ public class SAML2ErrorResponseBuilder implements SamlProtocolExtensionsAwareBui
protected String status;
protected String destination;
protected String issuer;
protected NameIDType issuer;
protected final List<NodeGenerator> extensions = new LinkedList<>();
public SAML2ErrorResponseBuilder status(String status) {
@ -53,11 +53,15 @@ public class SAML2ErrorResponseBuilder implements SamlProtocolExtensionsAwareBui
return this;
}
public SAML2ErrorResponseBuilder issuer(String issuer) {
public SAML2ErrorResponseBuilder issuer(NameIDType issuer) {
this.issuer = issuer;
return this;
}
public SAML2ErrorResponseBuilder issuer(String issuer) {
return issuer(SAML2NameIDBuilder.value(issuer).build());
}
@Override
public SAML2ErrorResponseBuilder addExtension(NodeGenerator extension) {
this.extensions.add(extension);
@ -70,9 +74,6 @@ public class SAML2ErrorResponseBuilder implements SamlProtocolExtensionsAwareBui
StatusResponseType statusResponse = new ResponseType(IDGenerator.create("ID_"), XMLTimeUtil.getIssueInstant());
statusResponse.setStatus(JBossSAMLAuthnResponseFactory.createStatusTypeForResponder(status));
NameIDType issuer = new NameIDType();
issuer.setValue(this.issuer);
statusResponse.setIssuer(issuer);
statusResponse.setDestination(destination);

10
saml-core/src/main/java/org/keycloak/saml/SAML2LoginResponseBuilder.java
View file

@ -21,6 +21,7 @@ import org.keycloak.dom.saml.v2.assertion.AssertionType;
import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType;
import org.keycloak.dom.saml.v2.assertion.AuthnStatementType;
import org.keycloak.dom.saml.v2.assertion.ConditionsType;
import org.keycloak.dom.saml.v2.assertion.NameIDType;
import org.keycloak.dom.saml.v2.assertion.OneTimeUseType;
import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationDataType;
import org.keycloak.dom.saml.v2.protocol.ExtensionsType;
@ -31,6 +32,7 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
import org.keycloak.saml.common.exceptions.ConfigurationException;
import org.keycloak.saml.common.exceptions.ProcessingException;
import org.keycloak.saml.common.util.DocumentUtil;
import org.keycloak.saml.SAML2NameIDBuilder;
import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response;
import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator;
import org.keycloak.saml.processing.core.saml.v2.holders.IDPInfoHolder;
@ -57,7 +59,7 @@ public class SAML2LoginResponseBuilder implements SamlProtocolExtensionsAwareBui
protected static final PicketLinkLogger logger = PicketLinkLoggerFactory.getLogger();
protected String destination;
protected String issuer;
protected NameIDType issuer;
protected int subjectExpiration;
protected int assertionExpiration;
protected int sessionExpiration;
@ -82,11 +84,15 @@ public class SAML2LoginResponseBuilder implements SamlProtocolExtensionsAwareBui
return this;
}
public SAML2LoginResponseBuilder issuer(String issuer) {
public SAML2LoginResponseBuilder issuer(NameIDType issuer) {
this.issuer = issuer;
return this;
}
public SAML2LoginResponseBuilder issuer(String issuer) {
return issuer(SAML2NameIDBuilder.value(issuer).build());
}
/**
* Length of time in seconds the subject can be confirmed
* See SAML core specification 2.4.1.2 NotOnOrAfter

17
saml-core/src/main/java/org/keycloak/saml/SAML2LogoutRequestBuilder.java
View file

@ -18,7 +18,9 @@
package org.keycloak.saml;
import org.keycloak.dom.saml.v2.assertion.NameIDType;
import org.keycloak.dom.saml.v2.protocol.ExtensionsType;
import org.keycloak.dom.saml.v2.protocol.LogoutRequestType;
import org.keycloak.saml.SAML2NameIDBuilder;
import org.keycloak.saml.common.exceptions.ConfigurationException;
import org.keycloak.saml.common.exceptions.ParsingException;
import org.keycloak.saml.common.exceptions.ProcessingException;
@ -29,7 +31,6 @@ import org.w3c.dom.Document;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
import org.keycloak.dom.saml.v2.protocol.ExtensionsType;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@ -40,7 +41,7 @@ public class SAML2LogoutRequestBuilder implements SamlProtocolExtensionsAwareBui
protected String sessionIndex;
protected long assertionExpiration;
protected String destination;
protected String issuer;
protected NameIDType issuer;
protected final List<NodeGenerator> extensions = new LinkedList<>();
public SAML2LogoutRequestBuilder destination(String destination) {
@ -48,11 +49,15 @@ public class SAML2LogoutRequestBuilder implements SamlProtocolExtensionsAwareBui
return this;
}
public SAML2LogoutRequestBuilder issuer(String issuer) {
public SAML2LogoutRequestBuilder issuer(NameIDType issuer) {
this.issuer = issuer;
return this;
}
public SAML2LogoutRequestBuilder issuer(String issuer) {
return issuer(SAML2NameIDBuilder.value(issuer).build());
}
@Override
public SAML2LogoutRequestBuilder addExtension(NodeGenerator extension) {
this.extensions.add(extension);
@ -108,12 +113,8 @@ public class SAML2LogoutRequestBuilder implements SamlProtocolExtensionsAwareBui
LogoutRequestType lort = SAML2Request.createLogoutRequest(issuer);
lort.setNameID(nameId);
lort.setIssuer(issuer);
if (issuer != null) {
NameIDType issuerID = new NameIDType();
issuerID.setValue(issuer);
lort.setIssuer(issuerID);
}
if (sessionIndex != null) lort.addSessionIndex(sessionIndex);

12
saml-core/src/main/java/org/keycloak/saml/SAML2LogoutResponseBuilder.java
View file

@ -21,6 +21,7 @@ import org.keycloak.dom.saml.v2.assertion.NameIDType;
import org.keycloak.dom.saml.v2.protocol.StatusCodeType;
import org.keycloak.dom.saml.v2.protocol.StatusResponseType;
import org.keycloak.dom.saml.v2.protocol.StatusType;
import org.keycloak.saml.SAML2NameIDBuilder;
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
import org.keycloak.saml.common.exceptions.ConfigurationException;
import org.keycloak.saml.common.exceptions.ParsingException;
@ -42,7 +43,7 @@ public class SAML2LogoutResponseBuilder implements SamlProtocolExtensionsAwareBu
protected String logoutRequestID;
protected String destination;
protected String issuer;
protected NameIDType issuer;
protected final List<NodeGenerator> extensions = new LinkedList<>();
public SAML2LogoutResponseBuilder logoutRequestID(String logoutRequestID) {
@ -55,11 +56,15 @@ public class SAML2LogoutResponseBuilder implements SamlProtocolExtensionsAwareBu
return this;
}
public SAML2LogoutResponseBuilder issuer(String issuer) {
public SAML2LogoutResponseBuilder issuer(NameIDType issuer) {
this.issuer = issuer;
return this;
}
public SAML2LogoutResponseBuilder issuer(String issuer) {
return issuer(SAML2NameIDBuilder.value(issuer).build());
}
@Override
public SAML2LogoutResponseBuilder addExtension(NodeGenerator extension) {
this.extensions.add(extension);
@ -77,9 +82,6 @@ public class SAML2LogoutResponseBuilder implements SamlProtocolExtensionsAwareBu
statusResponse.setStatus(statusType);
statusResponse.setInResponseTo(logoutRequestID);
NameIDType issuer = new NameIDType();
issuer.setValue(this.issuer);
statusResponse.setIssuer(issuer);
statusResponse.setDestination(destination);

56
saml-core/src/main/java/org/keycloak/saml/SAML2NameIDBuilder.java Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright 2016 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.saml;
import org.keycloak.dom.saml.v2.assertion.NameIDType;
import java.net.URI;
public class SAML2NameIDBuilder {
private final NameIDType nameIdType;
private String format;
private String spNameQualifier;
private SAML2NameIDBuilder(String value) {
this.nameIdType = new NameIDType();
this.nameIdType.setValue(value);
}
public static SAML2NameIDBuilder value(String value) {
return new SAML2NameIDBuilder(value);
}
public SAML2NameIDBuilder setFormat(String format) {
this.format = format;
return this;
}
public SAML2NameIDBuilder setSPNameQualifier(String spNameQualifier) {
this.spNameQualifier = spNameQualifier;
return this;
}
public NameIDType build() {
if (this.format != null)
this.nameIdType.setFormat(URI.create(this.format));
if (this.spNameQualifier != null)
this.nameIdType.setSPNameQualifier(this.spNameQualifier);
return this.nameIdType;
}
}

8
saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SAML2Request.java
View file

@ -257,14 +257,10 @@ public class SAML2Request {
*
* @throws ConfigurationException
*/
public static LogoutRequestType createLogoutRequest(String issuer) throws ConfigurationException {
public static LogoutRequestType createLogoutRequest(NameIDType issuer) throws ConfigurationException {
LogoutRequestType lrt = new LogoutRequestType(IDGenerator.create("ID_"), XMLTimeUtil.getIssueInstant());
// Create an issuer
NameIDType issuerNameID = new NameIDType();
issuerNameID.setValue(issuer);
lrt.setIssuer(issuerNameID);
lrt.setIssuer(issuer);
return lrt;
}