[java-plugin-shibd] branch main updated: JSHIBD-26 - Review incrementing of profile metric in various flows

[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.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd/commit/52ab9b42f2c880eb37c387dee4a42fb9e826dd8e

The following commit(s) were added to refs/heads/main by this push:
     new 52ab9b4  JSHIBD-26 - Review incrementing of profile metric in various flows
52ab9b4 is described below

commit 52ab9b42f2c880eb37c387dee4a42fb9e826dd8e
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Wed Oct 14 14:00:58 2026 -0400

    JSHIBD-26 - Review incrementing of profile metric in various flows
    
    https://shibboleth.atlassian.net/browse/JSHIBD-26
    
    Add counter to disco flow.
    Add missing events from abstract flows.
---
 .../net/shibboleth/idp/flows/sp/initiator/disco/disco-beans.xml     | 2 ++
 .../net/shibboleth/idp/flows/sp/initiator/disco/disco-flow.xml      | 4 ++++
 .../net/shibboleth/idp/flows/sp/initiator/initiator-flow.xml        | 2 ++
 .../net/shibboleth/idp/flows/sp/logout/initiator/initiator-flow.xml | 6 ++++++
 4 files changed, 14 insertions(+)

diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-beans.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-beans.xml
index d526eb5..48acae7 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-beans.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-beans.xml
@@ -9,6 +9,8 @@
 
     <bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.session-initiator:SessionInitiator.Discovery}" />
 
+    <bean id="shibboleth.metrics.ProfileCounter" class="java.lang.String" c:_0="net.shibboleth.sp.profiles.session-initiator.discovery" />
+
     <bean id="ValidateSessionInitiatorRequest"
         class="net.shibboleth.sp.profile.impl.ValidateSessionInitiatorRequest" scope="prototype"
         p:flowId="discovery"
diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-flow.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-flow.xml
index b857c4b..cc19858 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-flow.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/disco/disco-flow.xml
@@ -4,6 +4,10 @@
     parent="sp/initiator">
 
     <action-state id="DiscoverySessionInitiator">
+        <on-entry>
+            <evaluate expression="T(org.opensaml.core.metrics.MetricsSupport).getMetricRegistry()?.counter(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.ProfileCounter')).inc()" />
+        </on-entry>
+
         <evaluate expression="ValidateSessionInitiatorRequest" />
         <evaluate expression="PrepareDiscoveryStateDataContext" />
         <evaluate expression="PreserveStateData" />
diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/initiator-flow.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/initiator-flow.xml
index 0725fe4..ca70fc6 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/initiator-flow.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/initiator-flow.xml
@@ -16,6 +16,7 @@
     </end-state>
 
     <!-- Error events to reflect back from this subflow. -->
+    <end-state id="EndpointResolutionFailed" />
     <end-state id="InvalidEvent" />
     <end-state id="InvalidMessage" />
     <end-state id="InvalidMessageContext" />
@@ -37,6 +38,7 @@
 
     <global-transitions>
         <transition on-exception="java.lang.RuntimeException" to="LogRuntimeException" />
+        <transition on="EndpointResolutionFailed" to="EndpointResolutionFailed" />
         <transition on="InvalidMessage" to="InvalidMessage" />
         <transition on="InvalidMessageContext" to="InvalidMessageContext" />
         <transition on="InvalidProfileConfiguration" to="InvalidProfileConfiguration" />
diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/initiator-flow.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/initiator-flow.xml
index 18e0f0e..973d347 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/initiator-flow.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/initiator-flow.xml
@@ -16,7 +16,10 @@
     </end-state>
 
     <!-- Error events to reflect back from this subflow. -->
+    <end-state id="EndpointResolutionFailed" />
     <end-state id="InvalidEvent" />
+    <end-state id="InvalidMessage" />
+    <end-state id="InvalidMessageContext" />
     <end-state id="InvalidProfileConfiguration" />
     <end-state id="InvalidProfileContext" />
     <end-state id="InvalidRelyingPartyContext" />
@@ -35,6 +38,9 @@
 
     <global-transitions>
         <transition on-exception="java.lang.RuntimeException" to="LogRuntimeException" />
+        <transition on="EndpointResolutionFailed" to="EndpointResolutionFailed" />
+        <transition on="InvalidMessage" to="InvalidMessage" />
+        <transition on="InvalidMessageContext" to="InvalidMessageContext" />
         <transition on="InvalidProfileConfiguration" to="InvalidProfileConfiguration" />
         <transition on="InvalidProfileContext" to="InvalidProfileContext" />
         <transition on="InvalidRelyingPartyContext" to="InvalidRelyingPartyContext" />

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