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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Apr 17 17:49:41 2014
New Revision: 5744

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5744&view=rev
Log:
Refactor initial inbound handler chain into discrete flow actions common to all flows.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    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
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=5744&r1=5743&r2=5744&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml Thu Apr 17 17:49:41 2014
@@ -36,7 +36,9 @@
              <prop key="FlowExecutionRestorationFailureException">backbutton</prop>
           </props>
        </property>
+       <!--
        <property name="defaultErrorView" value="error"/>
+       -->
     </bean>
     
     <!-- ViewResolvers -->

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=5744&r1=5743&r2=5744&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 Thu Apr 17 17:49:41 2014
@@ -19,10 +19,44 @@
 
     <!-- These are beans that are common to most or all SAML profile flows, regardless of version. -->
 
-    <bean id="HandleInboundMessage"
-        class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
-        c:messageHandler-ref="inboundMessageHandlerChain"
-        c:executionDirection="INBOUND" />
+    <bean id="CheckMessageVersion"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean id="CheckMessageVersionHandler"
+                class="org.opensaml.saml.common.binding.impl.CheckMessageVersionHandler" scope="prototype"
+                p:ignoreMissingOrUnrecognized="true" />
+        </constructor-arg>
+        <property name="errorEvent">
+            <util:constant static-field="org.opensaml.profile.action.EventIds.INVALID_MESSAGE_VERSION" />
+        </property>
+    </bean>
+
+    <bean id="SAMLProtocolAndRole"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean id="SAMLProtocolAndRoleHandler"
+                class="org.opensaml.saml.common.binding.impl.SAMLProtocolAndRoleHandler" scope="prototype"
+                p:protocol-ref="Shibboleth.MetadataLookup.Protocol"
+                p:role-ref="Shibboleth.MetadataLookup.Role" />
+        </constructor-arg>
+    </bean>
+    
+    <!-- TODO: need to poke metadata source in from relying party config later -->
+    <bean id="SAMLMetadataLookup"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean id="SAMLMetadataLookupHandler"
+                    class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype">
+                <property name="roleDescriptorResolver">
+                    <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+                        c:mdResolver-ref="ExampleMetadataResolver" />
+                </property>
+            </bean>
+        </constructor-arg>
+    </bean>
 
     <bean id="InitializeRelyingPartyContexFromSAMLPeer"
         class="net.shibboleth.idp.saml.profile.impl.InitializeRelyingPartyContextFromSAMLPeer" scope="prototype" />

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=5744&r1=5743&r2=5744&view=diff
==============================================================================

[... 269 lines stripped ...]