This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit bccd6261d32420014f6a4b67aa4af5809adea825 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Thu Dec 5 08:36:32 2019 +0100 White noise --- .../org/apache/syncope/core/logic/SAML2IdPLogic.java | 3 ++- .../org/apache/syncope/core/logic/SAML2SPLogic.java | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java index ef9d2c5..53a3c8d 100644 --- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java +++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java @@ -45,6 +45,7 @@ import org.apache.syncope.core.persistence.api.entity.SAML2IdP; import org.apache.syncope.core.provisioning.api.data.SAML2IdPDataBinder; import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.opensaml.saml.common.xml.SAMLConstants; +import org.opensaml.saml.saml2.core.NameID; import org.opensaml.saml.saml2.metadata.EntitiesDescriptor; import org.opensaml.saml.saml2.metadata.EntityDescriptor; import org.opensaml.saml.saml2.metadata.IDPSSODescriptor; @@ -164,7 +165,7 @@ public class SAML2IdPLogic extends AbstractSAML2Logic<SAML2IdPTO> { ItemTO connObjectKeyItem = new ItemTO(); connObjectKeyItem.setIntAttrName("username"); - connObjectKeyItem.setExtAttrName("NameID"); + connObjectKeyItem.setExtAttrName(NameID.DEFAULT_ELEMENT_LOCAL_NAME); idpTO.setConnObjectKeyItem(connObjectKeyItem); SAML2IdPEntity idp = cache.put(idpEntityDescriptor, idpTO); diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java index aca5d7a..814fa41 100644 --- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java +++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java @@ -28,6 +28,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -438,12 +439,12 @@ public class SAML2SPLogic extends AbstractSAML2Logic<EntityTO> { Assertion assertion = validatorResponse.getOpensamlAssertion(); NameID nameID = assertion.getSubject().getNameID(); if (nameID == null) { - throw new IllegalArgumentException("NameID not found"); + throw new IllegalArgumentException(NameID.DEFAULT_ELEMENT_LOCAL_NAME + " not found"); } String keyValue = null; if (StringUtils.isNotBlank(nameID.getValue()) - && idp.getConnObjectKeyItem().getExtAttrName().equals("NameID")) { + && idp.getConnObjectKeyItem().getExtAttrName().equals(NameID.DEFAULT_ELEMENT_LOCAL_NAME)) { keyValue = nameID.getValue(); } @@ -472,13 +473,11 @@ public class SAML2SPLogic extends AbstractSAML2Logic<EntityTO> { } } - AttrTO attrTO = new AttrTO(); - attrTO.setSchema(attrName); - attr.getAttributeValues().stream(). - filter(value -> value.getDOM() != null). - forEachOrdered(value -> { - attrTO.getValues().add(value.getDOM().getTextContent()); - }); + AttrTO attrTO = new AttrTO.Builder().schema(attrName). + values(attr.getAttributeValues().stream(). + filter(value -> value.getDOM() != null). + map(value -> value.getDOM().getTextContent()). + collect(Collectors.toList())).build(); responseTO.getAttrs().add(attrTO); } }
