[java-plugin-shibd-saml] branch main updated: Account for removed property, adjust unit test on change to correlation.

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-saml.git;a=commit;h=6f93628757f6e1e346f2c0237d41cb4c979c8ca4

The following commit(s) were added to refs/heads/main by this push:
     new 6f93628  Account for removed property, adjust unit test on change to correlation.
6f93628 is described below

commit 6f93628757f6e1e346f2c0237d41cb4c979c8ca4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 23 14:31:39 2025 -0400

    Account for removed property, adjust unit test on change to correlation.
---
 .../idp/flows/sp/initiator/saml2/saml2-beans.xml   | 22 +++-------------------
 .../flows/saml2/SAML2SessionInitiatorFlowTest.java |  4 +---
 2 files changed, 4 insertions(+), 22 deletions(-)

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 9c37391..559f788 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
@@ -19,8 +19,8 @@
         p:requireRelyingPartyId="true" />
 
     <bean id="PrepareInboundMessageContext"
-            class="net.shibboleth.idp.saml.session.impl.PrepareInboundMessageContext" scope="prototype"
-            p:relyingPartyLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple" />
+        class="net.shibboleth.idp.saml.session.impl.PrepareInboundMessageContext" scope="prototype"
+        p:relyingPartyLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple" />
 
     <bean id="InitializeOutboundMessageContext"
         class="net.shibboleth.idp.saml.profile.impl.InitializeOutboundMessageContext" scope="prototype"
@@ -145,8 +145,7 @@
         p:cookiePrefix="%{sp.correlation.cookiePrefix:__Host-_shibsp_req_}"
         p:createOutputObjects="true"
         p:errorFatal="%{sp.stateToken.errorsFatal:false}"
-        p:requestIDLookupStrategy-ref="RequestIDStrategy"
-        p:passiveRequestPredicate-ref="PassivePredicate" />
+        p:requestIDLookupStrategy-ref="RequestIDStrategy" />
 
     <bean id="RequestIDStrategy" parent="shibboleth.Functions.Compose">
         <constructor-arg name="g">
@@ -159,21 +158,6 @@
         </constructor-arg>
     </bean>
 
-    <bean id="PassivePredicate" class="net.shibboleth.shared.logic.PredicateSupport" factory-method="fromFunction">
-        <constructor-arg>
-            <bean class="net.shibboleth.idp.saml.audit.impl.IsPassiveAuditExtractor">
-                <constructor-arg>
-                    <bean parent="shibboleth.Functions.Compose"
-                        c:g-ref="shibboleth.MessageLookup.AuthnRequest"
-                        c:f-ref="shibboleth.MessageContextLookup.Outbound" />
-                </constructor-arg>
-            </bean>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="shibboleth.Conditions.FALSE" />
-        </constructor-arg>
-    </bean>
-            
     <bean id="messageEncoderFactory" class="net.shibboleth.idp.saml.profile.impl.SpringAwareMessageEncoderFactory" />
 
     <bean id="EncodeMessage" class="net.shibboleth.sp.profile.impl.EncodeMessage" scope="prototype"
diff --git a/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2SessionInitiatorFlowTest.java b/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2SessionInitiatorFlowTest.java
index 883df66..7834367 100644
--- a/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2SessionInitiatorFlowTest.java
+++ b/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2SessionInitiatorFlowTest.java
@@ -620,10 +620,8 @@ public class SAML2SessionInitiatorFlowTest extends AbstractSPFlowTest {
                     final String cookie = header.string();
                     assert cookie != null;
                     if (cookie.startsWith("__Host-" + IssueCorrelationCookie.DEFAULT_COOKIE_PREFIX)) {
-                        final Boolean passive = authnRequest.isPassive();
-                        final String passiveDelim = passive ? "=T:" : "=F:";
                         Assert.assertEquals(cookie,
-                                "__Host-_shibsp_req_" + input.getmember(SPConstants.STATE).string() + passiveDelim + authnRequest.getID()
+                                "__Host-_shibsp_req_" + input.getmember(SPConstants.STATE).string() + '=' + authnRequest.getID()
                                     + "; HttpOnly=true; Path=/; SameSite=None; Secure=true");
                         foundCorrelationCookie = true;
                     }

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