[java-identity-provider] branch main updated: IDP-2367 - Upgrade breaks use of attributes.properties via idp.searchForProperties

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new 01d388b89 IDP-2367 - Upgrade breaks use of attributes.properties via idp.searchForProperties
01d388b89 is described below

commit 01d388b892c854fce59858b8326c8a142f21ced8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 26 13:46:33 2025 -0400

    IDP-2367 - Upgrade breaks use of attributes.properties via
    idp.searchForProperties
    
    https://shibboleth.atlassian.net/browse/IDP-2367
    
    Override new methods for future proofing.
---
 .../IdPPropertiesApplicationContextInitializer.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java b/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
index fff7a5e2e..7178eddd6 100644
--- a/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
+++ b/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
@@ -14,9 +14,13 @@
 
 package net.shibboleth.idp.spring;
 
+import java.io.File;
+import java.util.Collection;
+
 import javax.annotation.Nonnull;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.spring.context.AbstractPropertiesApplicationContextInitializer;
 
 /**
@@ -34,6 +38,9 @@ public class IdPPropertiesApplicationContextInitializer
     /** Property that controls auto-search for property sources. */
     @Nonnull @NotEmpty public static final String IDP_AUTOSEARCH_PROPERTY = "idp.searchForProperties";
 
+    /** Property that controls auto-search location root for property sources. */
+    @Nonnull @NotEmpty public static final String IDP_AUTOSEARCH_ROOT = "conf";
+
     /** Target resource to be searched for. */
     @Nonnull public static final String IDP_PROPERTIES = "/conf/idp.properties";
 
@@ -82,6 +89,18 @@ public class IdPPropertiesApplicationContextInitializer
         return IDP_AUTOSEARCH_PROPERTY;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    @Nonnull @NotEmpty protected String getAutoSearchRoot() {
+        return IDP_AUTOSEARCH_ROOT;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    @Nonnull @NotEmpty protected Collection<String> getExcludedSearchPaths() {
+        return CollectionSupport.singletonList("attributes" + File.separatorChar);
+    }
+    
     /** {@inheritDoc} */
     @Override
     @Nonnull

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