[java-plugin-shibd-saml] branch main updated: Fix build for now.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-plugin-shibd-saml.

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-saml.git;a=commit;h=039fe4c606c041aca2aa6b82d0ee23bbee2ad1af

The following commit(s) were added to refs/heads/main by this push:
     new 039fe4c  Fix build for now.
039fe4c is described below

commit 039fe4c606c041aca2aa6b82d0ee23bbee2ad1af
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 22 09:28:08 2025 -0400

    Fix build for now.
---
 .../sp/saml/saml2/profile/impl/ExtractSAMLAttributes.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ExtractSAMLAttributes.java b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ExtractSAMLAttributes.java
index a527ab8..b7d7e77 100644
--- a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ExtractSAMLAttributes.java
+++ b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ExtractSAMLAttributes.java
@@ -17,6 +17,7 @@ package net.shibboleth.sp.saml.saml2.profile.impl;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -54,6 +55,7 @@ import com.google.common.collect.Multimap;
 import net.shibboleth.idp.attribute.AttributeDecodingException;
 import net.shibboleth.idp.attribute.DateTimeAttributeValue;
 import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeSupport;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.context.AttributeContext;
@@ -266,6 +268,8 @@ public class ExtractSAMLAttributes extends AbstractApplicationAction {
         
         processAttributes(profileRequestContext);
         
+        // TODO: figure out merging to handle all the dups
+        
         // Extract standard attributes.
         if (standardExtractionStrategy != null &&
                 profileConfiguration.isExtractStandardAttributes(profileRequestContext)) {
@@ -376,8 +380,8 @@ public class ExtractSAMLAttributes extends AbstractApplicationAction {
         log.debug("{} Incoming SAML Attributes mapped to attribute IDs: {}", getLogPrefix(), mapped.keySet());
 
         if (!mapped.isEmpty()) {
-            attributeContext.setUnfilteredIdPAttributes(mapped.values());
-            attributeContext.setIdPAttributes(null);
+            attributeContext.setUnfilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(mapped.values()));
+            attributeContext.setIdPAttributes((Map<String,IdPAttribute>) null);
             filterAttributes(profileRequestContext);
         }
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.