[java-plugin-shibd-saml] branch main updated: Remove implicit output handling.

[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/74adc32a292e1d7be9486c9db5a99946d4c81b3a

The following commit(s) were added to refs/heads/main by this push:
     new 74adc32  Remove implicit output handling.
74adc32 is described below

commit 74adc32a292e1d7be9486c9db5a99946d4c81b3a
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Wed May 20 13:17:03 2026 -0400

    Remove implicit output handling.
---
 .../idp/flows/sp/consumer/saml2/saml2-beans.xml          |  3 +--
 .../net/shibboleth/idp/flows/sp/saml2-common-beans.xml   |  2 --
 .../sp/saml/saml2/profile/impl/ValidateAssertions.java   | 16 +++++-----------
 .../saml2/profile/impl/PrepareAgentResponseTest.java     |  6 ++++++
 4 files changed, 12 insertions(+), 15 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 404171d..e87c192 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
@@ -15,8 +15,7 @@
     <bean id="RecoverStateData"
         class="net.shibboleth.sp.profile.impl.RecoverStateData" scope="prototype"
         p:stateTokenLookupStrategy-ref="RelayStateLookup"
-        p:stateDataClass="net.shibboleth.sp.saml.saml2.SAMLStateData"
-        p:createOutputObjects="true" />
+        p:stateDataClass="net.shibboleth.sp.saml.saml2.SAMLStateData" />
 
     <bean id="RelayStateLookup" parent="shibboleth.Functions.Compose">
         <constructor-arg name="g">
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 d996699..d4e87f9 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
@@ -167,13 +167,11 @@
 
     <bean id="PreserveRelayState"
         class="net.shibboleth.sp.saml.saml2.profile.impl.PreserveRelayState" scope="prototype"
-        p:createOutputObjects="true"
         p:errorFatal="%{sp.stateToken.errorsFatal:false}" />
 
     <bean id="messageEncoderFactory" class="net.shibboleth.idp.saml.profile.impl.SpringAwareMessageEncoderFactory" />
 
     <bean id="EncodeMessage" class="net.shibboleth.sp.profile.impl.EncodeMessage" scope="prototype"
-        p:createOutputObjects="true"
         p:messageEncoderFactory-ref="messageEncoderFactory" />
 
     <!-- Override IdP's encoders to supply the DDF-backed servlet supplier. -->
diff --git a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ValidateAssertions.java b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ValidateAssertions.java
index a66d7bb..d4154f1 100644
--- a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ValidateAssertions.java
+++ b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/impl/ValidateAssertions.java
@@ -69,18 +69,12 @@ public class ValidateAssertions extends org.opensaml.saml.saml2.profile.impl.Val
         
         final AgentRequestContext agentRequestContext =
                 profileRequestContext.ensureSubcontext(AgentRequestContext.class);
-        DDF output = agentRequestContext.getOutput();
-        if (output == null) {
-            output = new DDF(null).structure();
-            agentRequestContext.setOutput(output);
-        }
-        
-        final DDF errors = output.addmember(ConsumerConstants.VALIDATION_ERRORS);
-        if (!errors.islist()) {
-            errors.list();
-        }
+        final DDF output = agentRequestContext.getOutput();
+        if (output != null) {
+            final DDF errors = output.addmember(ConsumerConstants.VALIDATION_ERRORS).list();
+            validationContext.getValidationFailureMessages().forEach(msg -> errors.add(new DDF(null).string(msg)));
+        }            
         
-        validationContext.getValidationFailureMessages().forEach(msg -> errors.add(new DDF(null).string(msg)));
     }
     
 }
\ No newline at end of file
diff --git a/sp-saml-impl/src/test/java/net/shibboleth/sp/saml/saml2/profile/impl/PrepareAgentResponseTest.java b/sp-saml-impl/src/test/java/net/shibboleth/sp/saml/saml2/profile/impl/PrepareAgentResponseTest.java
index 76b580b..62db9dd 100644
--- a/sp-saml-impl/src/test/java/net/shibboleth/sp/saml/saml2/profile/impl/PrepareAgentResponseTest.java
+++ b/sp-saml-impl/src/test/java/net/shibboleth/sp/saml/saml2/profile/impl/PrepareAgentResponseTest.java
@@ -56,6 +56,7 @@ import net.shibboleth.sp.ddf.DDF;
 import net.shibboleth.sp.messaging.RemotedHttpServletResponse;
 import net.shibboleth.sp.profile.ConsumerConstants;
 import net.shibboleth.sp.profile.impl.BaseApplicationActionTest;
+import net.shibboleth.sp.profile.impl.CreateOutputMessage;
 import net.shibboleth.sp.saml.saml2.context.SAMLTokenContext;
 
 /**
@@ -84,6 +85,11 @@ public class PrepareAgentResponseTest extends BaseApplicationActionTest {
         
         action = new PrepareAgentResponse();
         action.initialize();
+
+        final CreateOutputMessage createAction = new CreateOutputMessage();
+        createAction.setCreateServletResponse(true);
+        createAction.initialize();
+        ActionTestingSupport.assertProceedEvent(createAction.execute(src));
     }
     
     /**

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