[java-oidfed-common] branch main updated: Add some missing properties and harmonise some existing ones
Codeberg
noreply at shibboleth.net
Fri Sep 4 07:28:25 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/bdc55f6c7212331ab30368f902cacecc347c6768
The following commit(s) were added to refs/heads/main by this push:
new bdc55f6 Add some missing properties and harmonise some existing ones
bdc55f6 is described below
commit bdc55f6c7212331ab30368f902cacecc347c6768
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Sep 4 10:28:00 2026 +0300
Add some missing properties and harmonise some existing ones
- idp.oidfed.entity-configuration -> idp.oidfed.entityConfiguration
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 4 ++--
.../entity-configuration-beans.xml | 16 ++++++-------
.../idp/service/relying-party/postconfig.xml | 4 ++--
.../oidfed/oidfed-entity-configuration-claims.xml | 4 ++--
.../idp/module/conf/oidfed/oidfed.properties | 2 +-
.../oidfed/oidfed-entity-configuration-claims.xml | 4 ++--
.../oidfed/conf/oidfed/oidfed.properties | 28 ++++++++++++----------
7 files changed, 33 insertions(+), 29 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 5b37c84..f9bee42 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
@@ -556,7 +556,7 @@
<bean id="shibboleth.oidfed.TrustMarkStatusMetadataCache" parent="shibboleth.oidfed.CacheBuilder">
<constructor-arg>
<bean p:cacheId="DefaultTrustMarkStatusMetadataCache" parent="shibboleth.oidfed.TrustMarkStatusMetadataCacheBuilderSpec"
- p:cleanupTaskInterval="PT30S"/>
+ p:cleanupTaskInterval="%{idp.oidfed.cache.trustMarkStatus.cleanupTaskInterval:PT30S}"/>
</constructor-arg>
</bean>
@@ -667,7 +667,7 @@
<bean id="shibboleth.oidfed.TrustMarkMetadataCache" parent="shibboleth.oidfed.CacheBuilder">
<constructor-arg>
<bean p:cacheId="DefaultTrustMarkMetadataCache" parent="shibboleth.oidfed.TrustMarkMetadataCacheBuilderSpec"
- p:cleanupTaskInterval="PT30S"/>
+ p:cleanupTaskInterval="%{idp.oidfed.cache.trustMark.cleanupTaskInterval:PT30S}"/>
</constructor-arg>
</bean>
diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml
index 6af1736..9a8084a 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidfed/entity-configuration/entity-configuration-beans.xml
@@ -20,14 +20,14 @@
<bean id="shibboleth.oidfed.EntityConfigurationResponseMetadataCache" parent="shibboleth.oidfed.CacheBuilder">
<constructor-arg>
<bean p:cacheId="DefaultEntityConfigurationResponseMetadataCache" parent="shibboleth.oidfed.EntityConfigurationResponseMetadataCacheBuilderSpec"
- p:cleanupTaskInterval="PT30S"/>
+ p:cleanupTaskInterval="%{idp.oidfed.entityConfiguration.cleanupTaskInterval:PT5M}"/>
</constructor-arg>
</bean>
<bean id="shibboleth.oidfed.EntityConfigurationResponseMetadataCacheBuilderSpec"
class="net.shibboleth.oidc.metadata.cache.impl.DynamicMetadataCacheBuilderSpec"
- p:minCacheDuration="%{idp.oidfed.entity-configuration.minRefreshDelay:PT1S}"
- p:maxCacheDuration="%{idp.oidfed.entity-configuration.maxRefreshDelay:PT30S}">
+ p:minCacheDuration="%{idp.oidfed.entityConfiguration.minRefreshDelay:PT5S}"
+ p:maxCacheDuration="%{idp.oidfed.entityConfiguration.maxRefreshDelay:PT5M}">
<property name="criteriaToIdentifierStrategy">
<bean parent="shibboleth.Functions.Constant" c:target-ref="shibboleth.oidfed.entityId" />
</property>
@@ -101,8 +101,8 @@
<bean id="InitializeEntityStatementContext"
class="net.shibboleth.oidfed.profile.impl.InitializeEntityStatementContext"
- p:metadataSkeletonLookupStrategy-ref="#{'%{idp.oidfed.entity-configuration.EntityConfigurationMetadataSkeletonLookupStrategy:DefaultEntityConfigurationMetadataSkeletonLookupStrategy}'.trim()}"
- p:metadataDecoratorManager-ref="#{'%{idp.oidfed.entity-configuration.MetadataDecoratorManager:shibboleth.oidfed.DefaultMetadataDecoratorManager}'.trim()}"/>
+ p:metadataSkeletonLookupStrategy-ref="#{'%{idp.oidfed.entityConfiguration.EntityConfigurationMetadataSkeletonLookupStrategy:DefaultEntityConfigurationMetadataSkeletonLookupStrategy}'.trim()}"
+ p:metadataDecoratorManager-ref="#{'%{idp.oidfed.entityConfiguration.MetadataDecoratorManager:shibboleth.oidfed.DefaultMetadataDecoratorManager}'.trim()}"/>
<bean id="shibboleth.oidfed.DefaultMetadataDecoratorManager"
class="net.shibboleth.oidfed.profile.EntityConfigurationMetadataDecoratorManager"/>
@@ -124,7 +124,7 @@
<constructor-arg name="signatureAlgorithmLookupStrategy">
<bean parent="shibboleth.Functions.Constant" c:target="" />
</constructor-arg>
- <constructor-arg name="defaultAlgorithmValue" value="%{idp.oidfed.entity-configuration.sigalg:RS256}" />
+ <constructor-arg name="defaultAlgorithmValue" value="%{idp.oidfed.entityConfiguration.sigalg:RS256}" />
</bean>
</property>
</bean>
@@ -200,7 +200,7 @@
factory-bean="PreferFileSystemResourceLoader" factory-method="getResource">
<constructor-arg>
<bean class="java.lang.String" factory-method="valueOf">
- <constructor-arg value="%{idp.oidfed.entity-configuration.MetadataSkaletonFile:%{idp.home}/conf/oidfed/oidfed-entity-configuration-metadata.json}" />
+ <constructor-arg value="%{idp.oidfed.entityConfiguration.MetadataSkaletonFile:%{idp.home}/conf/oidfed/oidfed-entity-configuration-metadata.json}" />
</bean>
</constructor-arg>
</bean>
@@ -213,7 +213,7 @@
</property>
<property name="sourceMetadataExpiryStrategy">
<bean class="net.shibboleth.oidc.metadata.cache.impl.DefaultSourceMetadataExpirationTimeStrategy"
- c:duration="%{idp.oidfed.entity-configuration.MetadataSkaletonCacheLifetime:PT10M}"/>
+ c:duration="%{idp.oidfed.entityConfiguration.MetadataSkaletonCacheLifetime:PT10M}"/>
</property>
</bean>
diff --git a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index afc3fd7..d947aa6 100644
--- a/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/oidfed-common-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -15,8 +15,8 @@
<bean id="OIDFED.Configuration" parent="AbstractOIDFederationProfile" lazy-init="true"
class="net.shibboleth.oidfed.profile.config.impl.DefaultOIDFederationEntityConfigurationProfileConfiguration"
p:issuer-ref="shibboleth.oidfed.entityId"
- p:entityStatementLifetime="%{idp.oidfed.entity-configuration.lifetime:PT24H}"
- p:authorityHints="%{idp.oidfed.entity-configuration.authorityHints:https://example.org}"
+ p:entityStatementLifetime="%{idp.oidfed.entityConfiguration.lifetime:PT24H}"
+ p:authorityHints="%{idp.oidfed.entityConfiguration.authorityHints:https://example.org}"
p:optionalClaimsLookupStrategies-ref="shibboleth.oidfed.EntityConfigurationClaimsLookupStrategies" />
<bean id="shibboleth.oidfed.SigningConfiguration"
diff --git a/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-entity-configuration-claims.xml b/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-entity-configuration-claims.xml
index 90d6626..67fe5b4 100644
--- a/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-entity-configuration-claims.xml
+++ b/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-entity-configuration-claims.xml
@@ -11,8 +11,8 @@
<util:map id="shibboleth.oidfed.EntityConfigurationClaimsLookupStrategies"
value-type="java.util.function.Function">
- <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entity-configuration.trustAnchoHintsLookupStrategy:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
- <entry key="trust_marks" value-ref="#{'%{idp.oidfed.entity-configuration.trustMarksLookupStrategy:DefaultTrustMarksLookupStrategy}'.trim()}"/>
+ <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entityConfiguration.trustAnchoHintsLookupStrategy:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
+ <entry key="trust_marks" value-ref="#{'%{idp.oidfed.entityConfiguration.trustMarksLookupStrategy:DefaultTrustMarksLookupStrategy}'.trim()}"/>
</util:map>
<util:list id="shibboleth.oidfed.DefaultTrustMarkLookupStrategies" value-type="java.util.function.Function">
diff --git a/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties b/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties
index 372dc59..ed667f6 100644
--- a/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties
+++ b/oidfed-common-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties
@@ -1,5 +1,5 @@
idp.oidfed.entityID = https://op.example.org
-idp.oidfed.entity-configuration.authorityHints = https://anchor1.example.org, https://anchor2.example.org
+idp.oidfed.entityConfiguration.authorityHints = https://anchor1.example.org, https://anchor2.example.org
idp.oidfed.cache.entityConfiguration.invalidContainerLifetime = PT0S
idp.oidfed.cache.entityConfiguration.minRefreshDelay = PT0S
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 add3b80..d9ec1f3 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
@@ -11,8 +11,8 @@
<util:map id="shibboleth.oidfed.EntityConfigurationClaimsLookupStrategies"
value-type="java.util.function.Function">
- <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entity-configuration.trustAnchorHintsLookupStrategy:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
- <entry key="trust_marks" value-ref="#{'%{idp.oidfed.entity-configuration.trustMarksLookupStrategy:DefaultTrustMarksLookupStrategy}'.trim()}"/>
+ <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entityConfiguration.trustAnchorHintsLookupStrategy:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
+ <entry key="trust_marks" value-ref="#{'%{idp.oidfed.entityConfiguration.trustMarksLookupStrategy:DefaultTrustMarksLookupStrategy}'.trim()}"/>
</util:map>
<util:list id="shibboleth.oidfed.DefaultTrustMarkLookupStrategies" value-type="java.util.function.Function">
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties
index f8e7040..1ad624e 100644
--- a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed.properties
@@ -1,17 +1,18 @@
# Set the OpenID Federation Entity ID value (defaults to idp.entityID)
#idp.oidfed.entityID = https://your.entity.example.org
-idp.oidfed.entity-configuration.authorityHints = https://your.authority.example.org
-#idp.oidfed.entity-configuration.lifetime = PT24H
-#idp.oidfed.entity-configuration.trustAnchorHintsLookupStrategy = DefaultTrustAnchorHintsLookupStrategy
-#idp.oidfed.entity-configuration.trustMarksLookupStrategy = DefaultTrustMarksLookupStrategy
-#idp.oidfed.entity-configuration.minRefreshDelay = PT1S
-#idp.oidfed.entity-configuration.maxRefreshDelay = PT30S
-#idp.oidfed.entity-configuration.EntityConfigurationMetadataSkeletonLookupStrategy = DefaultEntityConfigurationMetadataSkeletonLookupStrategy
-#idp.oidfed.entity-configuration.MetadataDecoratorManager = shibboleth.oidfed.DefaultMetadataDecoratorManager
-#idp.oidfed.entity-configuration.sigalg = RS256
-#idp.oidfed.entity-configuration.MetadataSkaletonFile = %{idp.home}/conf/oidfed/oidfed-entity-configuration-metadata.json
-#idp.oidfed.entity-configuration.MetadataSkaletonCacheLifetime = PT10M
+idp.oidfed.entityConfiguration.authorityHints = https://your.authority.example.org
+#idp.oidfed.entityConfiguration.lifetime = PT24H
+#idp.oidfed.entityConfiguration.trustAnchorHintsLookupStrategy = DefaultTrustAnchorHintsLookupStrategy
+#idp.oidfed.entityConfiguration.trustMarksLookupStrategy = DefaultTrustMarksLookupStrategy
+#idp.oidfed.entityConfiguration.minRefreshDelay = PT1S
+#idp.oidfed.entityConfiguration.maxRefreshDelay = PT30S
+#idp.oidfed.entityConfiguration.cleanupTaskInterval = PT30S
+#idp.oidfed.entityConfiguration.EntityConfigurationMetadataSkeletonLookupStrategy = DefaultEntityConfigurationMetadataSkeletonLookupStrategy
+#idp.oidfed.entityConfiguration.MetadataDecoratorManager = shibboleth.oidfed.DefaultMetadataDecoratorManager
+#idp.oidfed.entityConfiguration.sigalg = RS256
+#idp.oidfed.entityConfiguration.MetadataSkaletonFile = %{idp.home}/conf/oidfed/oidfed-entity-configuration-metadata.json
+#idp.oidfed.entityConfiguration.MetadataSkaletonCacheLifetime = PT10M
#idp.service.logging.oidfedconfig = OIDFED.Configuration
#idp.oidfed.logging.objectMapper = shibboleth.oidfed.JSONObjectMapper
@@ -40,6 +41,7 @@ idp.oidfed.entity-configuration.authorityHints = https://your.authority.example.
#idp.oidfed.cache.entityConfiguration.customFilterStrategies =
#idp.oidfed.cache.entityConfiguration.maxJwtLifetime = PT24H
#idp.oidfed.cache.entityConfiguration.claimsValidator = shibboleth.oidfed.DefaultEntityConfigurationClaimsValidator
+#idp.oidfed.cache.entityConfiguration.critClaims = %{idp.oidfed.cache.default.critClaims:}
#idp.oidfed.cache.subordinateStatement.cleanupTaskInterval = PT5M
#idp.oidfed.cache.subordinateStatement.minRefreshDelay = PT1M
@@ -80,7 +82,8 @@ idp.oidfed.entity-configuration.authorityHints = https://your.authority.example.
#idp.oidfed.LocalTrustAnchorsFile = %{idp.home}/conf/oidfed/oidfed-trust-anchors.json
-#idp.oidfed.cache.trustMarkStatus.maxRefreshDelay = PT60S
+#idp.oidfed.cache.trustMarkStatus.cleanupTaskInterval = PT5M
+#idp.oidfed.cache.trustMarkStatus.minRefreshDelay = PT60S
#idp.oidfed.cache.trustMarkStatus.maxRefreshDelay = PT30M
#idp.oidfed.cache.trustMarkStatus.customFilterStrategies =
#idp.oidfed.cache.trustMarkStatus.claimsValidator = shibboleth.oidfed.DefaultTrustMarkStatusClaimsValidator
@@ -89,6 +92,7 @@ idp.oidfed.entity-configuration.authorityHints = https://your.authority.example.
#idp.oidfed.cache.trustMarkStatus.exceptionContainerLifetime = PT0S
#idp.oidfed.cache.trustMarkStatus.maxJwtLifetime = PT24H
+#idp.oidfed.cache.trustMark.cleanupTaskInterval = PT5M
#idp.oidfed.cache.trustMark.minRefreshDelay = PT1H
#idp.oidfed.cache.trustMark.maxRefreshDelay = PT24H
#idp.oidfed.cache.trustMark.customFilterStrategies =
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list