Imported Upstream version 2.3+dfsg

[shibboleth/sp.git] / schemas / shibboleth-2.0-native-sp-config.xsd

diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 88befab..411b037 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -8,7 +8,7 @@
        elementFormDefault="qualified"\r
        attributeFormDefault="unqualified"\r
        blockDefault="substitution"\r
-       version="2.2">\r
+       version="2.3">\r
 \r
        <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>\r
        <import namespace="urn:oasis:names:tc:SAML:2.0:protocol" schemaLocation="saml-schema-protocol-2.0.xsd"/>\r
@@ -46,10 +46,10 @@
        \r
        <complexType name="PluggableType">\r
                <sequence>\r
-                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                       <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                </sequence>\r
                <attribute name="type" type="conf:string" use="required"/>\r
-               <anyAttribute namespace="##any" processContents="lax"/>\r
+               <anyAttribute namespace="##any" processContents="skip"/>\r
        </complexType>\r
 \r
        <element name="SPConfig">\r
@@ -83,11 +83,12 @@
                 <element name="RequestMapper" type="conf:PluggableType" minOccurs="0"/>\r
                                <element ref="conf:ApplicationDefaults"/>\r
                                <element ref="conf:SecurityPolicies"/>\r
-                <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>
+                <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r
                        <attribute name="clockSkew" type="unsignedInt"/>\r
-            <attribute name="unsafeChars" type="conf:string"/>
+            <attribute name="unsafeChars" type="conf:string"/>\r
+            <attribute name="allowedSchemes" type="conf:listOfStrings"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -101,11 +102,11 @@
                                <element name="Library" minOccurs="0" maxOccurs="unbounded">\r
                                        <complexType>\r
                                                <sequence>\r
-                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                                       <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                                                </sequence>\r
                                                <attribute name="path" type="anyURI" use="required"/>\r
                                                <attribute name="fatal" type="boolean"/>\r
-                                               <anyAttribute namespace="##any" processContents="lax"/>\r
+                                               <anyAttribute namespace="##any" processContents="skip"/>\r
                                        </complexType>\r
                                </element>\r
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
@@ -121,11 +122,11 @@
                        <complexContent>\r
                                <restriction base="conf:PluggableType">\r
                                        <sequence>\r
-                                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                                        </sequence>\r
                                        <attribute name="id" type="ID" use="required"/>\r
                                        <attribute name="cleanupInterval" type="unsignedInt"/>\r
-                                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                                       <anyAttribute namespace="##any" processContents="skip"/>\r
                                </restriction>\r
                        </complexContent>\r
                </complexType>\r
@@ -139,11 +140,11 @@
                        <complexContent>\r
                                <restriction base="conf:PluggableType">\r
                                        <sequence>\r
-                                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                                        </sequence>\r
                                        <attribute name="StorageService" type="IDREF"/>\r
                                        <attribute name="cacheTimeout" type="unsignedInt"/>\r
-                                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                                       <anyAttribute namespace="##any" processContents="skip"/>\r
                                </restriction>\r
                        </complexContent>\r
                </complexType>\r
@@ -287,10 +288,13 @@
                <attribute name="exportAssertion" type="boolean"/>\r
                <attribute name="redirectToSSL" type="unsignedInt"/>\r
                <attribute name="entityID" type="anyURI"/>\r
+        <attribute name="discoveryURL" type="anyURI"/>\r
                <attribute name="isPassive" type="boolean"/>\r
                <attribute name="forceAuthn" type="boolean"/>\r
                <attribute name="authnContextClassRef" type="anyURI"/>\r
                <attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>\r
+        <attribute name="NameIDFormat" type="anyURI"/>\r
+        <attribute name="SPNameQualifier" type="conf:string"/>\r
         <attribute name="redirectErrors" type="anyURI"/>\r
                <attribute name="sessionError" type="anyURI"/>\r
                <attribute name="metadataError" type="anyURI"/>\r
@@ -530,11 +534,11 @@
                                                <complexContent>\r
                                                        <restriction base="conf:PluggableType">\r
                                                                <sequence>\r
-                                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                                                       <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                                                                </sequence>\r
                                                                <attribute name="Location" type="anyURI" use="required"/>\r
                                                            <attribute name="acl" type="conf:listOfStrings"/>\r
-                                                               <anyAttribute namespace="##any" processContents="lax"/>\r
+                                                               <anyAttribute namespace="##any" processContents="skip"/>\r
                                                        </restriction>\r
                                                </complexContent>\r
                                        </complexType>\r
@@ -576,7 +580,7 @@
                        <complexContent>\r
                                <restriction base="conf:PluggableType">\r
                                        <sequence>\r
-                                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                                        </sequence>\r
                                        <attribute name="Location" type="anyURI"/>\r
                                        <attribute name="id" type="conf:string"/>\r
@@ -589,13 +593,16 @@
                                        <attribute name="template" type="anyURI"/>\r
                                        <attribute name="postArtifact" type="boolean"/>\r
                                        <attribute name="acsByIndex" type="boolean"/>\r
-                                       <attribute name="defaultACSIndex" type="unsignedShort"/>\r
+                    <attribute name="acsIndex" type="unsignedShort"/>\r
+                                       <attribute name="defaultACSIndex" type="unsignedShort"/>   <!-- deprecated -->\r
                     <attribute name="isPassive" type="boolean"/>\r
                     <attribute name="forceAuthn" type="boolean"/>\r
                     <attribute name="authnContextClassRef" type="anyURI"/>\r
                     <attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>\r
+                    <attribute name="NameIDFormat" type="anyURI"/>\r
+                    <attribute name="SPNameQualifier" type="conf:string"/>\r
                     <attribute name="requestDelegation" type="boolean"/>\r
-                                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                                       <anyAttribute namespace="##any" processContents="skip"/>\r
                                </restriction>\r
                        </complexContent>\r
                </complexType>\r
@@ -609,14 +616,14 @@
                        <complexContent>\r
                                <restriction base="conf:PluggableType">\r
                                        <sequence>\r
-                                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                                        </sequence>\r
                                        <attribute name="Location" type="anyURI"/>\r
                                    <attribute name="relayState" type="conf:string"/>\r
                                        <attribute name="outgoingBindings" type="conf:listOfURIs"/>\r
                                        <attribute name="template" type="anyURI"/>\r
                                        <attribute name="postArtifact" type="boolean"/>\r
-                                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                                       <anyAttribute namespace="##any" processContents="skip"/>\r
                                </restriction>\r
                        </complexContent>\r
                </complexType>\r
@@ -628,7 +635,7 @@
                </annotation>\r
                <complexType>\r
                        <sequence>\r
-                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                               <any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
             <attribute name="redirectErrors" type="anyURI"/>\r
                        <attribute name="session" type="anyURI"/>\r
@@ -637,10 +644,11 @@
                        <attribute name="ssl" type="anyURI"/>\r
             <attribute name="localLogout" type="anyURI"/>\r
             <attribute name="globalLogout" type="anyURI"/>\r
+            <attribute name="partialLogout" type="anyURI"/>\r
                        <attribute name="supportContact" type="conf:string"/>\r
                        <attribute name="logoLocation" type="anyURI"/>\r
                        <attribute name="styleSheet" type="anyURI"/>\r
-                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                       <anyAttribute namespace="##any" processContents="skip"/>\r
                </complexType>\r
        </element>\r
 \r
@@ -672,7 +680,7 @@
                                </simpleType>\r
                        </attribute>\r
                        <attribute name="Location" type="anyURI" use="required"/>\r
-                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                       <anyAttribute namespace="##any" processContents="skip"/>\r
                </complexType>\r
        </element>\r
        \r
@@ -693,7 +701,7 @@
                                                </choice>\r
                                                <attribute name="id" type="conf:string" use="required"/>\r
                                                <attribute name="validate" type="boolean"/>\r
-                                               <anyAttribute namespace="##any" processContents="lax"/>\r
+                                               <anyAttribute namespace="##any" processContents="skip"/>\r
                                        </complexType>\r
                                </element>\r
                        </sequence>\r