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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 22:03:40 2014
New Revision: 5226

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5226&view=rev
Log:
Empty inbound message chain handler and InitializeRequestedPrincipalContext action.

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

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5226&r1=5225&r2=5226&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Tue Jan 21 22:03:40 2014
@@ -17,6 +17,24 @@
     <!-- Note: The DecodeMessage action is defined in the non-abstract beans definition file. -->
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
+
+    <bean
+        id="HandleInboundMessage"
+        class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor"
+        scope="prototype"
+        c:messageHandler-ref="inboundMessageHandlerChain"
+        c:executionDirection="INBOUND" />
+
+    <bean
+        id="inboundMessageHandlerChain"
+        class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain"
+        scope="prototype">
+        <property name="handlers">
+            <util:list>
+                <!-- TODO -->
+            </util:list>
+        </property>
+    </bean>
 
     <bean
         id="InitializeProfileRequestContext"
@@ -70,6 +88,11 @@
         class="net.shibboleth.idp.saml.impl.profile.InitializeAuthenticationContext"
         scope="prototype" />
 
+    <bean
+        id="InitializeRequestedPrincipalContext"
+        class="net.shibboleth.idp.authn.impl.InitializeRequestedPrincipalContext"
+        scope="prototype" />
+
     <!-- TODO make constructor arg names consistent for resolution and filtering -->
     <bean
         id="ResolveAttributes"
@@ -80,6 +103,10 @@
         id="FilterAttributes"
         class="net.shibboleth.idp.profile.impl.FilterAttributes"
         c:service-ref="shibboleth.AttributeFilterService" />
+
+    <bean
+        id="AddResponseShell"
+        class="net.shibboleth.idp.saml.impl.profile.saml1.AddResponseShell" />
 
     <bean
         id="RecordResponseComplete"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml?rev=5226&r1=5225&r2=5226&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml Tue Jan 21 22:03:40 2014
@@ -9,10 +9,14 @@
 
     <action-state id="DecodeMessage">
         <evaluate expression="DecodeMessage" />
-        <transition on="proceed" to="AddBasicMessageMetadataContext" />
+        <transition on="proceed" to="HandleInboundMessage" />
     </action-state>
 
     <!-- TODO OpenSAML message handling -->
+    <action-state id="HandleInboundMessage">
+        <evaluate expression="HandleInboundMessage" />
+        <transition on="proceed" to="AddBasicMessageMetadataContext" />
+    </action-state>
 
     <!-- TODO to be replaced by something else -->
     <action-state id="AddBasicMessageMetadataContext">
@@ -39,6 +43,11 @@
 
     <action-state id="InitializeAuthenticationContext">
         <evaluate expression="InitializeAuthenticationContext" />
+        <transition on="proceed" to="InitializeRequestedPrincipalContext" />
+    </action-state>
+    
+    <action-state id="InitializeRequestedPrincipalContext">
+        <evaluate expression="InitializeRequestedPrincipalContext" />
         <transition on="proceed" to="DoAuthenticationSubflow" />
     </action-state>
 
@@ -59,6 +68,13 @@
         <evaluate expression="FilterAttributes" />
         <transition on="proceed" to="RecordResponseComplete" />
     </action-state>
+    
+    <!-- TODO 
+    <action-state id="AddResponseShell">
+        <evaluate expression="AddResponseShell" />
+        <transition on="proceed" to="RecordResponseComplete" />
+    </action-state>
+    -->
 
     <!-- TODO actions -->
 
@@ -69,7 +85,8 @@
 
     <end-state id="end" />
 
-    <!-- TODO define error state ? <view-state id="error" /> -->
+    <!-- TODO error view-state ? -->
+    <view-state id="error" />
 
     <global-transitions>
         <transition on="NoPotentialFlow" to="error" />