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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr 30 14:23:23 2014
New Revision: 5811

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5811&view=rev
Log:
IDP-221: SAML 1 artifact flow, some error cleanup

Added:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/webflow-config.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/common-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5811&r1=5810&r2=5811&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Wed Apr 30 14:23:23 2014
@@ -35,10 +35,12 @@
         <!-- SAML profile flows. -->
         <webflow:flow-location id="Shibboleth/SSO" path="/saml/saml1/sso-unsolicited-flow.xml"  />
         <webflow:flow-location id="SAML1/AttributeQuery" path="/saml/saml1/attribute-query-flow.xml"  />
+        <webflow:flow-location id="SAML1/ArtifactResolution" path="/saml/saml1/artifact-resolution-flow.xml"  />
         <webflow:flow-location id="SAML2/Redirect/SSO" path="/saml/saml2/sso-redirect-flow.xml" />
         <webflow:flow-location id="SAML2/POST/SSO" path="/saml/saml2/sso-post-flow.xml"  />
         <webflow:flow-location id="SAML2/Unsolicited/SSO" path="/saml/saml2/sso-unsolicited-flow.xml"  />
         <webflow:flow-location id="SAML2/AttributeQuery" path="/saml/saml2/attribute-query-flow.xml"  />
+        <webflow:flow-location id="SAML2/ArtifactResolution" path="/saml/saml2/artifact-resolution-flow.xml"  />
     
         <!-- Inbound security processing of SAML messages. -->
         <webflow:flow-location id="SecurityPolicy.Abstract" path="/saml/security-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=5811&r1=5810&r2=5811&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 Wed Apr 30 14:23:23 2014
@@ -31,13 +31,22 @@
         </property>
     </bean>
 
+    <bean id="SAML1ArtifactRequestIssuer"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.saml.saml1.binding.impl.SAML1ArtifactRequestIssuerHandler" scope="prototype"
+                p:artifactMap-ref="shibboleth.SAMLArtifactMap" />
+        </constructor-arg>
+    </bean>
+
     <bean id="SAMLProtocolAndRole"
             class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
             c:executionDirection="INBOUND">
         <constructor-arg name="messageHandler">
             <bean class="org.opensaml.saml.common.binding.impl.SAMLProtocolAndRoleHandler" scope="prototype"
-                p:protocol-ref="Shibboleth.MetadataLookup.Protocol"
-                p:role-ref="Shibboleth.MetadataLookup.Role" />
+                p:protocol-ref="shibboleth.MetadataLookup.Protocol"
+                p:role-ref="shibboleth.MetadataLookup.Role" />
         </constructor-arg>
     </bean>
     

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=5811&r1=5810&r2=5811&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 Wed Apr 30 14:23:23 2014
@@ -11,6 +11,7 @@
         <evaluate expression="DecodeMessage" />
 
         <evaluate expression="CheckMessageVersion" />
+        <evaluate expression="SAML1ArtifactRequestIssuer" />
         <evaluate expression="SAMLProtocolAndRole" />
         <evaluate expression="SAMLMetadataLookup" />
 
@@ -30,9 +31,6 @@
         
         <!-- No inbound flow to call. -->
         <transition on="proceed" to="OutboundContexts" />
-        
-        <!-- Anything starting with Invalid is an error. -->
-        <transition on="#{currentEvent.id.startsWith('Invalid')}" to="HandleError" />
         

[... 32 lines stripped ...]