Author: scantor
Date: Tue Mar 7 21:14:03 2017
New Revision: 8671
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8671&view=rev
Log:
BPr8636-8638 - IDP-1133 - Replace wildcarded global transition rules
Modified:
branches/3.3/ (props changed)
branches/3.3/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
branches/3.3/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
branches/3.3/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/client-storage/client-storage-read-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/client-storage/client-storage-write-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
branches/3.3/idp-conf/src/main/resources/system/flows/saml/security-abstract-flow.xml
Modified: branches/3.3/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml?rev=8671&r1=8670&r2=8671&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml (original)
+++ branches/3.3/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml Tue Mar 7 21:14:03 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: branches/3.3/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml?rev=8671&r1=8670&r2=8671&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml (original)
+++ branches/3.3/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml Tue Mar 7 21:14:03 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: branches/3.3/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml?rev=8671&r1=8670&r2=8671&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml (original)
+++ branches/3.3/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml Tue Mar 7 21:14:03 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: branches/3.3/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml?rev=8671&r1=8670&r2=8671&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml (original)
+++ branches/3.3/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml Tue Mar 7 21:14:03 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}" />
[... 262 lines stripped ...]