[java-oidfed-common] branch main updated: Improve and harmonise configuration property naming
Codeberg
noreply at shibboleth.net
Thu Aug 20 11:56:20 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/e6114c2dcebcfbb55dc41b271f2c67f01cd097e7
The following commit(s) were added to refs/heads/main by this push:
new e6114c2 Improve and harmonise configuration property naming
e6114c2 is described below
commit e6114c2dcebcfbb55dc41b271f2c67f01cd097e7
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Aug 20 14:10:30 2026 +0300
Improve and harmonise configuration property naming
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 36 +++++++++++-----------
.../test-trust-chain-resolution-beans.xml | 4 +--
.../resolve-trust-chains-beans.xml | 16 +++++-----
.../oidfed/oidfed-entity-configuration-claims.xml | 4 +--
4 files changed, 30 insertions(+), 30 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 09c9b68..90e36b2 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
@@ -114,7 +114,7 @@
</property>
</bean>
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultEntityStatementContentValidationCondition"
- p:claimsValidator-ref="%{idp.oidfed.entityConfiguration.claimsValidator:shibboleth.oidfed.DefaultEntityConfigurationClaimsValidator}"
+ p:claimsValidator-ref="%{idp.oidfed.cache.entityConfiguration.claimsValidator:shibboleth.oidfed.DefaultEntityConfigurationClaimsValidator}"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="headerValidator">
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultTrustChainHeaderValidationCondition"
@@ -219,7 +219,7 @@
</property>
</bean>
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultEntityStatementContentValidationCondition"
- p:claimsValidator-ref="%{idp.oidfed.subordinateStatement.claimsValidator:shibboleth.oidfed.DefaultSubordinateStatementClaimsValidator}"
+ p:claimsValidator-ref="%{idp.oidfed.cache.subordinateStatement.claimsValidator:shibboleth.oidfed.DefaultSubordinateStatementClaimsValidator}"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="headerValidator">
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultTrustChainHeaderValidationCondition"
@@ -319,7 +319,7 @@
<bean class="net.shibboleth.oidfed.security.jwt.claims.impl.MetadataPolicyCritClaimsValidator">
<property name="supportedOperatorsLookupStrategy">
<bean class="net.shibboleth.oidfed.security.jwt.claims.impl.DefaultMetadataPolicyOperatorsLookupStrategy"
- p:defaultSupportedOperators-ref="#{'%{idp.oidfed.authorize.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}">
+ p:defaultSupportedOperators-ref="#{'%{idp.oidfed.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}">
<property name="supportedOperators">
<util:map>
<entry key="net.shibboleth.oidfed.messaging.impl.ResolveEntityRequest" value-ref="#{'%{idp.oidfed.resolve-entity.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}" />
@@ -349,8 +349,8 @@
<bean id="shibboleth.oidfed.TrustChainMetadataCacheBuilderSpec"
class="net.shibboleth.oidc.metadata.cache.impl.DynamicMetadataCacheBuilderSpec"
p:criteriaToIdentifierStrategy-ref="shibboleth.oidfed.DefaultSubjectEntityIDCriteriaToIdentifierStrategy"
- p:minCacheDuration="%{idp.oidfed.trustChain.minRefreshDelay:PT1M}"
- p:maxCacheDuration="%{idp.oidfed.trustChain.maxRefreshDelay:PT30M}"
+ p:minCacheDuration="%{idp.oidfed.cache.trustChain.minRefreshDelay:PT1M}"
+ p:maxCacheDuration="%{idp.oidfed.cache.trustChain.maxRefreshDelay:PT30M}"
p:metadataExpirationTimeStrategy-ref="DefaultResponseContainerExpirationTimeStrategy">
<property name="identifierExtractionStrategy">
<bean parent="shibboleth.Functions.Expression" c:expression="#input?.getEntityId()"/>
@@ -433,7 +433,7 @@
</property>
</bean>
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultEntityStatementContentValidationCondition"
- p:claimsValidator-ref="%{idp.oidfed.remoteResolver.claimsValidator:shibboleth.oidfed.DefaultResolveEntityResponseClaimsValidator}"
+ p:claimsValidator-ref="%{idp.oidfed.cache.resolveEntity.claimsValidator:shibboleth.oidfed.DefaultResolveEntityResponseClaimsValidator}"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="headerValidator">
<bean parent="shibboleth.BiConditions.Expression" c:expression="true"/>
@@ -593,7 +593,7 @@
</property>
</bean>
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultEntityStatementContentValidationCondition"
- p:claimsValidator-ref="%{idp.oidfed.trustMarkStatus.claimsValidator:shibboleth.oidfed.DefaultTrustMarkStatusClaimsValidator}"
+ p:claimsValidator-ref="%{idp.oidfed.cache.trustMarkStatus.claimsValidator:shibboleth.oidfed.DefaultTrustMarkStatusClaimsValidator}"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="headerValidator">
<bean parent="shibboleth.BiConditions.Expression" c:expression="true"/>
@@ -695,7 +695,7 @@
</property>
</bean>
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultEntityStatementContentValidationCondition"
- p:claimsValidator-ref="%{idp.oidfed.trustMark.claimsValidator:shibboleth.oidfed.DefaultTrustMarkClaimsValidator}"
+ p:claimsValidator-ref="%{idp.oidfed.cache.trustMark.claimsValidator:shibboleth.oidfed.DefaultTrustMarkClaimsValidator}"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="headerValidator">
<bean parent="shibboleth.BiConditions.Expression" c:expression="true"/>
@@ -752,7 +752,7 @@
<util:list value-type="net.shibboleth.oidc.jwt.claims.ClaimsValidator">
<bean class="net.shibboleth.oidc.security.jwt.claims.impl.IssuedAtClaimsValidator"
p:clockSkew="%{idp.policy.clockSkew:PT1M}"
- p:messageLifetime="%{idp.oidfed.maxTrustMarkifetime:P365D}"
+ p:messageLifetime="%{idp.oidfed.cache.trustMark.maxJwtLifetime:P365D}"
p:requiredRule="true" />
<bean class="net.shibboleth.oidc.security.jwt.claims.impl.RequiredClaimsValidator"
p:requiredClaims="iss" />
@@ -827,7 +827,7 @@
</property>
</bean>
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultEntityStatementContentValidationCondition"
- p:claimsValidator-ref="%{idp.oidfed.signedKeyset.claimsValidator:shibboleth.oidfed.DefaultSignedKeysetClaimsValidator}"
+ p:claimsValidator-ref="%{idp.oidfed.cache.signedKeyset.claimsValidator:shibboleth.oidfed.DefaultSignedKeysetClaimsValidator}"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="headerValidator">
<bean class="net.shibboleth.oidfed.metadata.cache.DefaultTrustChainHeaderValidationCondition"
@@ -1016,7 +1016,7 @@
<util:list value-type="net.shibboleth.oidc.jwt.claims.ClaimsValidator">
<bean class="net.shibboleth.oidc.security.jwt.claims.impl.IssuedAtClaimsValidator"
p:clockSkew="%{idp.policy.clockSkew:PT1M}"
- p:messageLifetime="%{idp.oidfed.maxTrustMarkifetime:P365D}"
+ p:messageLifetime="%{idp.oidfed.cache.trustMark.maxJwtLifetime:P365D}"
p:requiredRule="true" />
<bean class="net.shibboleth.oidc.security.jwt.claims.impl.RequiredClaimsValidator"
p:requiredClaims="iss" />
@@ -1052,18 +1052,18 @@
<bean parent="shibboleth.AdminFlow"
c:id="http://shibboleth.net/ns/profiles/oidfed/test-trust-chain-resolution"
- p:loggingId="%{idp.oidfed.admin.trustchains.logging:ClientManagement}"
- p:policyName="%{idp.oidfed.admin.trustchains.accessPolicy:AccessByIPAddress}"
- p:nonBrowserSupported="%{idp.oidfed.admin.trustchains.nonBrowserSupported:true}"
- p:authenticated="%{idp.oidfed.admin.trustchains.authenticated:false}"
- p:resolveAttributes="%{idp.oidfed.admin.trustchains.resolveAttributes:false}">
+ p:loggingId="%{idp.oidfed.admin.resolvertest.logging:TestTrustChainResolver}"
+ p:policyName="%{idp.oidfed.admin.resolvertest.accessPolicy:AccessByIPAddress}"
+ p:nonBrowserSupported="%{idp.oidfed.admin.resolvertest.nonBrowserSupported:true}"
+ p:authenticated="%{idp.oidfed.admin.resolvertest.authenticated:false}"
+ p:resolveAttributes="%{idp.oidfed.admin.resolvertest.resolveAttributes:false}">
<property name="postAuthenticationFlows">
<bean parent="shibboleth.CommaDelimStringArray"
- c:_0="#{'%{idp.oidfed.admin.trustchains.postAuthenticationFlows:}'.trim()}" />
+ c:_0="#{'%{idp.oidfed.admin.resolvertest.postAuthenticationFlows:}'.trim()}" />
</property>
<property name="defaultAuthenticationMethodsByString">
<bean parent="shibboleth.CommaDelimStringArray"
- c:_0="#{'%{idp.oidfed.admin.trustchains.defaultAuthenticationMethods:}'.trim()}" />
+ c:_0="#{'%{idp.oidfed.admin.resolvertest.defaultAuthenticationMethods:}'.trim()}" />
</property>
</bean>
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 69f5ebe..e678a97 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
@@ -55,7 +55,7 @@
<bean id="ResolveTrustMarks" class="net.shibboleth.oidfed.profile.impl.ResolveTrustMarks"
scope="prototype"
- p:trustChainCache-ref="#{'%{idp.oidfed.authorize.TrustChainMetadataCache:shibboleth.oidfed.TrustChainMetadataCache}'.trim()}"
+ p:trustChainCache-ref="#{'%{idp.oidfed.admin.resolvertest.TrustChainMetadataCache:shibboleth.oidfed.TrustChainMetadataCache}'.trim()}"
p:trustMarkClaimsValidationLookupStrategy="#{getObject('shibboleth.oidfed.TrustMarkClaimsValidationLookupStrategy') ?: getObject('DefaultTrustMarkClaimsValidationLookupStrategy')}"
p:delegatedTrustMarkClaimsValidationLookupStrategy="#{getObject('shibboleth.oidfed.DelegatedTrustMarkClaimsValidationLookupStrategy') ?: getObject('DefaultDelegatedTrustMarkClaimsValidationLookupStrategy')}"
p:trustEngine-ref="shibboleth.oidfed.DefaultEntityConfigurationTrustEngine"
@@ -74,7 +74,7 @@
<bean id="ValidateTrustMarks" class="net.shibboleth.oidfed.profile.impl.ValidateTrustMarks"
scope="prototype"
- p:trustMarkStatusCache-ref="#{'%{idp.oidfed.authorize.TrustMarkStatusMetadataCache:shibboleth.oidfed.TrustMarkStatusMetadataCache}'.trim()}">
+ p:trustMarkStatusCache-ref="#{'%{idp.oidfed.admin.resolvertest.TrustMarkStatusMetadataCache:shibboleth.oidfed.TrustMarkStatusMetadataCache}'.trim()}">
<property name="remoteTrustMarkValidationCondition">
<bean parent="shibboleth.Conditions.Expression"
c:expression="'true'.equalsIgnoreCase(#custom.get().getParameter('remoteTrustMarkValidation'))"
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 40146db..190f0ff 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
@@ -22,9 +22,9 @@
<bean id="ResolveTrustChains" class="net.shibboleth.oidfed.profile.impl.ResolveTrustChains"
scope="prototype"
- p:trustChainCache-ref="#{'%{idp.oidfed.authorize.TrustChainMetadataCache:shibboleth.oidfed.TrustChainMetadataCache}'.trim()}"
- p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.authorize.TrustChainMetadataPolicyMergingStrategy:DefaultTrustChainMetadataPolicyMergingStrategy}'.trim()}"
- p:metadataPolicyEnforcer-ref="#{'%{idp.oidfed.authorize.MetadataPolicyEnforcer:DefaultMetadataPolicyEnforcer}'.trim()}"
+ 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()}"
@@ -42,16 +42,16 @@
<bean id="DefaultMetadataPolicyEnforcer"
class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyEnforcer"
- p:metadataPolicyOperators-ref="#{'%{idp.oidfed.authorize.MetadataPolicyOperatorsy:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
+ p:metadataPolicyOperators-ref="#{'%{idp.oidfed.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
<bean id="DefaultTrustChainMetadataPolicyMergingStrategy"
class="net.shibboleth.oidfed.profile.navigate.DefaultTrustChainMetadataPolicyMergingStrategy"
- p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.authorize.MetadataPolicMergingyStrategy:MetadataPolicMergingyStrategy}'.trim()}"
- p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.authorize.LocalMetadataPolicyStrategy:DefaultLocalMetadataPolicyStrategy}'.trim()}"/>
+ p:metadataPolicyMergingStrategy-ref="#{'%{idp.oidfed.MetadataPolicyMergingStrategy:MetadataPolicyMergingStrategy}'.trim()}"
+ p:localMetadataPolicyStrategy-ref="#{'%{idp.oidfed.LocalMetadataPolicyStrategy:DefaultLocalMetadataPolicyStrategy}'.trim()}"/>
- <bean id="MetadataPolicMergingyStrategy"
+ <bean id="MetadataPolicyMergingStrategy"
class="net.shibboleth.oidfed.metadata.policy.impl.DefaultFederationMetadataPolicyMergingStrategy"
- p:metadataPolicyOperators-ref="#{'%{idp.oidfed.authorize.MetadataPolicyOperatorsy:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
+ p:metadataPolicyOperators-ref="#{'%{idp.oidfed.MetadataPolicyOperators:shibboleth.oidfed.StandardMetadataPolicyOperators}'.trim()}"/>
<bean id="DefaultLocalMetadataPolicyStrategy"
parent="shibboleth.Functions.Constant">
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml
index 67452e6..0b972c1 100644
--- a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml
@@ -12,7 +12,7 @@
<!-- TODO: document with examples once the structure is settled -->
<util:map id="shibboleth.oidfed.EntityConfigurationClaimsLookupStrategies"
value-type="java.util.function.Function">
- <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entity-configuration.trustAnchoHintsLookup:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
+ <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entity-configuration.trustAnchorHintsLookupStrategy:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
</util:map>
-</beans>
\ No newline at end of file
+</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list