[java-idp-testbed COMMIT] in /trunk/src/main/resources: conf/webflow-config.xml system/flows/authn/jaas-form-authn-fl...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 11 14:48:16 2013
New Revision: 41

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=41&view=rev
Log:
IDP-332: Insert an empty subflow for expired passwords and locked accounts.

Added:
    trunk/src/main/resources/system/flows/authn/placeholder-flow.xml   (with props)
Modified:
    trunk/src/main/resources/conf/webflow-config.xml
    trunk/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml

Modified: trunk/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/webflow-config.xml?rev=41&r1=40&r2=41&view=diff
==============================================================================
--- trunk/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/src/main/resources/conf/webflow-config.xml Mon Nov 11 14:48:16 2013
@@ -26,13 +26,17 @@
         <webflow:flow-location id="Authentication.Abstract" path="/authn/authn-abstract-flow.xml" />
         <webflow:flow-location id="Authentication.Subflow.Abstract" path="/authn/authn-subflow-abstract-flow.xml" />
         <webflow:flow-location id="Authentication" path="/authn/authn-flow.xml" />
+
+        <!-- Login error subflows. -->
+        <webflow:flow-location id="Authentication.ExpiredPassword" path="/authn/placeholder-flow.xml" />
+        <webflow:flow-location id="Authentication.AccountLocked" path="/authn/placeholder-flow.xml" />
         
         <!-- Login methods. -->
         <webflow:flow-location id="AuthenticationFlow/IPAddress" path="/authn/ipaddress-authn-flow.xml" />
         <webflow:flow-location id="AuthenticationFlow/RemoteUser" path="/authn/remoteuser-authn-flow.xml" />
         <webflow:flow-location id="AuthenticationFlow/JAASForm" path="/authn/jaas-form-authn-flow.xml" />
         <webflow:flow-location id="AuthenticationFlow/JAASBasic" path="/authn/jaas-basic-authn-flow.xml" />
-        
+                
         <!-- C14N methods. -->
         <webflow:flow-location id="SubjectC14N/Simple" path="/authn/simple-subject-c14n-flow.xml" />
                 

Modified: trunk/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml?rev=41&r1=40&r2=41&view=diff
==============================================================================
--- trunk/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml (original)
+++ trunk/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml Mon Nov 11 14:48:16 2013
@@ -31,10 +31,21 @@
         
         <transition on="proceed" to="CallSubjectCanonicalization" />
         
+        <transition on="#{ getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext').getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext), false).getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext), true).isClassifiedError('ExpiredPassword') }" to="CallExpiredPassword" />
+        <transition on="#{ getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext').getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext), false).getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext), true).isClassifiedError('AccountLocked') }" to="CallAccountLocked" />
+        
         <transition on="NoCredentials" to="DisplayUsernamePasswordPage" />
         <transition on="InvalidCredentials" to="DisplayUsernamePasswordPage" />
     </action-state>
 
+    <subflow-state id="CallExpiredPassword" subflow="Authentication.ExpiredPassword">
+        <transition on="proceed" to="DisplayUsernamePasswordPage" />
+    </subflow-state>
+
+    <subflow-state id="CallAccountLocked" subflow="Authentication.AccountLocked">
+        <transition on="proceed" to="DisplayUsernamePasswordPage" />
+    </subflow-state>
+
     <bean-import resource="jaas-form-authn-beans.xml" />
 
 </flow>