[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: flows/access/ flows/access/attr-check/ flows/a...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun  5 11:08:14 2014
New Revision: 6049

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6049&view=rev
Log:
Exit flow to look at attribute release set before proceeding with response.

Added:
    trunk/idp-conf/src/main/resources/flows/access/
    trunk/idp-conf/src/main/resources/flows/access/attr-check/
    trunk/idp-conf/src/main/resources/flows/access/attr-check/attr-check-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml?rev=6049&r1=6048&r2=6049&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml Thu Jun  5 11:08:14 2014
@@ -26,13 +26,23 @@
 
     <subflow-state id="DoAuthenticationSubflow" subflow="authn">
         <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="DoProfileWorkAfterLogin" />
+        <transition on="proceed" to="AttributeResolution" />
+    </subflow-state>
+    
+    <action-state id="AttributeResolution">
+        <evaluate expression="ResolveAttributes" />
+        <evaluate expression="FilterAttributes" />
+        <evaluate expression="'proceed'" />
+        
+        <transition on="proceed" to="DoAttrCheck" />
+    </action-state>
+
+    <subflow-state id="DoAttrCheck" subflow="access/attr-check">
+        <input name="calledAsSubflow" value="true" />
+        <transition on="proceed" to="BuildResponse" />
     </subflow-state>
 
-    <action-state id="DoProfileWorkAfterLogin">
-        <evaluate expression="ResolveAttributes" />
-        <evaluate expression="FilterAttributes" />
-
+    <action-state id="BuildResponse">
         <evaluate expression="AddResponseShell" />
         <evaluate expression="AddInResponseToToResponse" />
 

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=6049&r1=6048&r2=6049&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 Thu Jun  5 11:08:14 2014
@@ -23,13 +23,23 @@
     
     <subflow-state id="DoAuthenticationSubflow" subflow="authn">
         <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="DoProfileWorkAfterLogin" />
+        <transition on="proceed" to="AttributeResolution" />
+    </subflow-state>
+    
+    <action-state id="AttributeResolution">
+        <evaluate expression="ResolveAttributes" />
+        <evaluate expression="FilterAttributes" />
+        <evaluate expression="'proceed'" />
+        
+        <transition on="proceed" to="DoAttrCheck" />
+    </action-state>
+
+    <subflow-state id="DoAttrCheck" subflow="access/attr-check">
+        <input name="calledAsSubflow" value="true" />
+        <transition on="proceed" to="BuildResponse" />
     </subflow-state>
 
-    <action-state id="DoProfileWorkAfterLogin">
-        <evaluate expression="ResolveAttributes" />
-        <evaluate expression="FilterAttributes" />
-
+    <action-state id="BuildResponse">
         <evaluate expression="AddResponseShell" />
         <evaluate expression="AddInResponseToToResponse" />