[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/resources/conf/metadata-providers.xml idp-profile-spring...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec  7 16:28:20 2014
New Revision: 7051

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7051&view=rev
Log:
OSJ-14 -  Metadata filter that can add EntityAttribute tags

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityAttributesFilterParser.java   (with props)
Modified:
    trunk/idp-conf/src/test/resources/conf/metadata-providers.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-conf/src/test/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/conf/metadata-providers.xml?rev=7051&r1=7050&r2=7051&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/conf/metadata-providers.xml (original)
+++ trunk/idp-conf/src/test/resources/conf/metadata-providers.xml Sun Dec  7 16:28:20 2014
@@ -3,10 +3,13 @@
 <MetadataProvider id="ShibbolethMetadata" xsi:type="ChainingMetadataProvider"
 	xmlns="urn:mace:shibboleth:2.0:metadata" xmlns:resource="urn:mace:shibboleth:2.0:resource"
 	xmlns:security="urn:mace:shibboleth:2.0:security"
-	xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
                         urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd 
                         urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
+                        urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
                         urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
                         
 	<!-- ========================================== -->
@@ -29,7 +32,17 @@
             </PublicKey>
         </MetadataFilter>
         <MetadataFilter xsi:type="EntityRoleWhiteList">
-            <RetainedRole>samlmd:SPSSODescriptor</RetainedRole>
+            <RetainedRole>md:SPSSODescriptor</RetainedRole>
+        </MetadataFilter>
+        <MetadataFilter xsi:type="EntityAttributes">
+            <saml:Attribute Name="https://sp.example.org/tagname">
+                <saml:AttributeValue>foo</saml:AttributeValue>
+            </saml:Attribute>
+            <saml:Attribute Name="https://sp.example.org/tagname2">
+                <saml:AttributeValue>foo</saml:AttributeValue>
+                <saml:AttributeValue>bar</saml:AttributeValue>
+            </saml:Attribute>
+            <Entity>https://sp.example.org</Entity>
         </MetadataFilter>
         <MetadataResource xsi:type="resource:ClasspathResource" file="/metadata/example-metadata.xml" />
     </MetadataProvider>

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java?rev=7051&r1=7050&r2=7051&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java Sun Dec  7 16:28:20 2014
@@ -22,6 +22,7 @@
 import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.ChainingParser;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.EntitiesDescriptorNameParser;
+import net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.EntityAttributesFilterParser;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.EntityRoleFilterParser;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.KeyAuthorityParser;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.NodeProcessingParser;
@@ -69,6 +70,7 @@
         // Filters
         registerBeanDefinitionParser(RequiredValidUntilParser.TYPE_NAME, new RequiredValidUntilParser());
         registerBeanDefinitionParser(ChainingParser.TYPE_NAME, new ChainingParser());
+        registerBeanDefinitionParser(EntityAttributesFilterParser.TYPE_NAME, new EntityAttributesFilterParser());

[... 118 lines stripped ...]