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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 15 15:58:34 2014
New Revision: 5730

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5730&view=rev
Log:
Add dummy flows for user error handling, create end-state view for error handling.

Added:
    trunk/idp-conf/src/main/resources/flows/saml/
    trunk/idp-conf/src/main/resources/flows/saml/error-backchannel-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/saml/error-frontchannel-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/views/error.vm   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-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/attribute-query-flow.xml
    trunk/idp-conf/src/main/resources/views/login.vm

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=5730&r1=5729&r2=5730&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Tue Apr 15 15:58:34 2014
@@ -18,6 +18,10 @@
         <webflow:flow-location id="Authentication.ExpiringPassword" path="/authn/expiring-password-flow.xml" />
         <webflow:flow-location id="Authentication.ExpiredPassword" path="/authn/expired-password-flow.xml" />
         <webflow:flow-location id="Authentication.AccountLocked" path="/authn/account-locked-flow.xml" />
+        
+        <!-- SAML profile error interception subflows that can be customized. -->
+        <webflow:flow-location id="SAML.Error.FrontChannel" path="/saml/error-frontchannel-flow.xml" />
+        <webflow:flow-location id="SAML.Error.BackChannel" path="/saml/error-backchannel-flow.xml" />
     </webflow:flow-registry>
 
     <!-- System-supplied flows, do not modify. -->

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml?rev=5730&r1=5729&r2=5730&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml Tue Apr 15 15:58:34 2014
@@ -20,9 +20,9 @@
     <view-state id="DisplayUsernamePasswordPage" view="login">
         <on-render>
             <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="viewScope.profileRequestContext" />
-            <evaluate expression="profileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext), false)" result="viewScope.authenticationContext" />
-            <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext), false)" result="viewScope.authenticationErrorContext" />
-            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="viewScope.esapiEncoder" />
+            <evaluate expression="profileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext))" result="viewScope.authenticationContext" />
+            <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
+            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="viewScope.encoder" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml?rev=5730&r1=5729&r2=5730&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml Tue Apr 15 15:58:34 2014
@@ -20,11 +20,11 @@
     <view-state id="DisplayUsernamePasswordPage" view="login">
         <on-render>
             <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="viewScope.profileRequestContext" />
-            <evaluate expression="profileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext), false)" result="viewScope.authenticationContext" />

[... 91 lines stripped ...]