Use shibboleth-sp as package name for compatibility.

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

diff --git a/schemas/shibboleth.xsd b/schemas/shibboleth.xsd
index e30d295..307e3b6 100644 (file)
--- a/schemas/shibboleth.xsd
+++ b/schemas/shibboleth.xsd
@@ -6,12 +6,11 @@
        xmlns:shib="urn:mace:shibboleth:1.0"
        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"/>
     
-    
     <!-- Status-Related Information -->
     
     <!--
@@ -21,16 +20,20 @@
             Used with samlp:Requester, signals AA did not recognize handle as valid
     -->
 
-    <!-- Relaxes SAML AttributeValue type definition -->
+    <!--
+    Relaxes SAML AttributeValue type definition. Xerces-C has a bug that prevents
+    anyAttribute content appearing on anyType. It works in 2.2 but not in later versions.
+    -->
 
        <complexType name="AttributeValueType" mixed="true">
                <annotation>
-                       <documentation xml:lang="en">By convention, all Shibboleth attribute values carry this unconstrained xsi:type.</documentation>
+                       <documentation xml:lang="en">
+                       By convention, all Shibboleth 1.1 origin attribute values carry this unconstrained xsi:type.
+                       </documentation>
                </annotation>
-               <sequence>
-                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-               <anyAttribute namespace="##any" processContents="lax"/>
+               <complexContent>
+                       <extension base="anyType"/>
+               </complexContent>
        </complexType>
     
     <!-- Attribute Acceptance Policies -->
@@ -51,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>
@@ -60,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>
@@ -83,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>
@@ -96,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">
@@ -112,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>
 
@@ -192,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>
@@ -207,7 +223,19 @@
         <complexContent>
                <extension base="shib:SiteType">
                    <sequence>
-                       <element name="AttributeRequester" type="shib:AuthorityType" maxOccurs="unbounded"/>
+                       <element name="AssertionConsumerServiceURL" maxOccurs="unbounded">
+                               <complexType>
+                                       <attribute name="Location" type="string" use="required"/>
+                                               <attribute name="Id" type="string" use="optional"/>
+                                               <anyAttribute namespace="##any" processContents="lax"/>
+                               </complexType>
+                       </element>
+                       <element name="AttributeRequester" maxOccurs="unbounded">
+                               <complexType>
+                                       <attribute name="Name" type="string" use="required"/>
+                                               <anyAttribute namespace="##any" processContents="lax"/>
+                               </complexType>
+                       </element>
                    </sequence>
                </extension>
         </complexContent>