[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/post-authn/ idp-conf/src/main/resources/c...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Sep  9 11:40:45 2014
New Revision: 6515

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6515&view=rev
Log:
Checkpoint work on post-authn profile interceptor flow.
Wire master interceptor flow into SAML 2 SSO flow.
Wire user and system post-authn configuration.
Rework calling of subflows after copy from Subject c14n.

Added:
    trunk/idp-conf/src/main/resources/conf/post-authn/
    trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/post-authn/
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/
      - copied from r6514, trunk/idp-conf/src/main/resources/flows/consent/
    trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/post-authn/
    trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/post-authn/post-authn-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/flows/consent/
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-release/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/consent-flow.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/SelectProfileInterceptorFlow.java

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6515&r1=6514&r2=6515&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Tue Sep  9 11:40:45 2014
@@ -41,6 +41,7 @@
     <import resource="services-system.xml" />
     <import resource="saml-binding-config.xml" />
     <import resource="subject-c14n-system.xml" />
+    <import resource="post-authn-system.xml" />
     <import resource="utilities.xml" />
     
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6515&r1=6514&r2=6515&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Tue Sep  9 11:40:45 2014
@@ -75,6 +75,10 @@
         <!-- Standard post-login C14N methods. -->
         <webflow:flow-location id="c14n/simple" path="../system/flows/c14n/simple-subject-c14n-flow.xml" />
         <webflow:flow-location id="c14n/attribute" path="../system/flows/c14n/attribute-sourced-subject-c14n-flow.xml" />
+        
+        <!-- Master post-authn flow. -->
+        <webflow:flow-location id="post-authn.abstract" path="../system/flows/post-authn/post-authn-abstract-flow.xml" />
+        <webflow:flow-location id="post-authn" path="../system/flows/post-authn/post-authn-flow.xml" />
 
         <!--
         Standard SAML C14N methods, including one supporting legacy use of the attribute resolver.

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml?rev=6515&r1=6514&r2=6515&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml Tue Sep  9 11:40:45 2014
@@ -66,15 +66,13 @@
 
     <subflow-state id="DoAttrCheck" subflow="access/attr-check">
         <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="BuildResponse" />
+        <transition on="proceed" to="DoPostAuthnSubflow" />
     </subflow-state>
 
-    <!-- TODO Figure out where to wire in consent flow, here for the time being. 
-    <subflow-state id="Consent" subflow="consent">
+    <subflow-state id="DoPostAuthnSubflow" subflow="post-authn">
         <input name="calledAsSubflow" value="true" />

[... 34 lines stripped ...]