[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/services-system.xml idp-conf/src/m...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 13 11:48:14 2014
New Revision: 6893

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6893&view=rev
Log:
IDP-418 - fix some bugs, implement AttributeDesignator filtering in query flow

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeDesignatorMapper.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeDesignatorsMapper.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeMapper.java

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=6893&r1=6892&r2=6893&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml Thu Nov 13 11:48:14 2014
@@ -115,4 +115,12 @@
         class="net.shibboleth.utilities.java.support.security.DelegatingAccessControlService"
         c:acService-ref="shibboleth.ReloadableAccessControlService" />
 
+    <bean id="shibboleth.SAML1AttributeDesignatorsMapperService"
+        class="net.shibboleth.idp.saml.attribute.mapping.impl.SAML1AttributeDesignatorsMapperService"
+        c:resolverService-ref="shibboleth.AttributeResolverService" />
+
+    <bean id="shibboleth.SAML2AttributesMapperService"
+        class="net.shibboleth.idp.saml.attribute.mapping.impl.SAML2AttributesMapperService"
+        c:resolverService-ref="shibboleth.AttributeResolverService" />
+
  </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=6893&r1=6892&r2=6893&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Thu Nov 13 11:48:14 2014
@@ -205,6 +205,10 @@
     <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes" scope="prototype"
         c:filterService-ref="shibboleth.AttributeFilterService" />
 
+    <bean id="FilterByQueriedAttributeDesignators"
+        class="net.shibboleth.idp.saml.saml1.profile.impl.FilterByQueriedAttributeDesignators" scope="prototype"
+        c:mapper-ref="shibboleth.SAML1AttributeDesignatorsMapperService" />
+
     <bean id="PopulatePostAuthnInterceptContext"
             class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
             p:availableFlows-ref="shibboleth.AvailableInterceptFlows">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml?rev=6893&r1=6892&r2=6893&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml Thu Nov 13 11:48:14 2014
@@ -17,6 +17,7 @@
     <action-state id="DoProfileWork">
         <evaluate expression="ResolveAttributes" />
         <evaluate expression="FilterAttributes" />
+        <evaluate expression="FilterByQueriedAttributeDesignators" />
 
         <evaluate expression="AddResponseShell" />
         <evaluate expression="AddInResponseToToResponse" />

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java?rev=6893&r1=6892&r2=6893&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java (original)

[... 151 lines stripped ...]