[java-plugin-shibd] branch main updated: Need to find another way to stub out default property value.
Codeberg
noreply at shibboleth.net
Thu Nov 20 23:36:30 UTC 2025
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-plugin-shibd.
View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd/commit/98bb9d99b406a4816612b58216aed1cd70127b31
The following commit(s) were added to refs/heads/main by this push:
new 98bb9d9 Need to find another way to stub out default property value.
98bb9d9 is described below
commit 98bb9d99b406a4816612b58216aed1cd70127b31
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 20 18:36:19 2025 -0500
Need to find another way to stub out default property value.
---
.../idp/flows/sp/storage/storage-beans.xml | 2 +-
.../shibboleth/idp/module/conf/sp/sp.properties | 138 ---------------------
2 files changed, 1 insertion(+), 139 deletions(-)
diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/storage/storage-beans.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/storage/storage-beans.xml
index 507a744..df35b1c 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/storage/storage-beans.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/storage/storage-beans.xml
@@ -13,6 +13,6 @@
<bean id="DoStorageOperation"
class="net.shibboleth.sp.profile.impl.DoStorageOperation" scope="prototype"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
- p:storageService-ref="#{'%{sp.storageService}'.trim()}" />
+ p:storageService-ref="#{'%{sp.storageService:shibboleth.StorageService}'.trim()}" />
</beans>
diff --git a/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/sp.properties b/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/sp.properties
deleted file mode 100644
index 1cc0b6e..0000000
--- a/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/sp.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default issuer/entityID/client_id/etc.
-sp.issuer = https://sp.example.org
-
-# Default authentication authority (IdP, OP, etc.) to use if any
-#sp.defaultAuthority = https://idp.example.org
-
-# Controls configuration of service to resolve SP agents and applications
-# Uncomment and define to override service resources
-#sp.service.agents.resources = shibboleth.sp.AgentResolverResources
-#sp.service.agents.failFast = false
-sp.service.agents.checkInterval = PT5M
-
-# Set to StorageService to use for remoted storage data if in use.
-sp.storageService = shibboleth.StorageService
-# Set to DataSealer to use for remoted data encryption.
-#sp.dataSealer = shibboleth.DataSealer
-
-# Default precedence/set of Session Initiator and Token Consumer flows to attempt
-#sp.application.sessionInitiators =
-#sp.application.tokenConsumers =
-
-# General SP cookie properties
-#sp.cookie.secure = true
-#sp.cookie.httpOnly = true
-#sp.cookie.domain =
-#sp.cookie.path = /
-#sp.cookie.maxAge = -1
-#sp.cookie.sameSite = None
-#sp.cookie.sameSiteCondition = shibboleth.Conditions.TRUE
-# Controls how many cookies for a given use case are allowed before purging
-#sp.cookie.limit = 10
-
-# Default state token management (SAML RelayState, etc.)
-#sp.stateToken.errorsFatal = false
-# Set to shibboleth.sp.CookieStateTokenManager to switch to cookie-based mechanism
-#sp.stateToken.Manager = shibboleth.sp.StorageStateTokenManager
-# Controls storage back-end for storage-based state tokens
-#sp.stateToken.StorageService = shibboleth.StorageService
-# Cookie prefix when using cookie-backed state
-#sp.stateToken.cookiePrefix = _Host-shibsp_state_
-
-# Request/response correlation control
-#sp.correlation.cookiePrefix = __Host-_shibsp_req_
-
-# POST data preservation controls
-#sp.postData.preservation = false
-#sp.postData.limit = 1048576
-#sp.postData.lifetime = PT5M
-#sp.postData.cookiePrefix = __Host-_shibsp_post_
-#sp.postData.StorageService = shibboleth.StorageService
-#sp.postData.errorsFatal = false
-
-# Uncomment/set to define a default IdP discovery service URL or Function
-#sp.discoveryURL =
-#sp.discoveryURLFunction =
-
-
-###############################
-# Agent Authentication Settings
-###############################
-
-# Default agent IP address filter
-#sp.agent.authn.allowedAddressRanges = 127.0.0.1/32, ::1/128
-# Set to basic for shared secret authentication
-#sp.agent.authn.method =
-# Set false to globally disable cookie-based authentication by agents
-#sp.agent.authn.cached = true
-#sp.agent.authn.cacheDuration = PT1H
-
-
-# Properties exist for optional "enterprise" agent secret validation. Most of them
-# are for LDAP, replicating the large range of properties available in the IdP "proper"
-# but kept separate for flexibility. They are "chained" to the IdP properties in most
-# cases for convenience but can be overridden if necessary.
-
-#sp.agent.authn.JAAS.loginConfigNames = ShibSPAgentAuth
-#sp.agent.authn.JAAS.loginConfig = %{idp.home}/conf/sp/jaas.config
-
-#sp.agent.authn.Krb5.servicePrincipal =
-#sp.agent.authn.Krb5.keytab =
-
-## Authenticator strategy,
-# either anonSearchAuthenticator, bindSearchAuthenticator, directAuthenticator, adAuthenticator
-#sp.agent.authn.LDAP.authenticator = %{idp.authn.LDAP.authenticator:anonSearchAuthenticator}
-
-## Connection properties ##
-#sp.agent.authn.LDAP.ldapURL = %{idp.authn.LDAP.ldapURL:ldap://localhost:10389}
-#sp.agent.authn.LDAP.useStartTLS = %{idp.authn.LDAP.useStartTLS:true}
-# Time to wait for startTLS responses
-#sp.agent.authn.LDAP.startTLSTimeout = %{idp.authn.LDAP.startTLSTimeout:PT3S}
-# Time to wait for connections to open
-#sp.agent.authn.LDAP.connectTimeout = %{idp.authn.LDAP.connectTimeout:PT3S}
-# Time to wait for operation responses (e.g. search, bind)
-#sp.agent.authn.LDAP.responseTimeout = %{idp.authn.LDAP.responseTimeout:PT3S}
-# Connection strategy to use when multiple URLs are supplied, either ACTIVE_PASSIVE, ROUND_ROBIN, RANDOM
-#sp.agent.authn.LDAP.connectionStrategy = %{idp.authn.LDAP.connectionStrategy:ACTIVE_PASSIVE}
-
-## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust
-#sp.agent.authn.LDAP.sslConfig = %{idp.authn.LDAP.sslConfig:certificateTrust}
-## If using certificateTrust above, set to the trusted certificate's path
-#sp.agent.authn.LDAP.trustCertificates = %{idp.authn.LDAP.trustCertificates:%{idp.home}/credentials/ldap-server.crt}
-## If using keyStoreTrust above, set to the truststore path
-#sp.agent.authn.LDAP.trustStore = %{idp.authn.LDAP.trustStore:%{idp.home}/credentials/ldap-server.truststore}
-
-## Return attributes during authentication
-# Setting this property will cause entry resolution to occur as part of authentication
-# Note that this property is not compatible with the adAuthenticator
-#sp.agent.authn.LDAP.returnAttributes = %{idp.authn.LDAP.returnAttributes:1.1}
-
-## DN resolution properties ##
-
-# Search DN resolution, used by anonSearchAuthenticator, bindSearchAuthenticator
-# for AD: CN=Users,DC=example,DC=org
-#sp.agent.authn.LDAP.baseDN = %{idp.authn.LDAP.baseDN:ou=people,dc=example,dc=org}
-#sp.agent.authn.LDAP.subtreeSearch = %{idp.authn.LDAP.subtreeSearch:false}
-#sp.agent.authn.LDAP.userFilter = %{idp.authn.LDAP.userFilter:undefined}
-# bind search configuration
-# for AD: sp.agent.authn.LDAP.bindDN=adminuser at domain.com
-#sp.agent.authn.LDAP.bindDN = %{idp.authn.LDAP.bindDN:uid=myservice,ou=system}
-
-# Format DN resolution, used by directAuthenticator, adAuthenticator
-# for AD use sp.agent.authn.LDAP.dnFormat=%s at domain.com
-#sp.agent.authn.LDAP.dnFormat = %{idp.authn.LDAP.dnFormat:uid=%s,ou=people,dc=example,dc=org}
-
-# pool passivator, either none, bind or anonymousBind
-#sp.agent.authn.LDAP.bindPoolPassivator = %{idp.authn.LDAP.bindPoolPassivator:none}
-
-# LDAP pool configuration, used for both authn and DN resolution
-#sp.agent.authn.pool.LDAP.minSize = %{idp.authn.pool.LDAP.minSize:3}
-#sp.agent.authn.pool.LDAP.maxSize = %{idp.authn.pool.LDAP.maxSize:10}
-#sp.agent.authn.pool.LDAP.validateOnCheckout = %{idp.authn.pool.LDAP.validateOnCheckout:false}
-#sp.agent.authn.pool.LDAP.validatePeriodically = %{idp.authn.pool.LDAP.validatePeriodically:true}
-#sp.agent.authn.pool.LDAP.validatePeriod = %{idp.authn.pool.LDAP.validatePeriod:PT5M}
-#sp.agent.authn.pool.LDAP.validateDN = %{idp.authn.pool.LDAP.validateDN:}
-#sp.agent.authn.pool.LDAP.validateFilter = %{idp.authn.pool.LDAP.validateFilter:(objectClass=*)}
-#sp.agent.authn.pool.LDAP.prunePeriod = %{idp.authn.pool.LDAP.prunePeriod:PT5M}
-#sp.agent.authn.pool.LDAP.idleTime = %{idp.authn.pool.LDAP.idleTime:PT10M}
-#sp.agent.authn.pool.LDAP.blockWaitTime = %{idp.authn.pool.LDAP.blockWaitTime:PT3S}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list