[java-oidfed-common] branch main updated: Fix a typo and bring the policy test vector improvement from OP's fed-plugin

[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/9d4bd6764cff66f8f924126f82ac59100917b86b

The following commit(s) were added to refs/heads/main by this push:
     new 9d4bd67  Fix a typo and bring the policy test vector improvement from OP's fed-plugin
9d4bd67 is described below

commit 9d4bd6764cff66f8f924126f82ac59100917b86b
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Sep 30 14:44:07 2026 +0300

    Fix a typo and bring the policy test vector improvement from OP's fed-plugin
    
    - Iterate over both input and resolved metadata claims to verify the actual result in all cases
---
 .../resources/META-INF/net.shibboleth.idp/postconfig.xml     |  2 +-
 .../net/shibboleth/oidfed/flow/ResolveEntityFlowTest.java    | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index b2d7aac..6dedfd0 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -1200,7 +1200,7 @@
                     <key>
                         <util:constant static-field="net.shibboleth.oidfed.profile.OidFederationEventIds.INVALID_METADATA_AGAINST_POLICY"/>
                     </key>
-                    <bean class="com.nimbusds.oauth2.sdk.ErrorObject" c:_0="invalid_metadata" c:_1="Metadata is invalid or not found for the requested entity types against the fedeationn metadata policy" c:_2="400" />
+                    <bean class="com.nimbusds.oauth2.sdk.ErrorObject" c:_0="invalid_metadata" c:_1="Metadata is invalid or not found for the requested entity types against the federation metadata policy" c:_2="400" />
                 </entry>
             </map>
         </property>
diff --git a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/ResolveEntityFlowTest.java b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/ResolveEntityFlowTest.java
index a096414..5d3f125 100644
--- a/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/ResolveEntityFlowTest.java
+++ b/oidfed-common-conf-impl/src/test/java/net/shibboleth/oidfed/flow/ResolveEntityFlowTest.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import org.apache.commons.codec.binary.Base64;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -489,7 +490,7 @@ public class ResolveEntityFlowTest extends AbstractFederationFlowTest {
                     assertErrorDescriptionContains(result, "Merged metadata policy is invalid", ERROR_MESSAGE);
                 } else {
                     assertErrorDescriptionContains(result, "Metadata is invalid or not found for the requested entity "
-                            + "types against the fedeationn metadata policy", ERROR_MESSAGE);
+                            + "types against the federation metadata policy", ERROR_MESSAGE);
                 }
             } else {
                 if (vector.get("resolved") instanceof Map<?,?> map) {
@@ -515,7 +516,9 @@ public class ResolveEntityFlowTest extends AbstractFederationFlowTest {
                     assert enforcedMetadata != null;
                     final Map<String, Object> rpMetadata = enforcedMetadata.getOpenidRelyingPartyMetadata();
                     assert rpMetadata != null;
-                    for (final String claim : metadata.keySet()) {
+                    for (final String claim : Stream
+                            .concat(metadata.keySet().stream(), resolved.keySet().stream()).distinct()
+                            .toList()) {
                         final Object actual = rpMetadata.get(claim);
                         if (resolved.get(claim) instanceof Boolean flag) {
                             if (flag) {
@@ -528,11 +531,10 @@ public class ResolveEntityFlowTest extends AbstractFederationFlowTest {
                                     .map(String.class::cast).toList();
                             final Collection<String> actualStrings = ((Collection<?>) actual).stream()
                                     .map(String.class::cast).toList();
-                            Assert.assertTrue(expectedStrings.containsAll(actualStrings));
-                            Assert.assertTrue(actualStrings.containsAll(expectedStrings));
+                            Assert.assertTrue(expectedStrings.containsAll(actualStrings), ERROR_MESSAGE);
+                            Assert.assertTrue(actualStrings.containsAll(expectedStrings), ERROR_MESSAGE);
                         } else {
                             Assert.assertEquals(actual, resolved.get(claim), ERROR_MESSAGE);
-
                         }
                     }
                 } else {

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