[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: flows/authn/account-locked-flow.xml flows/auth...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May  5 15:23:49 2014
New Revision: 5850

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5850&view=rev
Log:
Simple way to catch direct call to subflow.

Modified:
    trunk/idp-conf/src/main/resources/flows/authn/account-locked-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-conditions-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/expired-password-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/expiring-password-flow.xml
    trunk/idp-conf/src/main/resources/flows/saml/error-backchannel-flow.xml
    trunk/idp-conf/src/main/resources/flows/saml/error-frontchannel-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.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/artifact-resolution-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/security-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/flows/authn/account-locked-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/account-locked-flow.xml?rev=5850&r1=5849&r2=5850&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/account-locked-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/account-locked-flow.xml Mon May  5 15:23:49 2014
@@ -3,6 +3,9 @@
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
     <!-- This is a placeholder flow that does nothing out of the box but reserves a subflow ID. -->
+
+    <!-- Rudimentary impediment to direct execution of subflow. -->
+    <input name="calledAsSubflow" type="boolean" required="true" />
 
     <on-start>
         <evaluate expression="'proceed'" />

Modified: trunk/idp-conf/src/main/resources/flows/authn/authn-conditions-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/authn-conditions-flow.xml?rev=5850&r1=5849&r2=5850&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/authn-conditions-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/authn-conditions-flow.xml Mon May  5 15:23:49 2014
@@ -2,6 +2,9 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
       abstract="true">
+
+    <!-- Rudimentary impediment to direct execution of subflow. -->
+    <input name="calledAsSubflow" type="boolean" required="true" />
 
     <action-state id="ValidateUsernamePassword">
         
@@ -17,14 +20,17 @@
     </action-state>
 
     <subflow-state id="CallExpiringPassword" subflow="Authentication.ExpiringPassword">
+        <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="proceed" />
     </subflow-state>
 
     <subflow-state id="CallExpiredPassword" subflow="Authentication.ExpiredPassword">
+        <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="DisplayUsernamePasswordPage" />
     </subflow-state>
 
     <subflow-state id="CallAccountLocked" subflow="Authentication.AccountLocked">
+        <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="DisplayUsernamePasswordPage" />
     </subflow-state>
 

Modified: trunk/idp-conf/src/main/resources/flows/authn/expired-password-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/expired-password-flow.xml?rev=5850&r1=5849&r2=5850&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/expired-password-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/expired-password-flow.xml Mon May  5 15:23:49 2014
@@ -3,6 +3,9 @@
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 

[... 283 lines stripped ...]