[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/config/conf/attribute-filter-service.xml src/main/config/conf/a...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov 14 17:14:48 2013
New Revision: 51

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=51&view=rev
Log:
Wire up the attribute filter. Some filter rules do not work due to context navigation assumptions, TODO.

Added:
    trunk/src/main/config/conf/attribute-filter-service.xml   (with props)
    trunk/src/main/config/conf/attribute-filter.xml   (with props)
Modified:
    trunk/pom.xml
    trunk/src/main/config/conf/global-user.xml
    trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml
    trunk/src/main/config/system/flows/saml2/sso-abstract-flow.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=51&r1=50&r2=51&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Nov 14 17:14:48 2013
@@ -41,6 +41,12 @@
         <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-profile-impl</artifactId>
+            <version>${idp.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-attribute-filter-spring</artifactId>
             <version>${idp.version}</version>
         </dependency>
 

Modified: trunk/src/main/config/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/global-user.xml?rev=51&r1=50&r2=51&view=diff
==============================================================================
--- trunk/src/main/config/conf/global-user.xml (original)
+++ trunk/src/main/config/conf/global-user.xml Thu Nov 14 17:14:48 2013
@@ -17,5 +17,6 @@
     <import resource="authn-comparison.xml" />
     <import resource="authn-flow-descriptors.xml" />
     <import resource="attribute-resolver-service.xml" />
+    <import resource="attribute-filter-service.xml" />
      
 </beans>

Modified: trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml?rev=51&r1=50&r2=51&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml Thu Nov 14 17:14:48 2013
@@ -163,6 +163,10 @@
     <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" >
        <constructor-arg ref="shibboleth.AttributeResolver"/>
     </bean>
+    
+    <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes" >
+       <constructor-arg ref="shibboleth.AttributeFilter"/>
+    </bean>
 
     <!-- TODO replace responderId "https://idp.example.org" with something else -->
     <bean id="ActivatedRelyingPartyConfiguration" class="net.shibboleth.idp.relyingparty.impl.ActivatedRelyingPartyConfiguration">

Modified: trunk/src/main/config/system/flows/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/saml2/sso-abstract-flow.xml?rev=51&r1=50&r2=51&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/saml2/sso-abstract-flow.xml (original)
+++ trunk/src/main/config/system/flows/saml2/sso-abstract-flow.xml Thu Nov 14 17:14:48 2013
@@ -66,6 +66,11 @@
     
     <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="BuildResponse"/>
     </action-state>