[java-idp-plugin-oidc-op-oidfed] branch main updated: Restucture the configuration properties for tests.

[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/cfbb876f5336b569a486240718ffed06d2d916fb

The following commit(s) were added to refs/heads/main by this push:
     new cfbb876  Restucture the configuration properties for tests.
cfbb876 is described below

commit cfbb876f5336b569a486240718ffed06d2d916fb
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Aug 27 16:07:41 2026 +0300

    Restucture the configuration properties for tests.
    
    - Inherit the generic properties (oidfed/oidfed.properties) from oidfed-common tests
    - Move OP-specific oidfed-properties into oidfed/oidfed-op.properties
---
 .../resources/net/shibboleth/idp/module/conf/idp.properties |  3 ++-
 .../net/shibboleth/idp/module/conf/oidc.properties          |  9 ---------
 .../shibboleth/idp/module/conf/oidfed/oidfed-op.properties  |  8 ++++++++
 .../net/shibboleth/idp/module/conf/oidfed/oidfed.properties | 13 -------------
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/idp.properties b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
index 07392d5..d6a839b 100644
--- a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
+++ b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
@@ -11,7 +11,8 @@ idp.additionalProperties = /conf/ldap.properties, \
     /conf/authn/duo.properties, \
     /conf/oidc.properties, \
     /credentials/secrets.properties, \
-    /conf/oidfed/oidfed.properties
+    /conf/oidfed/oidfed.properties, \
+    /conf/oidfed/oidfed-op.properties
 
 # In most cases (and unless noted in the surrounding comments) the
 # commented settings in the distributed files are the default
diff --git a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
index 1ac53f3..2f52bfb 100644
--- a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
+++ b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
@@ -33,12 +33,3 @@ idp.authn.Password.supportedPrincipals = \
     oidc/password
 
 idp.authn.OAuth2Client.audit.format = %a|%T|%SP|%I|%s|%AF|%CV|%u|%tu|%AR|%UA|%iss|%sub|%exp|%iat|%typ
-
-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.configuration.resolver.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
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
new file mode 100644
index 0000000..2c74f4e
--- /dev/null
+++ b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed-op.properties
@@ -0,0 +1,8 @@
+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.configuration.resolver.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
diff --git a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties b/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties
deleted file mode 100644
index 9eb3c72..0000000
--- a/idp-oidfed-op-impl/src/test/resources/net/shibboleth/idp/module/conf/oidfed/oidfed.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-idp.oidfed.entityID = https://op.example.org
-idp.oidfed.entity.authorityHints = https://anchor1.example.org, https://anchor2.example.org
-
-idp.oidfed.cache.entityConfiguration.invalidContainerLifetime = PT0S
-idp.oidfed.cache.entityConfiguration.minRefreshDelay = PT0S
-idp.oidfed.cache.signedKeyset.invalidContainerLifetime = PT0S
-idp.oidfed.cache.signedKeyset.minRefreshDelay = PT0S
-
-idp.oidfed.cache.default.critClaims = default_crit
-idp.oidfed.cache.entityConfiguration.customFilterStrategies = CustomEntityConfigurationFilters
-idp.oidfed.cache.subordinateStatement.customFilterStrategies = CustomSubordinateStatementFilters
-idp.oidfed.cache.subordinateStatement.critClaims = subordinate_crit
-idp.oidfed.cache.trustChain.customFilterStrategies = CustomTrustChainFilters

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