[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml: saml-abstract-beans.xml saml...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 29 13:04:27 2014
New Revision: 5795

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5795&view=rev
Log:
Convert error handling action to predicate to avoid overwriting event.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5795&r1=5794&r2=5795&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Tue Apr 29 13:04:27 2014
@@ -223,5 +223,8 @@
         p:messageEncoderFactory-ref="messageEncoderFactory" />
 
     <bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
+
+    <bean id="LocalErrorPredicate" class="org.opensaml.saml.common.profile.logic.DefaultLocalErrorPredicate"
+        p:localEvents-ref="shibboleth.LocalEvents" />
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=5795&r1=5794&r2=5795&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Tue Apr 29 13:04:27 2014
@@ -77,10 +77,6 @@
         p:enabled="${idp.session.enabled}"
         p:sessionManager-ref="shibboleth.SessionManager"
         p:sessionLifetime="${idp.session.defaultSPlifetime}" />
-        
-    <bean id="CheckErrorHandlingStrategy"
-        class="org.opensaml.saml.common.profile.impl.CheckErrorHandlingStrategy" scope="prototype"
-        p:localEvents-ref="shibboleth.LocalEvents" />
 
     <bean id="AddStatusToResponse"
             class="org.opensaml.saml.saml1.profile.impl.AddStatusToResponse" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml?rev=5795&r1=5794&r2=5795&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml Tue Apr 29 13:04:27 2014
@@ -56,10 +56,14 @@
 
     <!-- Error Response Generation -->
 
+    <decision-state id="HandleError">
+        <if test="LocalErrorPredicate.apply(flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext'))"
+            then="error" else="HandleErrorWithResponse" />
+    </decision-state>
+
     <!-- We need to trap non-proceed transitions in these actions to avoid an infinite loop. -->
 
-    <action-state id="HandleError">
-        <evaluate expression="CheckErrorHandlingStrategy" />
+    <action-state id="HandleErrorWithResponse">
         <evaluate expression="AddResponseShell" />
         <evaluate expression="AddInResponseToToResponse" />
         <evaluate expression="AddStatusToResponse" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=5795&r1=5794&r2=5795&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Tue Apr 29 13:04:27 2014
@@ -100,10 +100,6 @@
         </property>
     </bean>
 
-    <bean id="CheckErrorHandlingStrategy"
-        class="org.opensaml.saml.common.profile.impl.CheckErrorHandlingStrategy" scope="prototype"
-        p:localEvents-ref="shibboleth.LocalEvents" />
-
     <bean id="AddStatusToResponse"
             class="org.opensaml.saml.saml2.profile.impl.AddStatusToResponse" scope="prototype"
             p:statusMessage="An error occurred.">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

[... 22 lines stripped ...]