[java-shib-attribute] branch main updated: IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=bcb709359fb36261c9a35b1b8f9a94ef34991827

The following commit(s) were added to refs/heads/main by this push:
     new bcb709359 IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use
bcb709359 is described below

commit bcb709359fb36261c9a35b1b8f9a94ef34991827
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 23 14:58:59 2025 +0100

    IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use
    
    https://shibboleth.atlassian.net/browse/IDP-2375
    
    Revert behaviour of deprecated (and no longer used in the IdP) setXXXAttribute(Collection)
    methods in the AttributeContext and AttributeFilterContext to the old behaviour (detect and warn
    and pick just one)
---
 .../java/net/shibboleth/idp/attribute/context/AttributeContext.java   | 4 ++--
 .../idp/attribute/filter/context/AttributeFilterContext.java          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
index e2588d4cf..993505cba 100644
--- a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
+++ b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
@@ -76,7 +76,7 @@ public final class AttributeContext extends BaseContext {
 
         DeprecationSupport.warn(ObjectType.METHOD,
                 "setIdPAttributes(Collection)", "AttributeContext", "setIdPAttributes(Map)");
-        return setIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(newAttributes));
+        return setIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(newAttributes));
     }
 
     /**
@@ -124,7 +124,7 @@ public final class AttributeContext extends BaseContext {
         DeprecationSupport.warn(ObjectType.METHOD,
                 "setUnfilteredIdPAttributes(Collection)", "AttributeContext", "setUnfilteredIdPAttributes(Map)");
 
-        return setUnfilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(newAttributes));
+        return setUnfilteredIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(newAttributes));
     }
 
     /**
diff --git a/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java b/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
index 03e946eaa..76e12100e 100644
--- a/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
+++ b/shib-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
@@ -236,7 +236,7 @@ public final class AttributeFilterContext extends BaseContext {
                 "AttributeFilterContext",
                 "setPrefilteredIdPAttributes(Map)");
 
-        return setPrefilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(attributes));
+        return setPrefilteredIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(attributes));
     }
 
     /**
@@ -285,7 +285,7 @@ public final class AttributeFilterContext extends BaseContext {
         DeprecationSupport.warn(ObjectType.METHOD,
                 "setFilteredIdPAttributes(Collection)", "AttributeFilterContext", "setFilteredIdPAttributes(Map)");
 
-        return setFilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(attributes));
+        return setFilteredIdPAttributes(IdPAttributeSupport.toMapNoDuplicates(attributes));
     }
     
     /**

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