[java-identity-provider] branch maint-3.4 updated: IDP-1570 - Tag-driven security configuration not working

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/maint-3.4 by this push:
       new  221d65f4f IDP-1570 - Tag-driven security configuration not working
221d65f4f is described below

commit 221d65f4f3709b3de915562142bbf7db32676561
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 22 12:00:17 2020 -0400

    IDP-1570 - Tag-driven security configuration not working
    
    https://issues.shibboleth.net/jira/browse/IDP-1570
    
    Backport fix to 3.4
---
 ...tMetadataDrivenConfigurationLookupStrategy.java | 39 ++++++++++++----------
 1 file changed, 21 insertions(+), 18 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 af5557edb..768101976 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
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.saml.profile.config;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -111,18 +112,6 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
         enableCaching = true;
     }
     
-    /** {@inheritDoc} */
-    @Override
-    protected void doInitialize() throws ComponentInitializationException {
-        super.doInitialize();
-        
-        if (propertyName == null) {
-            throw new ComponentInitializationException("Property name cannot be null or empty");
-        } else if (propertyAliases == null) {
-            propertyAliases = Collections.emptyList();
-        }
-    }
-
     /**
      * Set whether tag matching should examine and require an Attribute NameFormat of the URI type.
      * 
@@ -172,12 +161,7 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(aliases, "Alias collection cannot be null");
         
-        propertyAliases = Collections2.transform(StringSupport.normalizeStringCollection(aliases),
-                new Function<String,String>() {
-                    public String apply(final String input) {
-                        return input + (input.endsWith("/") ? propertyName : '/' + propertyName);
-                    }
-                });
+        propertyAliases = new ArrayList(StringSupport.normalizeStringCollection(aliases));        
     }
     
     /**
@@ -276,6 +260,25 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
     }
 // Checkstyle: CyclomaticComplexity ON
     
+    /** {@inheritDoc} */
+    @Override
+    protected void doInitialize() throws ComponentInitializationException {
+        super.doInitialize();
+        
+        if (propertyName == null) {
+            throw new ComponentInitializationException("Property name cannot be null or empty");
+        } else if (propertyAliases == null) {
+            propertyAliases = Collections.emptyList();
+        } else {
+            propertyAliases = Collections2.transform(propertyAliases,
+                    new Function<String,String>() {
+                        public String apply(final String input) {
+                            return input + (input.endsWith("/") ? propertyName : '/' + propertyName);
+                        }
+                    });
+        }
+    }
+
     /**
      * Translate the value(s) into a setting of the appropriate type.
      * 

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