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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov  5 15:48:06 2014
New Revision: 6847

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6847&view=rev
Log:
Add decision-state to avoid calling intercept subflow when no flows are enabled.

Modified:
    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-flow.xml

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=6847&r1=6846&r2=6847&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 Wed Nov  5 15:48:06 2014
@@ -57,10 +57,15 @@
         <evaluate expression="PopulatePostAuthnInterceptContext" />
         <evaluate expression="'proceed'" />
         
-        <transition on="proceed" to="DoInterceptSubflow" />
+        <transition on="proceed" to="CheckPostAuthnInterceptContext" />
     </action-state>
 
-    <subflow-state id="DoInterceptSubflow" subflow="intercept">
+    <decision-state id="CheckPostAuthnInterceptContext">
+        <if test="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).getAvailableFlows().isEmpty()"
+            then="BuildResponse" else="DoPostAuthnInterceptSubflow" />
+    </decision-state>
+
+    <subflow-state id="DoPostAuthnInterceptSubflow" subflow="intercept">
         <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="BuildResponse" />
     </subflow-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml?rev=6847&r1=6846&r2=6847&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml Wed Nov  5 15:48:06 2014
@@ -62,10 +62,15 @@
         <evaluate expression="PopulatePostAuthnInterceptContext" />
         <evaluate expression="'proceed'" />
         
-        <transition on="proceed" to="DoInterceptSubflow" />
+        <transition on="proceed" to="CheckPostAuthnInterceptContext" />
     </action-state>
 
-    <subflow-state id="DoInterceptSubflow" subflow="intercept">
+    <decision-state id="CheckPostAuthnInterceptContext">
+        <if test="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).getAvailableFlows().isEmpty()"
+            then="BuildResponse" else="DoPostAuthnInterceptSubflow" />
+    </decision-state>
+
+    <subflow-state id="DoPostAuthnInterceptSubflow" subflow="intercept">
         <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="BuildResponse" />
     </subflow-state>