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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Apr 18 14:00:15 2014
New Revision: 5745

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5745&view=rev
Log:
Re-enable encryption populate action and map outbound handlers to an error event.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5745&r1=5744&r2=5745&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Fri Apr 18 14:00:15 2014
@@ -152,13 +152,10 @@
         </property>
     </bean>
     
-    <!--
-    TODO: activate once resolver is available
     <bean id="PopulateEncryptionParameters"
             class="net.shibboleth.idp.saml.saml2.profile.impl.PopulateEncryptionParameters" scope="prototype"
             p:configurationLookupStrategy-ref="shibboleth.EncryptionConfigurationLookup"
             p:encryptionParametersResolver-ref="shibboleth.EncryptionParametersResolver" />
-    -->
 
     <bean id="InitializeAuthenticationContext"
         class="net.shibboleth.idp.saml.profile.impl.InitializeAuthenticationContext" scope="prototype" />
@@ -211,9 +208,13 @@
     </bean>
 
     <bean id="HandleOutboundMessage"
-        class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
-        c:messageHandler-ref="outboundMessageHandlerChain"
-        c:executionDirection="OUTBOUND" />
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:messageHandler-ref="outboundMessageHandlerChain"
+            c:executionDirection="OUTBOUND">
+        <property name="errorEvent">
+            <util:constant static-field="org.opensaml.profile.action.EventIds.MESSAGE_PROC_ERROR" />
+        </property>
+    </bean>
 
     <bean id="messageEncoderFactory" class="net.shibboleth.idp.saml.profile.impl.SpringAwareMessageEncoderFactory"
         p:bindings-ref="shibboleth.OutgoingBindings" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=5745&r1=5744&r2=5745&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Fri Apr 18 14:00:15 2014
@@ -99,15 +99,16 @@
         <transition on="proceed" to="PopulateAssertionSignatureSigningParameters" />
     </action-state>
     
-    <!-- TODO: route to encryption parameter action once bean is live -->
     <action-state id="PopulateAssertionSignatureSigningParameters">
         <evaluate expression="PopulateAssertionSignatureSigningParameters" />
-        <transition on="proceed" to="DoProfileWork" />
+        <transition on="proceed" to="PopulateEncryptionParameters" />
     </action-state>
 
     <action-state id="PopulateEncryptionParameters">
         <evaluate expression="PopulateEncryptionParameters" />
         <transition on="proceed" to="DoProfileWork" />
+        <!-- TODO: remove once encryption stuff is tested/working -->
+        <transition on="InvalidSecurityConfiguration" to="DoProfileWork" />
     </action-state>
     
     <!--
@@ -116,6 +117,11 @@
     -->
 
     <!-- Post Processing / Encode -->
+
+    <!--
+    These actions handle errors by routing to the catch-all end-state, because it's assumed that
+    any error here is unrecoverable and would prevent returning a SAML protocol message regardless.
+    -->
 
     <action-state id="HandleOutboundMessage">
         <evaluate expression="HandleOutboundMessage" />
@@ -158,7 +164,7 @@
         </on-entry>
     </end-state>
 
-    <!-- Default is to turn any event into an error and preserve it for error handling. -->
+    <!-- Default is to turn any event into an error, preserve it, and initiate error handling sequence. -->
     <global-transitions>
         <transition on="#{true}" to="SavePreviousEventAsError" />
     </global-transitions>