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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Sep 24 21:31:17 2015
New Revision: 7778

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7778&view=rev
Log:
Provisional approach to Liberty SSOS delegation flow for "authentication".

This approach just short-circuits the parent SAML 2 SSO flow, skipping the standard authN and c14N flows.
Production of the "authenticated" subject in the PRC->SubjectContext is done internally to the flow, based on
the pre-valied SAML 2 Assertion token.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/FinalizeSAMLTokenProcessing.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessSAML20AssertionWSSToken.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml?rev=7778&r1=7777&r2=7778&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	Thu Sep 24 21:31:17 2015
@@ -158,5 +158,9 @@
     </bean>
     
     <bean id="LibertyOutboundContexts" class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.PopulateOutboundMessageContext" scope="prototype" />
+    
+    <bean id="ProcessSAML20AssertionWSSToken" class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.ProcessSAML20AssertionWSSToken" scope="prototype" />
+    
+    <bean id="FinalizeSAMLTokenProcessing" class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.FinalizeSAMLTokenProcessing" scope="prototype" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml?rev=7778&r1=7777&r2=7778&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml	Thu Sep 24 21:31:17 2015
@@ -47,6 +47,35 @@
         <!-- If parent OutboundContextsAndSecurityParameters' transition changes on 'proceed', this needs to also change. -->
         <transition on="proceed" to="ExtractSubject" />
     </action-state>
+    
+    
+    
+    <action-state id="DoProfileWork">
+        <!-- Here we override, "splice in" actions to run after the this action defined in the parent flow.
+             We also "short-circuit" the entire authN and c14N process defined in the parent flow in favor of simpler inline approach here."  -->
+        <transition on="proceed" to="ProcessSAMLToken" />
+    </action-state>
+    
+    <action-state id="ProcessSAMLToken">
+        <evaluate expression="ProcessSAML20AssertionWSSToken" />
+        
+        <evaluate expression="'proceed'" />
+        
+        <transition on="proceed" to="CallSAMLSubjectCanonicalization" />
+    </action-state>
+    
+    <subflow-state id="CallSAMLSubjectCanonicalization" subflow="c14n/saml">
+        <input name="calledAsSubflow" value="true" />
+        <transition on="proceed" to="FinalizeSAMLTokenProcessing" />
+    </subflow-state>
+    
+    <action-state id="FinalizeSAMLTokenProcessing">
+        <evaluate expression="FinalizeSAMLTokenProcessing" />
+        
+        <evaluate expression="'proceed'" />
+        
+        <transition on="proceed" to="ResolveAttributes" />
+    </action-state>
 
     <bean-import resource="idwsf-ssos-beans.xml" />