[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar  4 11:57:20 2013
New Revision: 1057

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1057&view=rev
Log:
SC-186:  AttributeInMetadata rule for the attribute filter

Added:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeInMetadataMatchFunctor.java   (with props)
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeInMetadataMatchFunctorBeanDefinitionParser.java   (with props)
Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/SAMLMatchFunctorNamespaceHandler.java
    branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1057&r1=1056&r2=1057&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Mon Mar  4 11:57:20 2013
@@ -1,6 +1,7 @@
 Changes in Release 1.4.0
 =============================================
 [SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
+[SC-186] -  AttributeInMetadata rule for the attribute filter (copied back from uApprove)
 [SIDP-559] - Attribute queries are ignoring input designators
 [JOST-200] - Reduce memory usage of unit tests
 [JXT-98] -  Add support for configuring PKIX policy checking in the PKIX trust engine 

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/SAMLMatchFunctorNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/SAMLMatchFunctorNamespaceHandler.java?rev=1057&r1=1056&r2=1057&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/SAMLMatchFunctorNamespaceHandler.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/SAMLMatchFunctorNamespaceHandler.java Mon Mar  4 11:57:20 2013
@@ -54,5 +54,8 @@
 
         registerBeanDefinitionParser(AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
                 new AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser());
+        
+        registerBeanDefinitionParser(AttributeInMetadataMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
+                new AttributeInMetadataMatchFunctorBeanDefinitionParser());
     }
 }

Modified: branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd?rev=1057&r1=1056&r2=1057&view=diff
==============================================================================
--- branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd (original)
+++ branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd Mon Mar  4 11:57:20 2013
@@ -188,4 +188,25 @@
             <extension base="afp:MatchFunctorType"/>
         </complexContent>
     </complexType>
+
+    <complexType name="AttributeInMetadata">
+        <annotation>
+            <documentation>
+                A match function that evaluates to true if an attribute (or specific values) is specified by
+                the requesting entity's AttributeConsumingService SP metadata.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:MatchFunctorType">
+                <attribute name="onlyIfRequired" type="boolean">
+                    <annotation>
+                        <documentation>
+                            A boolean flag indicating whether attributes noted as optional should match.
+                        </documentation>
+                    </annotation>
+                </attribute>
+            </extension>
+        </complexContent>
+    </complexType>    
+    
 </schema>