[java-idp-plugin-oidc-op-oidfed] branch main updated: Improve and harmonise property and bean naming
Codeberg
noreply at shibboleth.net
Thu Sep 3 12:15:55 UTC 2026
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/9ff836f974659fa367b0ce59d2d65f9ed3e8c472
The following commit(s) were added to refs/heads/main by this push:
new 9ff836f Improve and harmonise property and bean naming
9ff836f is described below
commit 9ff836f974659fa367b0ce59d2d65f9ed3e8c472
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Sep 3 15:02:33 2026 +0300
Improve and harmonise property and bean naming
- Adapt into new 'shibboleth.oidfed.' prefixes for UseResolverApiCondition and FallbackToLocalResolutionCondition
- Feature specific properties for wiring the conditions:
- idp.oidfed.op.automaticRegistration.trustchain.resolver.useResolverApiCondition
- idp.oidfed.op.automaticRegistration.trustchain.resolver.fallbackToLocalCondition
- idp.oidfed.op.explicitRegistration.trustchain.resolver.useResolverApiCondition
- idp.oidfed.op.explicitRegistration.trustchain.resolver.fallbackToLocalCondition
- Use 'idp.oidfed.op.automaticRegistration.activationCondition.' prefix for the endpoint specific condition properties
- Exploit 'shibboleth.oidfed.TrustedRemoteResolverEntity' in test configurations
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 15 ++++----
.../idp/flows/oidfed/register/register-beans.xml | 6 ++++
.../op/oidfed/conf/oidfed/oidfed-op.properties | 42 +++++++++++-----------
.../idp/module/conf/oidfed/oidfed-op.properties | 16 +++++----
.../conf/oidfed/oidfed-trustchain-resolver.xml | 4 +--
5 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 43ff00f..19f6e49 100644
--- a/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -197,7 +197,7 @@
<bean id="shibboleth.oidfed.authorize.DefaultAutomaticRegistrationCondition" parent="shibboleth.Conditions.AND">
<constructor-arg>
<list>
- <ref bean="%{idp.oidfed.authorize.automaticRegistrationCondition:shibboleth.Conditions.FALSE}"/>
+ <ref bean="%{idp.oidfed.op.automaticRegistration.activationCondition.authorize:shibboleth.Conditions.FALSE}"/>
<bean parent="shibboleth.Conditions.Expression"
c:expression="#input.ensureInboundMessageContext().getMessage() instanceof T(com.nimbusds.oauth2.sdk.AuthorizationRequest) and #input.ensureInboundMessageContext().getMessage().specifiesRequestObject()" />
<bean parent="shibboleth.Conditions.Expression"
@@ -219,7 +219,7 @@
<bean id="shibboleth.oidfed.token.DefaultAutomaticRegistrationCondition" parent="shibboleth.Conditions.AND">
<constructor-arg>
<list>
- <ref bean="%{idp.oidfed.token.automaticRegistrationCondition:shibboleth.Conditions.FALSE}"/>
+ <ref bean="%{idp.oidfed.op.automaticRegistration.activationCondition.token:shibboleth.Conditions.FALSE}"/>
<bean parent="shibboleth.Conditions.Expression"
c:expression="#input.ensureInboundMessageContext().getMessage() instanceof T(com.nimbusds.oauth2.sdk.TokenRequest)" />
<bean parent="shibboleth.Conditions.Expression"
@@ -237,7 +237,7 @@
<bean id="shibboleth.oidfed.par.DefaultAutomaticRegistrationCondition" parent="shibboleth.Conditions.AND">
<constructor-arg>
<list>
- <ref bean="%{idp.oidfed.par.automaticRegistrationCondition:shibboleth.Conditions.FALSE}"/>
+ <ref bean="%{idp.oidfed.op.automaticRegistration.activationCondition.par:shibboleth.Conditions.FALSE}"/>
<bean parent="shibboleth.Conditions.Expression"
c:expression="#input.ensureInboundMessageContext().getMessage() instanceof T(com.nimbusds.oauth2.sdk.PushedAuthorizationRequest)" />
<bean parent="shibboleth.Conditions.Expression"
@@ -269,7 +269,7 @@
<bean id="shibboleth.oidfed.userinfo.DefaultAutomaticRegistrationCondition" parent="shibboleth.Conditions.AND">
<constructor-arg>
<list>
- <ref bean="%{idp.oidfed.userinfo.automaticRegistrationCondition:shibboleth.Conditions.FALSE}"/>
+ <ref bean="%{idp.oidfed.op.automaticRegistration.activationCondition.userinfo:shibboleth.Conditions.FALSE}"/>
<bean parent="shibboleth.Conditions.Expression"
c:expression="#input.ensureInboundMessageContext().getMessage() instanceof T(com.nimbusds.openid.connect.sdk.UserInfoRequest)" />
<bean parent="shibboleth.Conditions.Expression"
@@ -365,8 +365,11 @@
</property>
</bean>
- <alias alias="UseResolverApiCondition" name="%{idp.oidfed.trustchain.resolver.useResolverApiCondition:shibboleth.Conditions.FALSE}" />
- <alias alias="FallbackToLocalResolutionCondition" name="%{idp.oidfed.trustchain.resolver.fallbackToLocalCondition:shibboleth.Conditions.TRUE}" />
+ <alias alias="shibboleth.oidfed.UseResolverApiCondition"
+ name="%{idp.oidfed.op.automaticRegistration.trustchain.resolver.useResolverApiCondition:shibboleth.Conditions.FALSE}" />
+
+ <alias alias="shibboleth.oidfed.FallbackToLocalResolutionCondition"
+ name="%{idp.oidfed.op.automaticRegistration.trustchain.resolver.fallbackToLocalCondition:shibboleth.Conditions.TRUE}" />
<bean id="shibboleth.oidfed.DefaultExplicitRegistrationRequestClaimsValidator"
class="net.shibboleth.oidc.security.jwt.claims.impl.ChainingJWTClaimsValidator">
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 bdea8d7..87f37fa 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
@@ -16,6 +16,12 @@
<bean id="shibboleth.oidc.loggingId" class="java.lang.String"
c:_0="%{idp.service.logging.oidfeddynreg:OIDFED.Registration}" />
+ <alias alias="shibboleth.oidfed.UseResolverApiCondition"
+ name="%{idp.oidfed.op.explicitRegistration.trustchain.resolver.useResolverApiCondition:shibboleth.Conditions.FALSE}" />
+
+ <alias alias="shibboleth.oidfed.FallbackToLocalResolutionCondition"
+ name="%{idp.oidfed.op.explicitRegistration.trustchain.resolver.fallbackToLocalCondition:shibboleth.Conditions.TRUE}" />
+
<bean id="shibboleth.ClientIDLookupStrategy"
class="net.shibboleth.idp.plugin.oidc.op.oidfed.profile.navigate.ExplicitClientRegistrationRequestClientIDLookupFunction" />
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 80808c6..b79520e 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
@@ -1,11 +1,13 @@
# postconfig.xml
-idp.oidfed.authorize.automaticRegistrationCondition = shibboleth.Conditions.FALSE
-idp.oidfed.token.automaticRegistrationCondition = shibboleth.Conditions.FALSE
-idp.oidfed.par.automaticRegistrationCondition = shibboleth.Conditions.FALSE
-idp.oidfed.userinfo.automaticRegistrationCondition = shibboleth.Conditions.FALSE
-idp.oidfed.resolve-entity.automaticRegistrationCondition = shibboleth.Conditions.TRUE
-idp.oidfed.trustchain.resolver.useResolverApiCondition = shibboleth.Conditions.FALSE
-idp.oidfed.trustchain.resolver.fallbackToLocalCondition = shibboleth.Conditions.TRUE
+idp.oidfed.op.automaticRegistration.activationCondition.authorize = shibboleth.Conditions.FALSE
+idp.oidfed.op.automaticRegistration.activationCondition.token = shibboleth.Conditions.FALSE
+idp.oidfed.op.automaticRegistration.activationCondition.par = shibboleth.Conditions.FALSE
+idp.oidfed.op.automaticRegistration.activationCondition.userinfo = shibboleth.Conditions.FALSE
+idp.oidfed.op.automaticRegistration.trustchain.resolver.useResolverApiCondition = shibboleth.Conditions.FALSE
+idp.oidfed.op.automaticRegistration.trustchain.resolver.fallbackToLocalCondition = shibboleth.Conditions.TRUE
+
+idp.oidfed.op.explicitRegistration.trustchain.resolver.useResolverApiCondition = shibboleth.Conditions.FALSE
+idp.oidfed.op.explicitRegistration.trustchain.resolver.fallbackToLocalCondition = shibboleth.Conditions.TRUE
idp.oidfed.op.metadata.minRefreshDelay = PT5M
idp.oidfed.op.metadata.maxRefreshDelay = PT4H
@@ -27,19 +29,6 @@ idp.oidfed.resolve-entity.endpointAuthMethods = private_key_jwt
idp.oidfed.resolve-entity.targetedEndpointAsJWTAudience = false
idp.oidfed.resolve-entity.requireSingleJWTAudience = true
-# resolve-entity-beans
-idp.service.logging.oidfedresolve = OIDFED.ResolveEntity
-idp.oidfed.requestParser.ResolveEntityRequest =
-idp.oidfed.cache.resolveEntity.minRefreshDelay = PT1S
-idp.oidfed.cache.resolveEntity.maxRefreshDelay = PT30S
-idp.oidfed.resolve-entity.LocalTrustAnchorsMetadataCache = shibboleth.oidfed.LocalTrustAnchorsMetadataCache
-idp.oidfed.resolve-entity.MetadataPolicyOperatorsy = shibboleth.oidfed.StandardMetadataPolicyOperators
-idp.oidfed.resolve-entity.MetadataPolicMergingyStrategy = MetadataPolicMergingyStrategy
-idp.oidfed.resolve-entity.LocalMetadataPolicyStrategy = DefaultLocalMetadataPolicyStrategy
-idp.oidfed.resolve-entity.TrustChainMetadataCache = shibboleth.oidfed.TrustChainMetadataCache
-idp.oidfed.resolve-entity.TrustMarkStatusMetadataCache = shibboleth.oidfed.TrustMarkStatusMetadataCache
-idp.oidfed.entity.sigalg = RS256
-
# register-beans
idp.service.logging.oidfeddynreg = OIDFED.Registration
idp.oidc.requestParser.FederationRegisterRequest =
@@ -79,3 +68,16 @@ idp.oidfed.authorize.TrustChainMetadataCache = shibboleth.oidfed.TrustChainMetad
idp.oidfed.authorize.TrustMarkStatusMetadataCache = shibboleth.oidfed.TrustMarkStatusMetadataCache
idp.oidfed.authorize.MetadataPolicyEnforcer = DefaultMetadataPolicyEnforcer
+# resolve-entity-beans, TODO: move these to oidfed-common once the feature is moved there
+#idp.service.logging.oidfedresolve = OIDFED.ResolveEntity
+#idp.oidfed.requestParser.ResolveEntityRequest =
+#idp.oidfed.cache.resolveEntity.minRefreshDelay = PT1S
+#idp.oidfed.cache.resolveEntity.maxRefreshDelay = PT30S
+#idp.oidfed.resolve-entity.LocalTrustAnchorsMetadataCache = shibboleth.oidfed.LocalTrustAnchorsMetadataCache
+#idp.oidfed.resolve-entity.MetadataPolicyOperatorsy = shibboleth.oidfed.StandardMetadataPolicyOperators
+#idp.oidfed.resolve-entity.MetadataPolicMergingyStrategy = MetadataPolicMergingyStrategy
+#idp.oidfed.resolve-entity.LocalMetadataPolicyStrategy = DefaultLocalMetadataPolicyStrategy
+#idp.oidfed.resolve-entity.TrustChainMetadataCache = shibboleth.oidfed.TrustChainMetadataCache
+#idp.oidfed.resolve-entity.TrustMarkStatusMetadataCache = shibboleth.oidfed.TrustMarkStatusMetadataCache
+#idp.oidfed.entity.sigalg = RS256
+#idp.oidfed.resolve-entity.automaticRegistrationCondition = shibboleth.Conditions.TRUE
diff --git a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-op.properties b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-op.properties
index eeb9e5f..4134c60 100644
--- a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-op.properties
+++ b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-op.properties
@@ -1,9 +1,13 @@
-idp.oidfed.authorize.automaticRegistrationCondition = shibboleth.Conditions.TRUE
-idp.oidfed.token.automaticRegistrationCondition = shibboleth.Conditions.TRUE
-idp.oidfed.par.automaticRegistrationCondition = shibboleth.Conditions.TRUE
-idp.oidfed.userinfo.automaticRegistrationCondition = shibboleth.Conditions.TRUE
+idp.oidfed.op.automaticRegistration.activationCondition.authorize = shibboleth.Conditions.TRUE
+idp.oidfed.op.automaticRegistration.activationCondition.token = shibboleth.Conditions.TRUE
+idp.oidfed.op.automaticRegistration.activationCondition.par = shibboleth.Conditions.TRUE
+idp.oidfed.op.automaticRegistration.activationCondition.userinfo = shibboleth.Conditions.TRUE
idp.oidfed.op.metadata.values = CustomEntityConfigurationValues
idp.oidfed.configuration.MetadataSkaletonFile = src/test/resources/net/shibboleth/idp/module/conf/oidfed-entity-configuration-metadata.json
-idp.oidfed.trustchain.resolver.useResolverApiCondition = HeaderUseResolveApiCondition
-idp.oidfed.trustchain.resolver.fallbackToLocalCondition = HeaderFallbackToLocalCondition
\ No newline at end of file
+
+idp.oidfed.op.automaticRegistration.trustchain.resolver.useResolverApiCondition = HeaderUseResolveApiCondition
+idp.oidfed.op.automaticRegistration.trustchain.resolver.fallbackToLocalCondition = HeaderFallbackToLocalCondition
+
+idp.oidfed.op.explicitRegistration.trustchain.resolver.useResolverApiCondition = HeaderUseResolveApiCondition
+idp.oidfed.op.explicitRegistration.trustchain.resolver.fallbackToLocalCondition = HeaderFallbackToLocalCondition
\ No newline at end of file
diff --git a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-trustchain-resolver.xml b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-trustchain-resolver.xml
index 7840bec..17a323c 100644
--- a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-trustchain-resolver.xml
+++ b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-trustchain-resolver.xml
@@ -12,10 +12,10 @@
<bean id="shibboleth.oidfed.DefaultTrustedRemoteResolverEntitiesLookupStrategy" parent="shibboleth.Functions.Constant">
<constructor-arg name="target">
<util:list value-type="net.shibboleth.oidfed.profile.TrustedRemoteResolverEntity">
- <bean class="net.shibboleth.oidfed.profile.TrustedRemoteResolverEntity"
+ <bean parent="shibboleth.oidfed.TrustedRemoteResolverEntity"
c:entity="https://trust-anchor.federation.local"
c:anchors="https://notworking.local,https://neither.another.local" />
- <bean class="net.shibboleth.oidfed.profile.TrustedRemoteResolverEntity"
+ <bean parent="shibboleth.oidfed.TrustedRemoteResolverEntity"
c:entity="https://trust-anchor.federation.local"
c:anchors="https://trust-anchor.federation.local" />
</util:list>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list