[cpp-sp COMMIT] in /branches/REL_2: schemas/shibboleth-2.0-afp-mf-saml.xsd shibsp/Makefile.am shibsp/attribute/filter...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 29 20:25:25 2012
New Revision: 3584

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3584&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-342

Added:
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeIssuerEntityAttributeFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeIssuerEntityMatcherFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeRequesterEntityAttributeFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeRequesterEntityMatcherFunctor.cpp
Modified:
    branches/REL_2/schemas/shibboleth-2.0-afp-mf-saml.xsd
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/attribute/filtering/MatchFunctor.h
    branches/REL_2/shibsp/attribute/filtering/impl/MatchFunctor.cpp
    branches/REL_2/shibsp/shibsp.vcxproj
    branches/REL_2/shibsp/shibsp.vcxproj.filters

Modified: branches/REL_2/schemas/shibboleth-2.0-afp-mf-saml.xsd
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/schemas/shibboleth-2.0-afp-mf-saml.xsd?rev=3584&r1=3583&r2=3584&view=diff
==============================================================================
--- branches/REL_2/schemas/shibboleth-2.0-afp-mf-saml.xsd (original)
+++ branches/REL_2/schemas/shibboleth-2.0-afp-mf-saml.xsd Wed Feb 29 20:25:25 2012
@@ -1,16 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<schema targetNamespace="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:afp="urn:mace:shibboleth:2.0:afp" version="2.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:afp="urn:mace:shibboleth:2.0:afp" targetNamespace="urn:mace:shibboleth:2.0:afp:mf:saml" elementFormDefault="qualified">
 
     <import namespace="urn:mace:shibboleth:2.0:afp" schemaLocation="classpath:/schema/shibboleth-2.0-afp.xsd" />
 
     <annotation>
         <documentation>
-            A set of SAML specific match functions. These match functions only operate against a SAMLFilterContext.
+          A set of SAML specific match functions. These match functions only operate against a
+          SAMLFilterContext.
         </documentation>
     </annotation>
 
+    <complexType name="AttributeIssuerEntityAttributeExactMatch">
+        <annotation>
+            <documentation>
+                A match function that checks if the attribute issuer contains an entity attribute with the
+                specified value.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="saml:EntityAttributeExactMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="AttributeRequesterEntityAttributeExactMatch">
+        <annotation>
+            <documentation>
+                A match function that checks if the attribute requester contains an entity attribute with the
+                specified value.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="saml:EntityAttributeExactMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="EntityAttributeExactMatchType" abstract="true">
+        <complexContent>
+            <extension base="afp:MatchFunctorType">
+                <attribute name="attributeName" type="string" use="required">
+                    <annotation>
+                        <documentation>The name of the entity attribute to match.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="attributeNameFormat" type="string" use="optional">
+                    <annotation>
+                        <documentation>The name format of the entity attribute to match.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="attributeValue" type="string" use="required">
+                    <annotation>
+                        <documentation>The value of the entity attribute to match.</documentation>
+                    </annotation>
+                </attribute>
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <complexType name="AttributeIssuerEntityAttributeRegexMatch">
+        <annotation>
+            <documentation>
+                A match function that checks if the attribute issuer contains an entity attribute with a
+                value that matches the given regular expression.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="saml:EntityAttributeRegexMatchType"/>
+        </complexContent>
+    </complexType>
+
+    <complexType name="AttributeRequesterEntityAttributeRegexMatch">
+        <annotation>
+            <documentation>
+                A match function that checks if the attribute requester contains an entity attribute with a
+                value that matches the given regular expression.
+            </documentation>
+        </annotation>

[... 329 lines stripped ...]