[java-plugin-shibd-saml] branch main updated: Split off profile counters between front and back half, fix ECP counter.
Codeberg
noreply at shibboleth.net
Tue Oct 20 14:52:22 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-saml.
View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-saml/commit/96806fe60ae7b613723859b4a3c0dc8ee22ae0e5
The following commit(s) were added to refs/heads/main by this push:
new 96806fe Split off profile counters between front and back half, fix ECP counter.
96806fe is described below
commit 96806fe60ae7b613723859b4a3c0dc8ee22ae0e5
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Tue Oct 20 10:52:10 2026 -0400
Split off profile counters between front and back half, fix ECP counter.
---
.../net/shibboleth/idp/flows/sp/consumer/saml2/ecp/ecp-beans.xml | 3 +++
.../net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml | 2 +-
.../net/shibboleth/idp/flows/sp/initiator/ecp/ecp-beans.xml | 2 +-
.../net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml | 2 +-
.../shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-beans.xml | 2 +-
.../shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-beans.xml | 2 +-
.../saml2/profile/config/impl/BrowserSSOProfileConfiguration.java | 7 +++++--
.../sp/saml/saml2/profile/config/impl/ECPProfileConfiguration.java | 5 ++++-
.../profile/config/impl/SingleLogoutProfileConfiguration.java | 5 ++++-
9 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/ecp/ecp-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/ecp/ecp-beans.xml
index c5f4631..d8e125f 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/ecp/ecp-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/ecp/ecp-beans.xml
@@ -12,6 +12,9 @@
<bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.token-consumer.ecp:TokenConsumer.ECP}" />
+ <util:constant id="shibboleth.metrics.ProfileCounter"
+ static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.ECPProfileConfiguration.CONSUMER_PROFILE_COUNTER" />
+
<bean id="shibboleth.HttpServletRequestValidator" class="net.shibboleth.shared.servlet.impl.NoOpHttpServletRequestValidator" />
<bean id="DecodeMessage" class="net.shibboleth.sp.profile.impl.DecodeMessage" scope="prototype"
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml
index 7f957c6..9fc0a7b 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml
@@ -16,7 +16,7 @@
<bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.token-consumer:TokenConsumer.SAML2}" />
<util:constant id="shibboleth.metrics.ProfileCounter"
- static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.BrowserSSOProfileConfiguration.PROFILE_COUNTER" />
+ static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.BrowserSSOProfileConfiguration.CONSUMER_PROFILE_COUNTER" />
<bean id="RecoverStateData"
class="net.shibboleth.sp.profile.impl.RecoverStateData" scope="prototype"
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/ecp/ecp-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/ecp/ecp-beans.xml
index 32e4507..d60407c 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/ecp/ecp-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/ecp/ecp-beans.xml
@@ -13,7 +13,7 @@
<bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.session-initiator.ecp:SessionInitiator.ECP}" />
<util:constant id="shibboleth.metrics.ProfileCounter"
- static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.ECPProfileConfiguration.PROFILE_COUNTER" />
+ static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.ECPProfileConfiguration.INITIATOR_PROFILE_COUNTER" />
<import resource="classpath:/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml
index 36c9311..9bebf55 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml
@@ -13,7 +13,7 @@
<bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.session-initiator:SessionInitiator.SAML2}" />
<util:constant id="shibboleth.metrics.ProfileCounter"
- static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.BrowserSSOProfileConfiguration.PROFILE_COUNTER" />
+ static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.BrowserSSOProfileConfiguration.INITIATOR_PROFILE_COUNTER" />
<import resource="classpath:/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-beans.xml
index 31ad5f3..e994ce7 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-beans.xml
@@ -13,7 +13,7 @@
<bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.logout-consumer:LogoutConsumer.SAML2}" />
<util:constant id="shibboleth.metrics.ProfileCounter"
- static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.SingleLogoutProfileConfiguration.PROFILE_COUNTER" />
+ static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.SingleLogoutProfileConfiguration.CONSUMER_PROFILE_COUNTER" />
<util:constant id="shibboleth.EndpointType"
static-field="org.opensaml.saml.saml2.metadata.SingleLogoutService.DEFAULT_ELEMENT_NAME" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-beans.xml
index 2208f26..14f3028 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-beans.xml
@@ -13,7 +13,7 @@
<bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.logout-initiator:LogoutInitiator.SAML2}" />
<util:constant id="shibboleth.metrics.ProfileCounter"
- static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.SingleLogoutProfileConfiguration.PROFILE_COUNTER" />
+ static-field="net.shibboleth.sp.saml.saml2.profile.config.impl.SingleLogoutProfileConfiguration.INITIATOR_PROFILE_COUNTER" />
<import resource="classpath:/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml" />
diff --git a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/BrowserSSOProfileConfiguration.java b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/BrowserSSOProfileConfiguration.java
index 8ec65be..88848fa 100644
--- a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/BrowserSSOProfileConfiguration.java
+++ b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/BrowserSSOProfileConfiguration.java
@@ -51,8 +51,11 @@ public class BrowserSSOProfileConfiguration extends AbstractSAML2AssertionConsum
implements SAMLArtifactConsumerProfileConfiguration,
net.shibboleth.sp.saml.saml2.profile.config.BrowserSSOProfileConfiguration {
- /** Name of profile counter. */
- @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.sso.browser";
+ /** Name of initiator profile counter. */
+ @Nonnull @NotEmpty public static final String INITIATOR_PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.sso.browser.initiator";
+
+ /** Name of consumer profile counter. */
+ @Nonnull @NotEmpty public static final String CONSUMER_PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.sso.browser";
/** Whether attributes should be resolved in the course of the profile. */
@Nonnull private Predicate<ProfileRequestContext> resolveAttributesPredicate;
diff --git a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/ECPProfileConfiguration.java b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/ECPProfileConfiguration.java
index f06cda0..3705099 100644
--- a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/ECPProfileConfiguration.java
+++ b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/ECPProfileConfiguration.java
@@ -33,7 +33,10 @@ public class ECPProfileConfiguration extends BrowserSSOProfileConfiguration
implements net.shibboleth.sp.saml.saml2.profile.config.ECPProfileConfiguration {
/** Name of profile counter. */
- @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.sso.ecp";
+ @Nonnull @NotEmpty public static final String INITIATOR_PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.sso.ecp.initiator";
+
+ /** Name of profile counter. */
+ @Nonnull @NotEmpty public static final String CONSUMER_PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.sso.ecp";
/** Lookup function to supply provider name. */
@Nonnull private Function<ProfileRequestContext,String> providerNameLookupStrategy;
diff --git a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/SingleLogoutProfileConfiguration.java b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/SingleLogoutProfileConfiguration.java
index 7621708..ca1ad0d 100644
--- a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/SingleLogoutProfileConfiguration.java
+++ b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/SingleLogoutProfileConfiguration.java
@@ -44,7 +44,10 @@ public class SingleLogoutProfileConfiguration extends AbstractSAML2ArtifactConsu
implements net.shibboleth.sp.saml.saml2.profile.config.SingleLogoutProfileConfiguration {
/** Name of profile counter. */
- @Nonnull @NotEmpty public static final String PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.logout";
+ @Nonnull @NotEmpty public static final String INITIATOR_PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.logout.initiator";
+
+ /** Name of profile counter. */
+ @Nonnull @NotEmpty public static final String CONSUMER_PROFILE_COUNTER = "net.shibboleth.sp.profiles.saml2.logout";
/** Predicate used to determine if SOAP-based requests should be signed. */
@Nonnull private Predicate<MessageContext> signSOAPRequestsPredicate;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list