[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/authn-events-flow.xml conf/c14n/sub...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  2 15:26:07 2017
New Revision: 8636

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8636&view=rev
Log:
IDP-1133 - Replace wildcarded global transition rules

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
    trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
    trunk/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/client-storage/client-storage-write-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml?rev=8636&r1=8635&r2=8636&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml	Thu Mar  2 15:26:07 2017
@@ -13,6 +13,9 @@
     <!-- Custom error events to reflect back from user-supplied login subflows. -->
     <!--
     <end-state id="MyCustomEvent" />
+
+    <global-transitions>
+        <transition on="MyCustomEvent" to="MyCustomEvent" />
+    </global-transitions>
     -->
-
 </flow>

Modified: trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml?rev=8636&r1=8635&r2=8636&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml	Thu Mar  2 15:26:07 2017
@@ -13,6 +13,10 @@
     <!-- Custom error events to reflect back from user-supplied c14n subflows. -->
     <!--
     <end-state id="MyCustomEvent" />
+
+    <global-transitions>
+        <transition on="MyCustomEvent" to="MyCustomEvent" />
+    </global-transitions>
     -->
 
 </flow>

Modified: trunk/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml?rev=8636&r1=8635&r2=8636&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml	Thu Mar  2 15:26:07 2017
@@ -10,9 +10,12 @@
     report custom events in response to unusual conditions.
     -->
 
-    <!-- Custom error events to reflect back from user-supplied intercept subflows. -->
     <!--
     <end-state id="MyCustomEvent" />
+
+    <global-transitions>
+        <transition on="MyCustomEvent" to="MyCustomEvent" />
+    </global-transitions>
     -->
 
 </flow>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml?rev=8636&r1=8635&r2=8636&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml	Thu Mar  2 15:26:07 2017
@@ -36,13 +36,26 @@
         <transition to="RuntimeException" />
     </action-state>
 
-    <!-- Default is to turn any event into its own end-state. -->
     <global-transitions>
         <transition on-exception="java.lang.RuntimeException" to="LogRuntimeException" />
         <transition on="#{currentEvent.id.startsWith('authn/')}" to="ReselectFlow">
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).setSignaledFlowId(currentEvent.id)" />
         </transition>
-        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="#{currentEvent.id}" />
+        <transition on="AuthenticationException" to="AuthenticationException" />
+        <transition on="IdentitySwitch" to="IdentitySwitch" />
+        <transition on="InputOutputError" to="InputOutputError" />
+        <transition on="InvalidCredentials" to="InvalidCredentials" />
+        <transition on="InvalidProfileContext" to="InvalidProfileContext" />
+        <transition on="InvalidSubjectContext" to="InvalidSubjectContext" />
+        <transition on="InvalidSubjectCanonicalizationContext" to="InvalidSubjectCanonicalizationContext" />

[... 97 lines stripped ...]