[java-plugin-shibd] branch main updated: Relocate SAML-specific auditing out of plugin.
Codeberg
noreply at shibboleth.net
Thu Jun 25 17:54:14 UTC 2026
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/95b4ed69ae38e47caa82f83b2565ae90791fc80c
The following commit(s) were added to refs/heads/main by this push:
new 95b4ed6 Relocate SAML-specific auditing out of plugin.
95b4ed6 is described below
commit 95b4ed69ae38e47caa82f83b2565ae90791fc80c
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Thu Jun 25 13:53:56 2026 -0400
Relocate SAML-specific auditing out of plugin.
---
sp-conf-impl/pom.xml | 7 +
.../META-INF/net.shibboleth.idp/postconfig.xml | 272 ---------------------
2 files changed, 7 insertions(+), 272 deletions(-)
diff --git a/sp-conf-impl/pom.xml b/sp-conf-impl/pom.xml
index 51608e6..dbd07e9 100644
--- a/sp-conf-impl/pom.xml
+++ b/sp-conf-impl/pom.xml
@@ -40,6 +40,13 @@
<scope>provided</scope>
</dependency>
+ <!-- For questionably located audit constants in the SAML API. -->
+ <dependency>
+ <groupId>${idp.groupId}</groupId>
+ <artifactId>idp-saml-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Supports Eclipse class lookup from within Spring files. -->
<dependency>
<groupId>${shib-profile.groupId}</groupId>
diff --git a/sp-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/sp-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 0aaf893..994e4f0 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -144,278 +144,6 @@
</property>
</bean>
- <bean id="shibboleth.sp.DefaultInboundResponseAuditExtractors" lazy-init="true"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.PROTOCOL"/>
- </key>
- <ref bean="shibboleth.ProtocolLookupFunction" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.RESPONSE_BINDING"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLBindingContextBindingFunction"
- p:useShortName="%{idp.audit.shortenBindings:false}" />
- </constructor-arg>
- <constructor-arg name="f">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.ChildLookup.SAMLBindingContext"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.RELAY_STATE"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean parent="shibboleth.Functions.Expression"
- c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).getRelayState(#input) : null" />
- </constructor-arg>
- <constructor-arg name="f" ref="shibboleth.MessageContextLookup.Inbound"/>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SIGNING"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="net.shibboleth.shared.logic.FunctionSupport" factory-method="forPredicate">
- <constructor-arg>
- <bean class="net.shibboleth.shared.spring.expression.SpringExpressionPredicate"
- c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).isMessageSigned(#input) : false" />
- </constructor-arg>
- </bean>
- </constructor-arg>
- <constructor-arg name="f" ref="shibboleth.MessageContextLookup.Inbound"/>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.RESPONSE_ID"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLMessageInfoContextIDFunction" />
- </constructor-arg>
- <constructor-arg name="f">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.ChildLookupOrCreate.SAMLMessageInfoContext"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.RESPONSE_ISSUE_INSTANT"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLMessageInfoContextIssueInstantFunction" />
- </constructor-arg>
- <constructor-arg name="f">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.ChildLookupOrCreate.SAMLMessageInfoContext"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.IN_RESPONSE_TO"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.InResponseToAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.STATUS_CODE"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.StatusCodeAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SUBSTATUS_CODE"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.SubStatusCodeAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.STATUS_MESSAGE"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.StatusMessageAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.NAMEID_FORMAT"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.NameIDFormatAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SP_NAME_QUALIFIER"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.SPNameQualifierAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean id="shibboleth.sp.DefaultInboundRequestAuditExtractors" lazy-init="true"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.PROTOCOL"/>
- </key>
- <ref bean="shibboleth.ProtocolLookupFunction" />
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_BINDING"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLBindingContextBindingFunction"
- p:useShortName="%{idp.audit.shortenBindings:false}" />
- </constructor-arg>
- <constructor-arg name="f">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.ChildLookup.SAMLBindingContext"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.RELAY_STATE"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean parent="shibboleth.Functions.Expression"
- c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).getRelayState(#input) : null" />
- </constructor-arg>
- <constructor-arg name="f" ref="shibboleth.MessageContextLookup.Inbound"/>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SIGNING"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="net.shibboleth.shared.logic.FunctionSupport" factory-method="forPredicate">
- <constructor-arg>
- <bean class="net.shibboleth.shared.spring.expression.SpringExpressionPredicate"
- c:_0="#input != null ? T(org.opensaml.saml.common.binding.SAMLBindingSupport).isMessageSigned(#input) : false" />
- </constructor-arg>
- </bean>
- </constructor-arg>
- <constructor-arg name="f" ref="shibboleth.MessageContextLookup.Inbound"/>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_ID"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLMessageInfoContextIDFunction" />
- </constructor-arg>
- <constructor-arg name="f">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.ChildLookupOrCreate.SAMLMessageInfoContext"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_ISSUE_INSTANT"/>
- </key>
- <bean parent="shibboleth.Functions.Compose">
- <constructor-arg name="g">
- <bean class="org.opensaml.saml.common.messaging.context.navigate.SAMLMessageInfoContextIssueInstantFunction" />
- </constructor-arg>
- <constructor-arg name="f">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.ChildLookupOrCreate.SAMLMessageInfoContext"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.NAMEID_FORMAT"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.NameIDFormatAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- <entry>
- <key>
- <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.SP_NAME_QUALIFIER"/>
- </key>
- <bean class="net.shibboleth.idp.saml.audit.impl.SPNameQualifierAuditExtractor">
- <constructor-arg>
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.MessageLookup.SAMLObject"
- c:f-ref="shibboleth.MessageContextLookup.Inbound" />
- </constructor-arg>
- </bean>
- </entry>
- </map>
- </property>
- </bean>
-
<bean id="shibboleth.sp.DefaultPostLookupAuditExtractors" lazy-init="true"
class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list