Port up spoof checking

[shibboleth/sp.git] / schemas / shibboleth.xsd

diff --git a/schemas/shibboleth.xsd b/schemas/shibboleth.xsd
index 5c73ce8..307e3b6 100644 (file)
--- a/schemas/shibboleth.xsd
+++ b/schemas/shibboleth.xsd
@@ -4,14 +4,12 @@
        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
        xmlns:xml="http://www.w3.org/XML/1998/namespace"
        xmlns:shib="urn:mace:shibboleth:1.0"
-       xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
        elementFormDefault="qualified"
        attributeFormDefault="unqualified"
-       version="1.2">
+       version="1.3">
 
     <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
     <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-1.1.xsd"/>
     
     <!-- Status-Related Information -->
     
@@ -56,7 +54,7 @@
                         <extension base="string">
                                <attribute name="Accept" type="boolean" use="optional" default="true"/>
                             <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
-                            <anyAttribute namespace="##any" processContents="lax"/>
+                            <anyAttribute namespace="##other" processContents="lax"/>
                         </extension>
                     </simpleContent>
                        </complexType>
@@ -65,15 +63,16 @@
                        <element name="AnyValue">
                                <complexType>
                                        <sequence/>
-                                       <anyAttribute namespace="##any" processContents="lax"/>
+                                       <anyAttribute namespace="##other" processContents="lax"/>
                                </complexType>
                        </element>
                    <element name="Value" maxOccurs="unbounded">
                        <complexType>
                            <simpleContent>
                                <extension base="string">
+                                                               <attribute name="Accept" type="boolean" use="optional" default="true"/>
                                    <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
-                                   <anyAttribute namespace="##any" processContents="lax"/>
+                                   <anyAttribute namespace="##other" processContents="lax"/>
                                </extension>
                            </simpleContent>
                        </complexType>
@@ -88,7 +87,7 @@
             <complexContent>
                 <extension base="shib:SiteRuleType">
                     <attribute name="Name" type="string" use="required"/>
-                    <anyAttribute namespace="##any" processContents="lax"/>
+                    <anyAttribute namespace="##other" processContents="lax"/>
                 </extension>
             </complexContent>
         </complexType>
@@ -101,10 +100,11 @@
         </sequence>
         <attribute name="Name" type="string" use="required"/>
         <attribute name="Namespace" type="string" use="optional"/>
-        <attribute name="Factory" type="string" use="optional"/>
         <attribute name="Alias" type="string" use="optional"/>
                <attribute name="Header" type="string" use="optional"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+               <attribute name="Scoped" type="boolean" use="optional" default="false"/>
+               <attribute name="CaseSensitive" type="boolean" use="optional" default="true"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
 
     <element name="AttributeRule" type="shib:AttributeRuleType">
@@ -117,9 +117,14 @@
     <element name="AttributeAcceptancePolicy">
         <complexType>
             <sequence>
+                <element name="AnyAttribute" minOccurs="0">
+                    <complexType>
+                       <sequence/>
+                    </complexType>
+                </element>
                 <element ref="shib:AttributeRule" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
-            <anyAttribute namespace="##any" processContents="lax"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
         </complexType>
     </element>
 
@@ -197,11 +202,17 @@
                    <sequence>
                        <element name="HandleService" type="shib:AuthorityType" maxOccurs="unbounded"/>
                        <element name="AttributeAuthority" type="shib:AuthorityType" minOccurs="0" maxOccurs="unbounded"/>
-                       <element name="Domain" type="shib:regexp_string" minOccurs="0" maxOccurs="unbounded"/>
+                       <element ref="shib:Domain" minOccurs="0" maxOccurs="unbounded"/>
                    </sequence>
                </extension>
         </complexContent>
     </complexType>
+       
+       <element name="Domain" type="shib:regexp_string">
+               <annotation>
+                       <documentation xml:lang="en">A metadata extension used to regulate allowable attribute scopes.</documentation>
+               </annotation>
+       </element>
 
     <complexType name="DestinationSiteType">
         <annotation>
@@ -214,7 +225,6 @@
                    <sequence>
                        <element name="AssertionConsumerServiceURL" maxOccurs="unbounded">
                                <complexType>
-                                       <sequence/>
                                        <attribute name="Location" type="string" use="required"/>
                                                <attribute name="Id" type="string" use="optional"/>
                                                <anyAttribute namespace="##any" processContents="lax"/>
@@ -222,7 +232,6 @@
                        </element>
                        <element name="AttributeRequester" maxOccurs="unbounded">
                                <complexType>
-                                       <sequence/>
                                        <attribute name="Name" type="string" use="required"/>
                                                <anyAttribute namespace="##any" processContents="lax"/>
                                </complexType>