[java-plugin-shibd-saml] branch main updated: Fix logging/profile ID beans and adjust logging/profile in PRC in flows.
Codeberg
noreply at shibboleth.net
Mon Jun 29 18:58: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-saml.
View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-saml/commit/41707dcb6abfb5456cc3b3810bfb9e91358c770e
The following commit(s) were added to refs/heads/main by this push:
new 41707dc Fix logging/profile ID beans and adjust logging/profile in PRC in flows.
41707dc is described below
commit 41707dcb6abfb5456cc3b3810bfb9e91358c770e
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Mon Jun 29 14:58:04 2026 -0400
Fix logging/profile ID beans and adjust logging/profile in PRC in flows.
---
.../net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml | 4 +++-
.../net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml | 5 +++++
.../net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml | 4 +++-
.../net/shibboleth/idp/flows/sp/initiator/saml2/saml2-flow.xml | 5 +++++
.../shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-beans.xml | 4 +++-
.../net/shibboleth/idp/flows/sp/logout/consumer/saml2/saml2-flow.xml | 5 +++++
.../shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-beans.xml | 4 +++-
.../shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-flow.xml | 5 +++++
.../META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml | 2 +-
9 files changed, 33 insertions(+), 5 deletions(-)
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 c7273fe..55202c0 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
@@ -7,8 +7,10 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <util:constant id="shiibboleth.sp.ProfileId"
+ <util:constant id="shibboleth.sp.profileId"
static-field="net.shibboleth.saml.saml2.profile.config.BrowserSSOProfileConfiguration.PROFILE_ID" />
+
+ <bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.token-consumer:TokenConsumer.SAML2}" />
<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/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 060aabd..55c42c5 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
@@ -4,6 +4,11 @@
abstract="true" parent="sp/consumer">
<action-state id="DoProfileWork">
+ <on-entry>
+ <evaluate expression="opensamlProfileRequestContext.setProfileId(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.sp.profileId'))" />
+ <evaluate expression="opensamlProfileRequestContext.setLoggingId(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.sp.loggingId'))" />
+ </on-entry>
+
<evaluate expression="ValidateHttpServletRequest" />
<evaluate expression="DecodeMessage" />
<evaluate expression="InboundResponsePopulateAuditContext" />
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 3e73ab2..677b671 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
@@ -7,8 +7,10 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <util:constant id="shiibboleth.sp.ProfileId"
+ <util:constant id="shibboleth.sp.profileId"
static-field="net.shibboleth.saml.saml2.profile.config.BrowserSSOProfileConfiguration.PROFILE_ID" />
+
+ <bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.session-initiator:SessionInitiator.SAML2}" />
<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-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-flow.xml
index a5a0bb6..d2c93f4 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-flow.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-flow.xml
@@ -4,6 +4,10 @@
parent="sp/initiator">
<action-state id="SAML2SessionInitiator">
+ <on-entry>
+ <evaluate expression="opensamlProfileRequestContext.setProfileId(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.sp.profileId'))" />
+ </on-entry>
+
<evaluate expression="ValidateSessionInitiatorRequest" />
<evaluate expression="PrepareInboundMessageContext" />
<evaluate expression="SAMLProtocolAndRole" />
@@ -11,6 +15,7 @@
<evaluate expression="InitializeRelyingPartyContextFromSAMLPeer" />
<evaluate expression="SelectRelyingPartyConfiguration" />
+ <evaluate expression="PostLookupPopulateAuditContext" />
<evaluate expression="SelectProfileConfiguration" />
<evaluate expression="InitializeOutboundMessageContext" />
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 9ff4007..f297fb5 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
@@ -7,9 +7,11 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <util:constant id="shiibboleth.sp.ProfileId"
+ <util:constant id="shibboleth.sp.profileId"
static-field="net.shibboleth.saml.saml2.profile.config.SingleLogoutProfileConfiguration.PROFILE_ID" />
+ <bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.logout-consumer:LogoutConsumer.SAML2}" />
+
<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/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 05ce5ac..3ae61e0 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
@@ -4,6 +4,11 @@
abstract="true" parent="sp/logout/consumer">
<decision-state id="CheckForToken">
+ <on-entry>
+ <evaluate expression="opensamlProfileRequestContext.setProfileId(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.sp.profileId'))" />
+ <evaluate expression="opensamlProfileRequestContext.setLoggingId(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.sp.loggingId'))" />
+ </on-entry>
+
<if test="opensamlProfileRequestContext.ensureSubcontext(T(net.shibboleth.sp.context.AgentRequestContext)).getInput().getmember('http').isstruct()"
then="DoMessage"
else="IssueResponse" />
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 d3caea4..e044984 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
@@ -7,9 +7,11 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
- <util:constant id="shiibboleth.sp.ProfileId"
+ <util:constant id="shibboleth.sp.profileId"
static-field="net.shibboleth.saml.saml2.profile.config.SingleLogoutProfileConfiguration.PROFILE_ID" />
+ <bean id="shibboleth.sp.loggingId" class="java.lang.String" c:_0="%{sp.saml.service.logging.logout-initiator:LogoutInitiator.SAML2}" />
+
<import resource="classpath:/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml" />
<bean id="ProcessLogoutInitiatorRequest"
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-flow.xml
index 783d3d8..e1690a1 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-flow.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/initiator/saml2/saml2-flow.xml
@@ -4,6 +4,10 @@
parent="sp/logout/initiator">
<action-state id="SAML2LogoutInitiator">
+ <on-entry>
+ <evaluate expression="opensamlProfileRequestContext.setProfileId(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.sp.profileId'))" />
+ </on-entry>
+
<evaluate expression="ProcessLogoutInitiatorRequest" />
<evaluate expression="PrepareInboundMessageContext" />
<evaluate expression="SAMLProtocolAndRole" />
@@ -11,6 +15,7 @@
<evaluate expression="InitializeRelyingPartyContextFromSAMLPeer" />
<evaluate expression="SelectRelyingPartyConfiguration" />
+ <evaluate expression="PostLookupPopulateAuditContext" />
<evaluate expression="SelectProfileConfiguration" />
<evaluate expression="InitializeOutboundMessageContext" />
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 bf61204..3346c8d 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
@@ -104,7 +104,7 @@
<bean id="SelectProfileConfiguration"
class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype"
- p:profileId-ref="shiibboleth.sp.ProfileId" />
+ p:profileId-ref="shibboleth.sp.profileId" />
<bean id="OutgoingSAML2SPRequestBindingsStrategy" parent="shibboleth.Functions.Constant"
c:_0-ref="OutgoingSAML2SPRequestBindings" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list