[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/webflow-config.xml system/flows/authn/jaa...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 11 14:50:19 2013
New Revision: 4943

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4943&view=rev
Log:
Sync with testbed

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

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=4943&r1=4942&r2=4943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Mon Nov 11 14:50:19 2013
@@ -13,11 +13,15 @@
     </webflow:flow-registry>
 
     <!-- System-supplied flows, do not modify. -->
-    <webflow:flow-registry id="flowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
+    <webflow:flow-registry id="systemflowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
 
         <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" />

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml?rev=4943&r1=4942&r2=4943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/jaas-form-authn-flow.xml Mon Nov 11 14:50:19 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>