[java-idp-plugin-oidc-op-oidfed] 01/02: Exploit the 'flow default' wiring from oidfed-common to metadata policy related strategies

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-idp-plugin-oidc-op-oidfed.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-oidc-op-oidfed/commit/ac0203d32efa283ee2a293d4d650c4f27bc4f4cc

commit ac0203d32efa283ee2a293d4d650c4f27bc4f4cc
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Sun Oct 11 13:35:35 2026 +0300

    Exploit the 'flow default' wiring from oidfed-common to metadata policy related strategies
---
 .../oidfed/metadata-lookup-ext-oidfed-beans.xml      | 18 +++++++++---------
 .../idp/flows/oidfed/register/register-beans.xml     | 20 ++++++++++----------
 .../oidc/op/oidfed/conf/oidfed/oidfed-op.properties  |  8 ++++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/oidfed/metadata-lookup-ext-oidfed-beans.xml b/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/oidfed/metadata-lookup-ext-oidfed-beans.xml
index d71596b..cc1b844 100644
--- a/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/oidfed/metadata-lookup-ext-oidfed-beans.xml
+++ b/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/oidfed/metadata-lookup-ext-oidfed-beans.xml
@@ -24,8 +24,8 @@
 
     <bean id="ValidateProvidedTrustChain" class="net.shibboleth.idp.plugin.oidc.op.oidfed.profile.impl.ValidateProvidedTrustChain"
         scope="prototype"
-        p:metadataPolicyMergingStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultTrustChainMetadataPolicyMergingStrategy')}"
-        p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"
+        p:metadataPolicyMergingStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy') ?: getObject('FlowDefaultTrustChainMetadataPolicyMergingStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultTrustChainMetadataPolicyMergingStrategy')}"
+        p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('FlowDefaultMetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"
         p:arraysAsSpaceSeparatedList="#{getObject('shibboleth.oidfed.trust-chain-resolver.ArrayAsSpaceSeparatedList') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultArrayAsSpaceSeparatedList')}"
         p:metadataValidationCondition="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataValidationCondition') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataValidationCondition')}"
         p:federationPolicyConstraints-ref="%{idp.oidfed.op.automaticRegistration.FederationPolicyConstraints:shibboleth.oidfed.DefaultFederationPolicyConstraints}"
@@ -164,20 +164,20 @@
     <bean id="TrustChainCandidatesExist" parent="shibboleth.Conditions.Expression"
         c:expression="#input.ensureInboundMessageContext().containsSubcontext(T(net.shibboleth.oidfed.profile.context.RelyingPartyTrustChainContext)) and #input.ensureInboundMessageContext().ensureSubcontext(T(net.shibboleth.oidfed.profile.context.RelyingPartyTrustChainContext)).getPolicyCompliantTrustChains() != null and #input.ensureInboundMessageContext().ensureSubcontext(T(net.shibboleth.oidfed.profile.context.RelyingPartyTrustChainContext)).getPolicyCompliantTrustChains().size() > 0"/>
 
-    <bean id="shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer"
+    <bean id="FlowDefaultMetadataPolicyEnforcer"
         class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyEnforcer"
         p:metadataPolicyOperators-ref="#{'%{idp.oidfed.op.automaticRegistration.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
 
-    <bean id="shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy" 
+    <bean id="FlowDefaultTrustChainMetadataPolicyMergingStrategy" 
         class="net.shibboleth.oidfed.profile.navigate.DefaultTrustChainMetadataPolicyMergingStrategy"
-        p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.op.automaticRegistration.MetadataPolicyMergingStrategy:MetadataPolicyMergingStrategy}'.trim()}"
-        p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.op.automaticRegistration.LocalMetadataPolicyStrategy:DefaultLocalMetadataPolicyStrategy}'.trim()}"/>
+        p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.op.automaticRegistration.MetadataPolicyMergingStrategy:FlowDefaultMetadataPolicyMergingStrategy}'.trim()}"
+        p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.op.automaticRegistration.LocalMetadataPolicyStrategy:FlowDefaultLocalMetadataPolicyStrategy}'.trim()}"/>
 
-    <bean id="MetadataPolicyMergingStrategy"
+    <bean id="FlowDefaultMetadataPolicyMergingStrategy"
         class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyMergingStrategy"
         p:metadataPolicyOperators-ref="#{'%{idp.oidfed.op.automaticRegistration.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
 
-    <bean id="DefaultLocalMetadataPolicyStrategy"
+    <bean id="FlowDefaultLocalMetadataPolicyStrategy"
         parent="shibboleth.Functions.Constant">
         <constructor-arg name="target">
             <util:map>
@@ -268,7 +268,7 @@
         </property>
         <property name="localMetadataPolicyMergingStrategy">
             <bean class="net.shibboleth.idp.plugin.oidc.op.oidfed.profile.navigate.DefaultLocalMetadataPolicyMergingStrategy"
-                p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"/>
+                p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('FlowDefaultMetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"/>
         </property>
         <property name="mandatoryTrustMarksLookupStrategy">
             <bean class="net.shibboleth.oidfed.profile.config.navigate.MandatoryTrustMarksLookupFunction"
diff --git a/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/register/register-beans.xml b/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/register/register-beans.xml
index 8b9eec8..7de0a27 100644
--- a/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/register/register-beans.xml
+++ b/idp-oidfed-op-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/register/register-beans.xml
@@ -45,8 +45,8 @@
 
     <bean id="ValidateProvidedTrustChain" class="net.shibboleth.idp.plugin.oidc.op.oidfed.profile.impl.ValidateProvidedTrustChain"
         scope="prototype"
-        p:metadataPolicyMergingStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultTrustChainMetadataPolicyMergingStrategy')}"
-        p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"
+        p:metadataPolicyMergingStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy') ?: getObject('FlowDefaultTrustChainMetadataPolicyMergingStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultTrustChainMetadataPolicyMergingStrategy')}"
+        p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('FlowDefaultMetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"
         p:arraysAsSpaceSeparatedList="#{getObject('shibboleth.oidfed.trust-chain-resolver.ArrayAsSpaceSeparatedList') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultArrayAsSpaceSeparatedList')}"
         p:metadataLookupStrategy-ref="DefaultCombinedMetadataFromTrustChainLookupStrategy"
         p:metadataValidationCondition="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataValidationCondition') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataValidationCondition')}"
@@ -295,20 +295,20 @@
         </constructor-arg>
     </bean>
 
-    <bean id="shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer"
+    <bean id="FlowDefaultMetadataPolicyEnforcer"
         class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyEnforcer"
         p:metadataPolicyOperators-ref="#{'%{idp.oidfed.op.explicitRegistration.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
 
-    <bean id="shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy" 
+    <bean id="FlowDefaultTrustChainMetadataPolicyMergingStrategy" 
         class="net.shibboleth.oidfed.profile.navigate.DefaultTrustChainMetadataPolicyMergingStrategy"
-        p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.op.explicitRegistration.MetadataPolicyMergingStrategy:MetadataPolicyMergingStrategy}'.trim()}"
-        p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.op.explicitRegistration.LocalMetadataPolicyStrategy:DefaultLocalMetadataPolicyStrategy}'.trim()}"/>
+        p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.op.explicitRegistration.MetadataPolicyMergingStrategy:FlowDefaultMetadataPolicyMergingStrategy}'.trim()}"
+        p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.op.explicitRegistration.LocalMetadataPolicyStrategy:FlowDefaultLocalMetadataPolicyStrategy}'.trim()}"/>
 
-    <bean id="MetadataPolicyMergingStrategy"
+    <bean id="FlowDefaultMetadataPolicyMergingStrategy"
         class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyMergingStrategy"
         p:metadataPolicyOperators-ref="#{'%{idp.oidfed.op.explicitRegistration.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
 
-    <bean id="DefaultLocalMetadataPolicyStrategy"
+    <bean id="FlowDefaultLocalMetadataPolicyStrategy"
         parent="shibboleth.Functions.Constant">
         <constructor-arg name="target">
             <util:map>
@@ -401,7 +401,7 @@
         scope="prototype">
         <property name="localMetadataPolicyMergingStrategy">
             <bean class="net.shibboleth.idp.plugin.oidc.op.oidfed.profile.navigate.DefaultLocalMetadataPolicyMergingStrategy"
-                p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"/>
+                p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('FlowDefaultMetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"/>
         </property>
         <property name="mandatoryTrustMarksLookupStrategy">
             <bean class="net.shibboleth.oidfed.profile.config.navigate.MandatoryTrustMarksLookupFunction"
@@ -412,7 +412,7 @@
     <bean id="ValidateRegistrationRequestMetadata"
         class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateRegistrationRequestMetadata"
         scope="prototype"
-        p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}"/>
+        p:metadataPolicyEnforcer="#{getObject('shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer') ?: getObject('FlowDefaultMetadataPolicyEnforcer') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer')}" />
         
     <bean id="CheckRedirectURIs"
         class="net.shibboleth.idp.plugin.oidc.op.profile.impl.CheckRedirectURIs"
diff --git a/idp-oidfed-op-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/oidfed/conf/oidfed/oidfed-op.properties b/idp-oidfed-op-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/oidfed/conf/oidfed/oidfed-op.properties
index 835c2b2..09f126b 100644
--- a/idp-oidfed-op-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/oidfed/conf/oidfed/oidfed-op.properties
+++ b/idp-oidfed-op-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/oidfed/conf/oidfed/oidfed-op.properties
@@ -21,8 +21,8 @@
 #idp.oidfed.op.automaticRegistration.ProvidedTrustChainMetadataCache = DefaultAutoRegisterFetchThroughProvidedTrustChainMetadataCache
 #idp.oidfed.op.automaticRegistration.cache.providedTrustChain.customFilterStrategies =
 #idp.oidfed.op.automaticRegistration.MetadataPolicyOperators = shibboleth.oidfed.StandardMetadataPolicyOperators
-#idp.oidfed.op.automaticRegistration.MetadataPolicyMergingStrategy = MetadataPolicyMergingStrategy
-#idp.oidfed.op.automaticRegistration.LocalMetadataPolicyStrategy = DefaultLocalMetadataPolicyStrategy
+#idp.oidfed.op.automaticRegistration.MetadataPolicyMergingStrategy = FlowDefaultMetadataPolicyMergingStrategy
+#idp.oidfed.op.automaticRegistration.LocalMetadataPolicyStrategy = FlowDefaultLocalMetadataPolicyStrategy
 #idp.oidfed.op.automaticRegistration.TrustChainMetadataCache = shibboleth.oidfed.TrustChainMetadataCache
 #idp.oidfed.op.automaticRegistration.TrustMarkStatusMetadataCache = shibboleth.oidfed.TrustMarkStatusMetadataCache
 #idp.oidfed.op.automaticRegistration.EntityConfigurationMetadataCache = shibboleth.oidfed.EntityConfigurationMetadataCache
@@ -53,8 +53,8 @@
 #idp.oidfed.op.explicitRegistration.cache.entityConfiguration.customFilterStrategies =
 #idp.oidfed.op.explicitRegistration.cache.explicitRegistrationRequest.claimsValidator = shibboleth.oidfed.DefaultExplicitRegistrationRequestClaimsValidator
 #idp.oidfed.op.explicitRegistration.MetadataPolicyOperators = shibboleth.oidfed.StandardMetadataPolicyOperators
-#idp.oidfed.op.explicitRegistration.MetadataPolicyMergingStrategy = MetadataPolicMergingyStrategy
-#idp.oidfed.op.explicitRegistration.LocalMetadataPolicyStrategy = DefaultLocalMetadataPolicyStrategy
+#idp.oidfed.op.explicitRegistration.MetadataPolicyMergingStrategy = FlowDefaultMetadataPolicyMergingStrategy
+#idp.oidfed.op.explicitRegistration.LocalMetadataPolicyStrategy = FlowDefaultLocalMetadataPolicyStrategy
 #idp.oidfed.op.explicitRegistration.TrustChainMetadataCache = shibboleth.oidfed.TrustChainMetadataCache
 #idp.oidfed.op.explicitRegistration.TrustMarkStatusMetadataCache = shibboleth.oidfed.TrustMarkStatusMetadataCache
 #idp.oidfed.op.explicitRegistration.EntityConfigurationMetadataCache = shibboleth.oidfed.EntityConfigurationMetadataCache

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