[java-plugin-shibd] branch main updated: Testing some failsafe error handling.

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

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

The following commit(s) were added to refs/heads/main by this push:
     new a4f8231  Testing some failsafe error handling.
a4f8231 is described below

commit a4f8231ef781179ee38e311c35156473908ceaa8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 8 10:22:08 2024 -0400

    Testing some failsafe error handling.
---
 .../shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml    | 12 ++++++++++++
 .../src/main/resources/net/shibboleth/idp/views/sp/error.vm  |  2 ++
 .../sp/profile/impl/PrepareAgentErrorResponse.java           |  1 -
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
index 96de745..66cbbf6 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
@@ -76,6 +76,18 @@
     </action-state>
 
     <end-state id="HandleErrorWithView" view="sp/error">
+        <on-entry>
+            <evaluate expression="environment" result="requestScope.environment" />
+            <evaluate expression="currentEvent" result="requestScope.currentEvent" />
+            <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
+            <evaluate expression="T(net.shibboleth.shared.codec.HTMLEncoder)" result="requestScope.encoder" />
+            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CSPDigester')" result="requestScope.cspDigester" />
+            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CSPNonce')" result="requestScope.cspNonce" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
+            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="requestScope.custom" />
+        </on-entry>
+
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>
 
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/idp/views/sp/error.vm b/sp-conf-impl/src/main/resources/net/shibboleth/idp/views/sp/error.vm
new file mode 100644
index 0000000..58d344c
--- /dev/null
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/idp/views/sp/error.vm
@@ -0,0 +1,2 @@
+$response.setContentType("text/plain"). 4 1
+event 1 $encoder.encodeForHTML($currentEvent)
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/PrepareAgentErrorResponse.java b/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/PrepareAgentErrorResponse.java
index 7c11827..339fd87 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/PrepareAgentErrorResponse.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/profile/impl/PrepareAgentErrorResponse.java
@@ -79,7 +79,6 @@ public class PrepareAgentErrorResponse extends AbstractAgentRequestAction {
         } else {
             outputMessage.addmember("event").string(EventIds.MESSAGE_PROC_ERROR);
         }
-        
     }
 
 }
\ No newline at end of file

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