[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-fl...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Sep 10 18:33:07 2014
New Revision: 6521

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6521&view=rev
Log:
Re-worked post-authn flows, fixed mistakes, added flow tests.

Added:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/PostAuthnFlowTest.java   (with props)
    trunk/idp-conf/src/test/resources/post-authn/
    trunk/idp-conf/src/test/resources/post-authn/flows/
    trunk/idp-conf/src/test/resources/post-authn/flows/test-error-flow.xml   (with props)
    trunk/idp-conf/src/test/resources/post-authn/flows/test-post-authn-profile-beans.xml   (with props)
    trunk/idp-conf/src/test/resources/post-authn/flows/test-post-authn-profile-flow.xml   (with props)
    trunk/idp-conf/src/test/resources/post-authn/flows/test-proceed-1-flow.xml   (with props)
    trunk/idp-conf/src/test/resources/post-authn/flows/test-proceed-2-flow.xml   (with props)
    trunk/idp-conf/src/test/resources/post-authn/test-webflow-config.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-flow.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/AbstractProfileInterceptorAction.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/SelectProfileInterceptorFlow.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorContextTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/SelectProfileInterceptorFlowTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-flow.xml?rev=6521&r1=6520&r2=6521&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-flow.xml Wed Sep 10 18:33:07 2014
@@ -13,14 +13,14 @@
 
     <!-- Error events to reflect back from this subflow. -->
     <end-state id="InvalidContext" />
-    <end-state id="ReselectFlow" />
-    <end-state id="NoPotentialFlow" />
-    <!-- TODO ProfileInterceptorFlowError ? -->
-    <end-state id="FlowError" />
+    <end-state id="HandleError" />
 
-    <!-- Default is to turn any error event into its own end-state. -->
+    <!--
+    Default is to turn non-proceed events into an error, and initiate error handling sequence
+    defined by action in child flows.
+    -->
     <global-transitions>
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="#{currentEvent.id}" />
+          <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
 </flow>

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=6521&r1=6520&r2=6521&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java Wed Sep 10 18:33:07 2014
@@ -32,6 +32,7 @@
 import net.shibboleth.idp.test.InMemoryDirectory;
 import net.shibboleth.idp.test.PreferFileSystemContextLoader;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
 import net.shibboleth.utilities.java.support.net.IPRange;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
@@ -65,7 +66,10 @@
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
 import org.springframework.webflow.engine.EndState;
+import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.executor.FlowExecutionResult;
@@ -259,14 +263,28 @@
     }
 
     /**
-     * Assert that the flow execution outcome is not null and its id equals 'end'. For testing purposes, the outcome's

[... 320 lines stripped ...]