[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/cas: abstractValidate/abstractVali...

[noreply at shibboleth.net]

Author: serac
Date: Thu Mar 19 15:17:39 2015
New Revision: 7437

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7437&view=rev
Log:
Improve CAS error handling.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml?rev=7437&r1=7436&r2=7437&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml Thu Mar 19 15:17:39 2015
@@ -78,15 +78,19 @@
             <set name="flashScope.escapeUtils" value="T(org.apache.commons.lang.StringEscapeUtils)" />
         </on-entry>
     </end-state>
+
     <end-state id="validateFailure" view="cas/validateFailure">
         <on-entry>
             <set name="flashScope.code" value="currentEvent.attributes.code?:'INTERNAL_ERROR'" />
             <set name="flashScope.detailCode" value="currentEvent.attributes.detailCode?:'E_ILLEGAL_STATE'" />
         </on-entry>
+        <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>
 
     <global-transitions>
-        <transition on-exception="java.lang.IllegalStateException" to="validateFailure" />
+        <transition on-exception="java.lang.RuntimeException" to="validateFailure">
+            <evaluate expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.cas').error('Uncaught runtime exception', flowExecutionException.getCause())" />
+        </transition>
         <transition on="#{currentEvent.id.startsWith('Invalid') or currentEvent.id.startsWith('Unable')}"
                     to="validateFailure" />
         <transition on="illegalState" to="validateFailure" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml?rev=7437&r1=7436&r2=7437&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml Thu Mar 19 15:17:39 2015
@@ -48,7 +48,10 @@
             <evaluate expression="publishProtocolResponseAction" />
         </on-entry>
     </end-state>
+
     <end-state id="gatewayRedirect" view="externalRedirect:#{requestScope.serviceTicketRequest.service}" />
+
+    <!-- View end state -->
     <end-state id="error" view="error">
         <on-entry>
             <evaluate expression="environment" result="requestScope.environment" />
@@ -57,10 +60,13 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
         </on-entry>
+        <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>
 
     <global-transitions>
-        <transition on-exception="java.lang.IllegalStateException" to="error" />
+        <transition on-exception="java.lang.RuntimeException" to="error">
+            <evaluate expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.cas').error('Uncaught runtime exception', flowExecutionException.getCause())" />
+        </transition>
         <transition on="#{currentEvent.id.startsWith('Invalid') or currentEvent.id.startsWith('Unable')}"
                     to="error" />
         <transition on="illegalState" to="error" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml?rev=7437&r1=7436&r2=7437&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml Thu Mar 19 15:17:39 2015
@@ -41,15 +41,19 @@
             <set name="flashScope.escapeUtils" value="T(org.apache.commons.lang.StringEscapeUtils)" />
         </on-entry>
     </end-state>
+
     <end-state id="proxyFailure" view="cas/proxyFailure">
         <on-entry>
             <set name="flashScope.code" value="currentEvent.attributes.code?:'INTERNAL_ERROR'" />

[... 35 lines stripped ...]