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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Mar 22 17:03:12 2014
New Revision: 5625

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5625&view=rev
Log:
IDP-359 - action to populate subject context after SAML subject c14n

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/FinalizeSAMLSubjectCanonicalization.java   (with props)
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=5625&r1=5624&r2=5625&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 Sat Mar 22 17:03:12 2014
@@ -53,6 +53,12 @@
         class="net.shibboleth.idp.saml.impl.profile.PopulateBindingAndEndpointContexts" scope="prototype"
         p:endpointResolver-ref="shibboleth.EndpointResolver"
         p:bindings-ref="shibboleth.OutgoingBindings" />
+
+    <bean id="ExtractSubjectFromRequest"
+        class="net.shibboleth.idp.saml.impl.profile.ExtractSubjectFromRequest" scope="prototype" />
+
+    <bean id="FinalizeSAMLSubjectCanonicalization"
+        class="net.shibboleth.idp.saml.impl.profile.FinalizeSAMLSubjectCanonicalization" scope="prototype" />
 
     <bean id="InitializeAuthenticationContext"
         class="net.shibboleth.idp.saml.impl.profile.InitializeAuthenticationContext" 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=5625&r1=5624&r2=5625&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 Sat Mar 22 17:03:12 2014
@@ -41,6 +41,26 @@
     
     <action-state id="PopulateBindingAndEndpointContexts">
         <evaluate expression="PopulateBindingAndEndpointContexts" />
+        <transition on="proceed" to="ExtractSubjectFromRequest" />
+    </action-state>
+
+    <!-- Pull SAML Subject if present and turn it into a principal name. -->
+
+    <action-state id="ExtractSubjectFromRequest">
+        <evaluate expression="ExtractSubjectFromRequest" />
+        
+        <!-- No subject to operate on, so just skip to the profile. -->
+        <transition on="NoSubject" to="DoProfileWork" />
+        
+        <transition on="proceed" to="CallSubjectCanonicalization" />
+    </action-state>
+
+    <subflow-state id="CallSubjectCanonicalization" subflow="SubjectC14N/SAML">
+        <transition on="proceed" to="FinalizeSAMLSubjectCanonicalization" />
+    </subflow-state>
+    
+    <action-state id="FinalizeSAMLSubjectCanonicalization">
+        <evaluate expression="FinalizeSAMLSubjectCanonicalization" />
         <transition on="proceed" to="DoProfileWork" />
     </action-state>