[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jun 15 05:40:19 2014
New Revision: 6087

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6087&view=rev
Log:
IDP-376 Wire the AttributeMappingNodeProcessor into the metadata filter.  Add EntityAttribute and RequestedAttributes to the example metadata

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/NodeProcessingAttachingBeanPostProcessor.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java?rev=6087&r1=6086&r2=6087&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java Sun Jun 15 05:40:19 2014
@@ -127,5 +127,5 @@
         attr = attribute.iterator().next();
         Assert.assertTrue(attr.getValues().isEmpty());
         Assert.assertFalse(attr.getIsRequired());
+    }
 }
-}

Modified: trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/metadata/example-metadata.xml?rev=6087&r1=6086&r2=6087&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Sun Jun 15 05:40:19 2014
@@ -1,4 +1,17 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://sp.example.org">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
+                  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+                  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+                  xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+                  entityID="https://sp.example.org">
+    <Extensions>
+	    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+	        <saml:Attribute Name="http://macedir.org/entity-category"
+	            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+	            <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship
+	            </saml:AttributeValue>
+	        </saml:Attribute>
+	    </mdattr:EntityAttributes>
+    </Extensions>
     <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="false">
         <Extensions>
             <mdui:UIInfo>
@@ -76,6 +89,14 @@
         
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://localhost:8443/sp/SAML1/POST/ACS" index="10"/>
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost:8443/sp/SAML1/Artifact/ACS" index="11"/>
+        <AttributeConsumingService isDefault="true" index="1">
+            <RequestedAttribute FriendlyName="displayName"
+                Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
+            <RequestedAttribute FriendlyName="displayName" isRequired="true"
+                Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
+            <RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" />
+        </AttributeConsumingService>
         
     </SPSSODescriptor>
     <Organization>

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=6087&r1=6086&r2=6087&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 Sun Jun 15 05:40:19 2014
@@ -54,6 +54,7 @@
         p:reloadTaskTimer="shibboleth.TaskTimer" />
     
     <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"

[... 126 lines stripped ...]