[java-identity-provider] branch master updated: IDP-1152 - Global transitions are inherited into subflows

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5989e84be705ccc4e7b7ede093e968064b85d4c3

The following commit(s) were added to refs/heads/master by this push:
       new  5989e84   IDP-1152 - Global transitions are inherited into subflows
5989e84 is described below

commit 5989e84be705ccc4e7b7ede093e968064b85d4c3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 29 18:41:42 2017 -0400

    IDP-1152 - Global transitions are inherited into subflows
    
    https://issues.shibboleth.net/jira/browse/IDP-1152
    
    Correct the previous fix by ensuring error transition is last.
---
 idp-conf/src/main/resources/conf/authn/authn-events-flow.xml     | 9 +++++----
 .../src/main/resources/conf/c14n/subject-c14n-events-flow.xml    | 8 ++++----
 .../src/main/resources/conf/intercept/intercept-events-flow.xml  | 7 +++----
 .../main/resources/system/flows/authn/authn-abstract-flow.xml    | 1 -
 .../resources/system/flows/c14n/subject-c14n-abstract-flow.xml   | 1 -
 .../resources/system/flows/intercept/intercept-abstract-flow.xml | 1 -
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml b/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
index 36d62a1..8846677 100644
--- a/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
+++ b/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
@@ -11,11 +11,12 @@
     -->
 
     <!-- Custom error events to reflect back from user-supplied login subflows. -->
-    <!--
-    <end-state id="MyCustomEvent" />
+
+    <!-- <end-state id="MyCustomEvent" /> -->
 
     <global-transitions>
-        <transition on="MyCustomEvent" to="MyCustomEvent" />
+        <!-- <transition on="MyCustomEvent" to="MyCustomEvent" /> -->
+        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
     </global-transitions>
-    -->
+
 </flow>
diff --git a/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml b/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
index c8e7220..c4936f3 100644
--- a/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
+++ b/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
@@ -11,12 +11,12 @@
     -->
 
     <!-- Custom error events to reflect back from user-supplied c14n subflows. -->
-    <!--
-    <end-state id="MyCustomEvent" />
+    
+    <!-- <end-state id="MyCustomEvent" /> -->
 
     <global-transitions>
-        <transition on="MyCustomEvent" to="MyCustomEvent" />
+        <!-- <transition on="MyCustomEvent" to="MyCustomEvent" /> -->
+        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
     </global-transitions>
-    -->
 
 </flow>
diff --git a/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml b/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
index 315c258..6214e80 100644
--- a/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
+++ b/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
@@ -10,12 +10,11 @@
     report custom events in response to unusual conditions.
     -->
 
-    <!--
-    <end-state id="MyCustomEvent" />
+    <!-- <end-state id="MyCustomEvent" /> -->
 
     <global-transitions>
-        <transition on="MyCustomEvent" to="MyCustomEvent" />
+        <!-- <transition on="MyCustomEvent" to="MyCustomEvent" /> -->
+        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
     </global-transitions>
-    -->
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
index c14a1aa..86dfe3b 100644
--- a/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
@@ -57,7 +57,6 @@
         <transition on="RestartAuthentication" to="RestartAuthentication" />
         <transition on="RuntimeException" to="RuntimeException" />
         <transition on="SubjectCanonicalizationError" to="SubjectCanonicalizationError" />
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
     </global-transitions>
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
index fc569aa..fcf7739 100644
--- a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
@@ -39,7 +39,6 @@
         <transition on="ReselectFlow" to="ReselectFlow" />
         <transition on="RuntimeException" to="RuntimeException" />
         <transition on="SubjectCanonicalizationError" to="SubjectCanonicalizationError" />
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
     </global-transitions>
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
index f836cfc..e30a00a 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
@@ -39,7 +39,6 @@
         <transition on="ContextCheckDenied" to="ContextCheckDenied" />
         <transition on="RestartAuthentication" to="RestartAuthentication" />
         <transition on="RuntimeException" to="RuntimeException" />
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="InvalidEvent" />
     </global-transitions>
 
 </flow>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.