[java-oidfed-common] 01/03: Switch functions to return a copy of the resulting map.

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-oidfed-common.

View the commit online:
https://codeberg.org/Shibboleth/java-oidfed-common/commit/2c781cb55b2432c4a5762d4c00a6b1f9d8729850

commit 2c781cb55b2432c4a5762d4c00a6b1f9d8729850
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Oct 30 12:55:48 2026 +0200

    Switch functions to return a copy of the resulting map.
---
 .../navigate/DefaultCombinedMetadataFromTrustChainLookupStrategy.java  | 2 +-
 .../navigate/DefaultTrustChainMetadataPolicyMergingStrategy.java       | 2 +-
 .../profile/navigate/DefaultTrustChainTrustMarksParsingStrategy.java   | 3 ++-
 .../DefaultTrustChainTrustedTrustMarkOwnersLookupStrategy.java         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultCombinedMetadataFromTrustChainLookupStrategy.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultCombinedMetadataFromTrustChainLookupStrategy.java
index 381e5ff..8b87062 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultCombinedMetadataFromTrustChainLookupStrategy.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultCombinedMetadataFromTrustChainLookupStrategy.java
@@ -80,7 +80,7 @@ public class DefaultCombinedMetadataFromTrustChainLookupStrategy extends Abstrac
             result.put(entityType, subordinateClaims);
         }
 
-        return result;
+        return CollectionSupport.copyToMap(result);
     }
 
 }
diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainMetadataPolicyMergingStrategy.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainMetadataPolicyMergingStrategy.java
index 3e60d04..8e56d23 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainMetadataPolicyMergingStrategy.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainMetadataPolicyMergingStrategy.java
@@ -120,7 +120,7 @@ public class DefaultTrustChainMetadataPolicyMergingStrategy extends AbstractIden
         } catch (final ConstraintViolationException e) {
             throw new ConstraintViolationException("Could not merge local metadata policy in the federation policy");
         }
-        return result;
+        return CollectionSupport.copyToMap(result);
     }
 
     /**
diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustMarksParsingStrategy.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustMarksParsingStrategy.java
index c62232f..4d00dc2 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustMarksParsingStrategy.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustMarksParsingStrategy.java
@@ -37,6 +37,7 @@ import net.shibboleth.oidfed.metadata.impl.TrustMarkImpl;
 import net.shibboleth.oidfed.metadata.payload.EntityConfigurationPayload;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.shared.annotation.constraint.ThreadSafeAfterInit;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.logic.Constraint;
@@ -119,7 +120,7 @@ public class DefaultTrustChainTrustMarksParsingStrategy extends AbstractIdentifi
             }
         }
         
-        return result;
+        return CollectionSupport.copyToMap(result);
     }
 
     /**
diff --git a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustedTrustMarkOwnersLookupStrategy.java b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustedTrustMarkOwnersLookupStrategy.java
index 522f033..24a7c31 100644
--- a/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustedTrustMarkOwnersLookupStrategy.java
+++ b/oidfed-common-impl/src/main/java/net/shibboleth/oidfed/profile/navigate/DefaultTrustChainTrustedTrustMarkOwnersLookupStrategy.java
@@ -53,7 +53,7 @@ public class DefaultTrustChainTrustedTrustMarkOwnersLookupStrategy
                         ecp.getTrustMarkOwners() : null;
         log.debug("Parsed trust_mark_owners claim {}", ownersClaim);
         if (ownersClaim != null) {
-            return ownersClaim;
+            return CollectionSupport.copyToMap(ownersClaim);
         }
         log.debug("Returning empty map");
         return CollectionSupport.emptyMap();

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