[java-plugin-shibd-saml] branch main updated: Wire in additional audit extractions.

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-plugin-shibd-saml.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-saml/commit/690ee66e59b024d3e5f0211940e403e7795e6507

The following commit(s) were added to refs/heads/main by this push:
     new 690ee66  Wire in additional audit extractions.
690ee66 is described below

commit 690ee66e59b024d3e5f0211940e403e7795e6507
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Thu Jun 25 11:02:27 2026 -0400

    Wire in additional audit extractions.
---
 .../idp/flows/sp/consumer/saml2/saml2-flow.xml     |  4 +--
 .../flows/sp/logout/consumer/saml2/saml2-flow.xml  |  7 +++--
 .../shibboleth/idp/flows/sp/saml2-common-beans.xml | 33 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml
index fc320f9..5d92e02 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml
@@ -6,7 +6,7 @@
     <action-state id="DoProfileWork">
         <evaluate expression="ValidateHttpServletRequest" />
         <evaluate expression="DecodeMessage" />
-<!--        <evaluate expression="PostDecodePopulateAuditContext" />-->
+        <evaluate expression="InboundResponsePopulateAuditContext" />
 
         <evaluate expression="RecoverStateData" />
         
@@ -19,7 +19,7 @@
 
         <evaluate expression="InitializeRelyingPartyContextFromSAMLPeer" />
         <evaluate expression="SelectRelyingPartyConfiguration" />
-<!--        <evaluate expression="PostLookupPopulateAuditContext" />-->
+        <evaluate expression="PostLookupPopulateAuditContext" />
         <evaluate expression="SelectProfileConfiguration" />
 
         <evaluate expression="PopulateSignatureValidationParameters" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-flow.xml
index 24dfc46..05ce5ac 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-flow.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-flow.xml
@@ -13,7 +13,10 @@
     <action-state id="DoMessage">
         <evaluate expression="ValidateHttpServletRequest" />
         <evaluate expression="DecodeMessage" />
-<!--        <evaluate expression="PostDecodePopulateAuditContext" />-->
+        
+        <!-- One of these runs based on message type. -->
+        <evaluate expression="InboundRequestPopulateAuditContext" />
+        <evaluate expression="InboundResponsePopulateAuditContext" />
 
         <!-- Only runs for LogoutResponse messages but early enough to head off errors. -->
         <evaluate expression="CreateServletResponseForLogoutResponse" />
@@ -27,7 +30,7 @@
 
         <evaluate expression="InitializeRelyingPartyContextFromSAMLPeer" />
         <evaluate expression="SelectRelyingPartyConfiguration" />
-<!--        <evaluate expression="PostLookupPopulateAuditContext" />-->
+        <evaluate expression="PostLookupPopulateAuditContext" />
         <evaluate expression="SelectProfileConfiguration" />
 
         <evaluate expression="PopulateSignatureValidationParameters" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml
index bf7d07e..acd4b1f 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml
@@ -12,6 +12,36 @@
         p:checkDuringInit="false"
         p:validator="#{getObject('shibboleth.HttpServletRequestValidator') ?: null}" />
 
+    <bean id="InboundResponsePopulateAuditContext" parent="shibboleth.sp.AbstractPopulateAuditContext"
+            p:fieldExtractors="#{getObject('shibboleth.sp.InboundResponseAuditExtractors') ?: getObject('shibboleth.sp.DefaultInboundResponseAuditExtractors')}">
+        <property name="activationCondition">
+            <bean class="net.shibboleth.shared.logic.StrategyIndirectedPredicate" factory-method="forPredicate">
+                <constructor-arg name="objectStrategy">
+                    <ref bean="shibboleth.MessageContextLookup.Inbound" />
+                </constructor-arg>
+                <constructor-arg name="pred">
+                    <bean class="net.shibboleth.sp.messaging.context.logic.MessageTypePredicate"
+                        c:_0="org.opensaml.saml.saml2.core.StatusResponseType" />
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="InboundRequestPopulateAuditContext" parent="shibboleth.sp.AbstractPopulateAuditContext"
+            p:fieldExtractors="#{getObject('shibboleth.sp.InboundRequestAuditExtractors') ?: getObject('shibboleth.sp.DefaultInboundRequestAuditExtractors')}">
+        <property name="activationCondition">
+            <bean class="net.shibboleth.shared.logic.StrategyIndirectedPredicate" factory-method="forPredicate">
+                <constructor-arg name="objectStrategy">
+                    <ref bean="shibboleth.MessageContextLookup.Inbound" />
+                </constructor-arg>
+                <constructor-arg name="pred">
+                    <bean class="net.shibboleth.sp.messaging.context.logic.MessageTypePredicate"
+                        c:_0="org.opensaml.saml.saml2.core.RequestAbstractType" />
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+
     <bean id="WebFlowInboundMessageHandlerAdaptor"
         class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype" abstract="true"
         c:executionDirection="INBOUND" />
@@ -69,6 +99,9 @@
     <bean id="SelectRelyingPartyConfiguration"
         class="net.shibboleth.sp.profile.impl.SelectRelyingPartyConfiguration" scope="prototype" />
 
+    <bean id="PostLookupPopulateAuditContext" parent="shibboleth.sp.AbstractPopulateAuditContext"
+            p:fieldExtractors="#{getObject('shibboleth.sp.PostLookupAuditExtractors') ?: getObject('shibboleth.sp.DefaultPostLookupAuditExtractors')}" />
+
     <bean id="SelectProfileConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype"
         p:profileId-ref="shiibboleth.sp.ProfileId" />

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