[java-shib-attribute] branch main updated: Add log error on multiple mapped attr containers.

[Codeberg]

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

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

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/166440435718d5eae7ed959a1b977ebce751b935

The following commit(s) were added to refs/heads/main by this push:
     new 166440435 Add log error on multiple mapped attr containers.
166440435 is described below

commit 166440435718d5eae7ed959a1b977ebce751b935
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 12 10:37:22 2026 -0400

    Add log error on multiple mapped attr containers.
---
 .../attribute/resolver/impl/EntityAttributesDataConnector.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/EntityAttributesDataConnector.java b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/EntityAttributesDataConnector.java
index 0e99c6286..5a70ebd60 100644
--- a/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/EntityAttributesDataConnector.java
+++ b/shib-saml-attribute-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/EntityAttributesDataConnector.java
@@ -97,7 +97,7 @@ public class EntityAttributesDataConnector extends AbstractDataConnector {
         log.debug("Metadata Context {}", metadataContext == null ? "absent" : "present");
         final EntityDescriptor entity = metadataContext != null ? metadataContext.getEntityDescriptor() : null;
         if (entity == null) {
-            log.debug("Specified metadata source was absent.");
+            log.debug("Specified metadata source was absent");
             return CollectionSupport.emptyMap();
         }
 
@@ -140,6 +140,9 @@ public class EntityAttributesDataConnector extends AbstractDataConnector {
             throws CloneNotSupportedException {
         final List<AttributesMapContainer> containerList = parent.getObjectMetadata().get(AttributesMapContainer.class);
         if (containerList != null && !containerList.isEmpty()) {
+            if (containerList.size() > 1) {
+                log.error("More than one AttributesMapContainer detected, using the first one");
+            }
             final AttributesMapContainer container = containerList.get(0);
             final Multimap<String,IdPAttribute> tags = container.get();
             if (!tags.isEmpty()) {
@@ -151,7 +154,7 @@ public class EntityAttributesDataConnector extends AbstractDataConnector {
                         existing.setValues(union);
                     } else {
                         // We have to clone because of the other branch of this conditional,
-                        // we might need to mutate the values by combining them with a leter set.
+                        // we might need to mutate the values by combining them with a later set.
                         results.put(attribute.getId(), attribute.clone());
                     }
                 }

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