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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 17:21:06 2014
New Revision: 5224

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5224&view=rev
Log:
SAML1 flow attribute resolution and filtering.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5224&r1=5223&r2=5224&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Tue Jan 21 17:21:06 2014
@@ -70,6 +70,17 @@
         class="net.shibboleth.idp.saml.impl.profile.InitializeAuthenticationContext"
         scope="prototype" />
 
+    <!-- TODO make constructor arg names consistent for resolution and filtering -->
+    <bean
+        id="ResolveAttributes"
+        class="net.shibboleth.idp.profile.impl.ResolveAttributes"
+        c:resolverService-ref="shibboleth.AttributeResolverService" />
+
+    <bean
+        id="FilterAttributes"
+        class="net.shibboleth.idp.profile.impl.FilterAttributes"
+        c:service-ref="shibboleth.AttributeFilterService" />
+
     <bean
         id="RecordResponseComplete"
         class="net.shibboleth.idp.profile.impl.RecordResponseComplete" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml?rev=5224&r1=5223&r2=5224&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml Tue Jan 21 17:21:06 2014
@@ -36,16 +36,29 @@
         <evaluate expression="SelectProfileConfiguration" />
         <transition on="proceed" to="InitializeAuthenticationContext" />
     </action-state>
-    
+
     <action-state id="InitializeAuthenticationContext">
         <evaluate expression="InitializeAuthenticationContext" />
         <transition on="proceed" to="DoAuthenticationSubflow" />
     </action-state>
-    
+
     <subflow-state id="DoAuthenticationSubflow" subflow="Authentication">
+        <transition on="proceed" to="ResolveAttributes" />
+        <!-- TODO
+        <transition on="#{true}" to="BuildResponse" />
+        -->
+        <transition on="#{true}" to="ResolveAttributes" />
+    </subflow-state>
+
+    <action-state id="ResolveAttributes">
+        <evaluate expression="ResolveAttributes" />
+        <transition on="proceed" to="FilterAttributes" />
+    </action-state>
+
+    <action-state id="FilterAttributes">
+        <evaluate expression="FilterAttributes" />
         <transition on="proceed" to="RecordResponseComplete" />
-        <transition on="#{true}" to="RecordResponseComplete" />
-    </subflow-state>
+    </action-state>
 
     <!-- TODO actions -->