[java-oidfed-common] branch main updated: Harmonise naming of bean-hooks for the resolve-trust-chains flow
Codeberg
noreply at shibboleth.net
Wed Sep 9 16:46:07 UTC 2026
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/3936028ba8b7a044906c194d4e17d178a8061061
The following commit(s) were added to refs/heads/main by this push:
new 3936028 Harmonise naming of bean-hooks for the resolve-trust-chains flow
3936028 is described below
commit 3936028ba8b7a044906c194d4e17d178a8061061
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Sep 9 19:41:50 2026 +0300
Harmonise naming of bean-hooks for the resolve-trust-chains flow
- Mandatory beans to be provided
- shibboleth.oidfed.trust-chain-resolver.UseResolverApiCondition
- shibboleth.oidfed.trust-chain-resolver.FallbackToLocalResolutionCondition
- Optionally customized hooks (default in parenthesis)
- Generic:
- shibboleth.oidfed.trust-chain-resolver.JWTPayloadJSONObjectMapper (shibboleth.oidfed.JWTPayloadJSONObjectMapper)
- shibboleth.oidfed.trust-chain-resolver.PreSelectedTrustChainIDsLookupStrategy (shibboleth.oidfed.DefaultPreSelectedTrustChainIDsLookupStrategy)
- shibboleth.oidfed.trust-chain-resolver.EntityIDLookupStrategy (shibboleth.oidfed.trust-chain-resolver.DefaultEntityIDLookupStrategy)
- shibboleth.oidfed.trust-chain-resolver.ArrayAsSpaceSeparatedList (shibboleth.oidfed.trust-chain-resolver.DefaultArrayAsSpaceSeparatedList)
- shibboleth.oidfed.trust-chain-resolver.RequireEntityConfigurationCondition (shibboleth.Conditions.FALSE)
- shibboleth.oidfed.trust-chain-resolver.EntityConfigurationLookupStrategy (ConstantNull - TBD by inheriting flows)
- Remote resolution:
- shibboleth.oidfed.trust-chain-resolver.RemoteEntityEntityConfigurationMetadataCache (shibboleth.oidfed.EntityConfigurationMetadataCache)
- shibboleth.oidfed.trust-chain-resolver.ResolveEntityTrustChainMetadataCache (shibboleth.oidfed.ResolveEntityTrustChainMetadataCache)
- shibboleth.oidfed.trust-chain-resolver.TrustedRemoteResolverEntitiesLookupStrateg (shibboleth.oidfed.DefaultTrustedRemoteResolverEntitiesLookupStrategy)
- Local resolution:
- shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataCache (shibboleth.oidfed.TrustChainMetadataCache)
- shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataPolicyMergingStrategy (shibboleth.oidfed.trust-chain-resolver.DefaultTrustChainMetadataPolicyMergingStrategy)
- shibboleth.oidfed.trust-chain-resolver.MetadataPolicyEnforcer (shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer)
- shibboleth.oidfed.trust-chain-resolver.MetadataValidationCondition (shibboleth.oidfed.trust-chain-resolver.DefaultMetadataValidationCondition)
- shibboleth.oidfed.trust-chain-resolver.FederationPolicyConstraints (shibboleth.oidfed.DefaultFederationPolicyConstraints)
- shibboleth.oidfed.trust-chain-resolver.CombinedMetadataFromTrustChainLookupStrategy (shibboleth.oidfed.trust-chain-resolver.DefaultCombinedMetadataFromTrustChainLookupStrategy)
- Adapted the 'test-trust-chain-resolution' into the new bean nnames
---
.../test-trust-chain-resolution-beans.xml | 11 ++---
.../resolve-trust-chains-beans.xml | 51 ++++++++++++----------
2 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidfed/test-trust-chain-resolution/test-trust-chain-resolution-beans.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidfed/test-trust-chain-resolution/test-trust-chain-resolution-beans.xml
index 797b400..18ce67e 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidfed/test-trust-chain-resolution/test-trust-chain-resolution-beans.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidfed/test-trust-chain-resolution/test-trust-chain-resolution-beans.xml
@@ -33,25 +33,20 @@
</property>
</bean>
- <bean id="shibboleth.oidfed.DefaultPreSelectedTrustChainIDsLookupStrategy"
+ <bean id="shibboleth.oidfed.trust-chain-resolver.PreSelectedTrustChainIDsLookupStrategy"
parent="shibboleth.Functions.Constant"
c:target="#{null}"/>
- <bean id="ParameterUseResolverApiCondition"
+ <bean id="shibboleth.oidfed.trust-chain-resolver.UseResolverApiCondition"
parent="shibboleth.Conditions.Expression"
c:expression="'true'.equalsIgnoreCase(#custom.get().getParameter('useResolverApi'))"
p:customObject-ref="shibboleth.HttpServletRequestSupplier" />
- <bean id="ParameterFallbackToLocalResolutionCondition"
+ <bean id="shibboleth.oidfed.trust-chain-resolver.FallbackToLocalResolutionCondition"
parent="shibboleth.Conditions.Expression"
c:expression="'true'.equalsIgnoreCase(#custom.get().getParameter('fallbackToLocalResolution'))"
p:customObject-ref="shibboleth.HttpServletRequestSupplier" />
- <alias alias="shibboleth.oidfed.UseResolverApiCondition" name="ParameterUseResolverApiCondition" />
-
- <alias alias="shibboleth.oidfed.FallbackToLocalResolutionCondition"
- name="ParameterFallbackToLocalResolutionCondition" />
-
<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() > # [...]
diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-trust-chains/resolve-trust-chains-beans.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-trust-chains/resolve-trust-chains-beans.xml
index 0cb710a..0f71319 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-trust-chains/resolve-trust-chains-beans.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/resolve-trust-chains/resolve-trust-chains-beans.xml
@@ -7,17 +7,17 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <alias alias="UseResolverApiCondition" name="shibboleth.oidfed.UseResolverApiCondition" />
- <alias alias="FallbackToLocalResolutionCondition" name="shibboleth.oidfed.FallbackToLocalResolutionCondition" />
+ <alias alias="UseResolverApiCondition" name="shibboleth.oidfed.trust-chain-resolver.UseResolverApiCondition" />
+ <alias alias="FallbackToLocalResolutionCondition" name="shibboleth.oidfed.trust-chain-resolver.FallbackToLocalResolutionCondition" />
<bean id="CallResolveEntityApi"
class="net.shibboleth.oidfed.profile.impl.CallResolveEntityApi"
- p:entityConfigurationCache-ref="shibboleth.oidfed.EntityConfigurationMetadataCache"
- p:resolveEntityTrustChainMetadataCache-ref="shibboleth.oidfed.ResolveEntityTrustChainMetadataCache"
- p:objectMapper-ref="shibboleth.oidfed.JWTPayloadJSONObjectMapper"
- p:trustedEntitiesLookupStrategy="#{getObject('shibboleth.oidfed.TrustedRemoteResolverEntitiesLookupStrategy') ?: getObject('shibboleth.oidfed.DefaultTrustedRemoteResolverEntitiesLookupStrategy')}"
- p:preSelectedTrustChainIdsLookupStrategy="#{getObject('shibboleth.oidfed.PreSelectedTrustChainIDsLookupStrategy') ?: getObject('shibboleth.oidfed.DefaultPreSelectedTrustChainIDsLookupStrategy')}"
- p:entityIDLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityIDLookupStrategy') ?: getObject('shibboleth.oidfed.shibboleth.oidfed.trust-chain-resolver.DefaultEntityIDLookupStrategy')}"
+ p:entityConfigurationCache="#{getObject('shibboleth.oidfed.trust-chain-resolver.RemoteEntityEntityConfigurationMetadataCache') ?: getObject('shibboleth.oidfed.EntityConfigurationMetadataCache')}"
+ p:resolveEntityTrustChainMetadataCache="#{getObject('shibboleth.oidfed.trust-chain-resolver.ResolveEntityTrustChainMetadataCache') ?: getObject('shibboleth.oidfed.ResolveEntityTrustChainMetadataCache')}"
+ p:objectMapper="#{getObject('shibboleth.oidfed.trust-chain-resolver.JWTPayloadJSONObjectMapper') ?: getObject('shibboleth.oidfed.JWTPayloadJSONObjectMapper')}"
+ p:trustedEntitiesLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.TrustedRemoteResolverEntitiesLookupStrategy') ?: getObject('shibboleth.oidfed.DefaultTrustedRemoteResolverEntitiesLookupStrategy')}"
+ p:preSelectedTrustChainIdsLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.PreSelectedTrustChainIDsLookupStrategy') ?: getObject('shibboleth.oidfed.DefaultPreSelectedTrustChainIDsLookupStrategy')}"
+ p:entityIDLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityIDLookupStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultEntityIDLookupStrategy')}"
p:requireEntityConfigurationCondition="#{getObject('shibboleth.oidfed.trust-chain-resolver.RequireEntityConfigurationCondition') ?: getObject('shibboleth.Conditions.FALSE')}"
p:entityConfigurationLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityConfigurationLookupStrategy') ?: getObject('ConstantNull')}"/>
@@ -25,29 +25,32 @@
<bean id="ResolveTrustChains" class="net.shibboleth.oidfed.profile.impl.ResolveTrustChains"
scope="prototype"
- p:trustChainCache-ref="#{'%{idp.oidfed.TrustChainMetadataCache:shibboleth.oidfed.TrustChainMetadataCache}'.trim()}"
- p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.TrustChainMetadataPolicyMergingStrategy:DefaultTrustChainMetadataPolicyMergingStrategy}'.trim()}"
- p:metadataPolicyEnforcer-ref="#{'%{idp.oidfed.MetadataPolicyEnforcer:DefaultMetadataPolicyEnforcer}'.trim()}"
- p:preSelectedTrustChainIdsLookupStrategy="#{getObject('shibboleth.oidfed.PreSelectedTrustChainIDsLookupStrategy') ?: getObject('shibboleth.oidfed.DefaultPreSelectedTrustChainIDsLookupStrategy')}"
- p:arraysAsSpaceSeparatedList="%{idp.oidfed.policy.arraysAsSpaceSeparatedList:scope}"
- p:metadataValidationCondition-ref="#{'%{idp.oidfed.MetadataValidationCondition:DefaultMetadataValidationCondition}'.trim()}"
- p:federationPolicyConstraints-ref="%{idp.oidfed.FederationPolicyConstraints:shibboleth.oidfed.DefaultFederationPolicyConstraints}"
- p:entityIDLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityIDLookupStrategy') ?: getObject('shibboleth.oidfed.shibboleth.oidfed.trust-chain-resolver.DefaultEntityIDLookupStrategy')}"
+ p:trustChainCache="#{getObject('shibboleth.oidfed.trust-chain-resolver.TrustChainMetadataCache') ?: getObject('shibboleth.oidfed.TrustChainMetadataCache')}"
+ 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:preSelectedTrustChainIdsLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.PreSelectedTrustChainIDsLookupStrategy') ?: getObject('shibboleth.oidfed.DefaultPreSelectedTrustChainIDsLookupStrategy')}"
+ 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="#{getObject('shibboleth.oidfed.trust-chain-resolver.FederationPolicyConstraints') ?: getObject('shibboleth.oidfed.DefaultFederationPolicyConstraints')}"
+ p:entityIDLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityIDLookupStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultEntityIDLookupStrategy')}"
p:requireEntityConfigurationCondition="#{getObject('shibboleth.oidfed.trust-chain-resolver.RequireEntityConfigurationCondition') ?: getObject('shibboleth.Conditions.FALSE')}"
- p:entityConfigurationLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityConfigurationLookupStrategy') ?: getObject('ConstantNull')}">
- <property name="metadataLookupStrategy">
- <bean class="net.shibboleth.oidfed.profile.navigate.DefaultCombinedMetadataFromTrustChainLookupStrategy" />
- </property>
- </bean>
+ p:entityConfigurationLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.EntityConfigurationLookupStrategy') ?: getObject('ConstantNull')}"
+ p:metadataLookupStrategy="#{getObject('shibboleth.oidfed.trust-chain-resolver.CombinedMetadataFromTrustChainLookupStrategy') ?: getObject('shibboleth.oidfed.trust-chain-resolver.DefaultCombinedMetadataFromTrustChainLookupStrategy')}" />
+
+ <bean id="shibboleth.oidfed.trust-chain-resolver.DefaultCombinedMetadataFromTrustChainLookupStrategy"
+ class="net.shibboleth.oidfed.profile.navigate.DefaultCombinedMetadataFromTrustChainLookupStrategy" />
+
+ <bean id="shibboleth.oidfed.trust-chain-resolver.DefaultArrayAsSpaceSeparatedList" class="java.lang.String"
+ c:_0="%{idp.oidfed.policy.arraysAsSpaceSeparatedList:scope}"/>
- <bean id="DefaultMetadataValidationCondition"
+ <bean id="shibboleth.oidfed.trust-chain-resolver.DefaultMetadataValidationCondition"
class="net.shibboleth.oidfed.profile.navigate.DefaultMetadataValidationCondition" />
- <bean id="DefaultMetadataPolicyEnforcer"
+ <bean id="shibboleth.oidfed.trust-chain-resolver.DefaultMetadataPolicyEnforcer"
class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyEnforcer"
p:metadataPolicyOperators-ref="#{'%{idp.oidfed.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
- <bean id="DefaultTrustChainMetadataPolicyMergingStrategy"
+ <bean id="shibboleth.oidfed.trust-chain-resolver.DefaultTrustChainMetadataPolicyMergingStrategy"
class="net.shibboleth.oidfed.profile.navigate.DefaultTrustChainMetadataPolicyMergingStrategy"
p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.MetadataPolicyMergingStrategy:MetadataPolicyMergingStrategy}'.trim()}"
p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.LocalMetadataPolicyStrategy:DefaultLocalMetadataPolicyStrategy}'.trim()}"/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list