[java-identity-provider] branch master updated: IDP-1570 - Tag-driven properties based on aliased names are broken

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=631c5b695103e2f06e4aa0961bea2128192c64a0

The following commit(s) were added to refs/heads/master by this push:
       new  631c5b6   IDP-1570 - Tag-driven properties based on aliased names are broken
631c5b6 is described below

commit 631c5b695103e2f06e4aa0961bea2128192c64a0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 2 11:38:51 2020 -0500

    IDP-1570 - Tag-driven properties based on aliased names are broken
    
    https://issues.shibboleth.net/jira/browse/IDP-1570
---
 .../AbstractMetadataDrivenConfigurationLookupStrategy.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
index b46062c..0234ca6 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
@@ -184,10 +184,7 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(aliases, "Alias collection cannot be null");
         
-        propertyAliases = StringSupport.normalizeStringCollection(aliases)
-                .stream()
-                .map(s -> s + (s.endsWith("/") ? propertyName : '/' + propertyName))
-                .collect(Collectors.toUnmodifiableList());
+        propertyAliases = List.copyOf(StringSupport.normalizeStringCollection(aliases));
     }
     
     /**
@@ -246,6 +243,12 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
         } else if (propertyAliases == null) {
             propertyAliases = Collections.emptyList();
         }
+        
+        // Now attach the property name to the end of the alias list entries.
+        propertyAliases = propertyAliases.stream()
+                .map(s -> s + (s.endsWith("/") ? propertyName : '/' + propertyName))
+                .collect(Collectors.toUnmodifiableList());
+        
     }
 
     // Checkstyle: CyclomaticComplexity|MethodLength OFF    

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