[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-spring/src: main/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jan 19 09:00:23 2014
New Revision: 5214

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5214&view=rev
Log:
IDP-281 Add parsers for AttributeRequesterRegistrationAuthority

and tests

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParserTest.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityOne.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityTwo.xml
Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java?rev=5214&r1=5213&r2=5214&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java Sun Jan 19 09:00:23 2014
@@ -26,7 +26,7 @@
     public static final String NAMESPACE = "urn:mace:shibboleth:2.0:afp:mf:saml";
 
     /** {@inheritDoc} */
-    public void init() {
+    @Override public void init() {
 
         registerBeanDefinitionParser(AttributeIssuerEntityAttributeExactRuleParser.SCHEMA_TYPE,
                 new AttributeIssuerEntityAttributeExactRuleParser());
@@ -53,5 +53,8 @@
                 new AttributeRequesterInEntityGroupRuleParser());
 
         registerBeanDefinitionParser(AttributeInMetadataRuleParser.SCHEMA_TYPE, new AttributeInMetadataRuleParser());
+
+        registerBeanDefinitionParser(RegistrationAuthorityRuleParser.SCHEMA_TYPE, 
+                new RegistrationAuthorityRuleParser());
     }
 }

Modified: trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd?rev=5214&r1=5213&r2=5214&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd (original)
+++ trunk/idp-attribute-filter-spring/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd Sun Jan 19 09:00:23 2014
@@ -215,6 +215,35 @@
                 </attribute>
             </extension>
         </complexContent>
-    </complexType>    
+    </complexType>
+    
+    <complexType name="AttributeRequesterRegistrationAuthority">
+        <annotation>
+            <documentation>
+                A match function that matches the SP (requester) MDRPI against a list of potential values.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:MatchFunctorType">
+                <attribute name="registrars" type="saml:anyURIListType" use="required">
+                    <annotation>
+                        <documentation>The string values to match.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="matchIfMetadataSilent" type="boolean">
+                    <annotation>
+                        <documentation>
+                            A boolean flag indicating whether a match should occur if the metadata does
+                            not contain an MDRPI statement (coded) default is false.
+                        </documentation>
+                    </annotation>
+                </attribute>
+            </extension>
+        </complexContent>
+    </complexType>
+    
+    <simpleType name="anyURIListType">
+        <list itemType="anyURI"/>
+    </simpleType>
     
 </schema>