Imported Upstream version 2.2.1+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 f9950db..88befab 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.1">\r
+       version="2.2">\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
@@ -87,6 +87,7 @@
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r
                        <attribute name="clockSkew" type="unsignedInt"/>\r
+            <attribute name="unsafeChars" type="conf:string"/>
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -199,9 +200,10 @@
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r
-                       <attribute name="unsetHeaderValue" type="string"/>\r
+                       <attribute name="unsetHeaderValue" type="conf:string"/>\r
                        <attribute name="checkSpoofing" type="boolean"/>\r
-                   <attribute name="catchAll" type="boolean"/>\r
+                       <attribute name="spoofKey" type="conf:string"/>\r
+                       <attribute name="catchAll" type="boolean"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -224,6 +226,7 @@
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="normalizeRequest" type="boolean"/>\r
+                       <attribute name="safeHeaderNames" type="boolean"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -293,6 +296,7 @@
                <attribute name="metadataError" type="anyURI"/>\r
                <attribute name="accessError" type="anyURI"/>\r
                <attribute name="sslError" type="anyURI"/>\r
+        <attribute name="REMOTE_ADDR" type="conf:string"/>\r
                <anyAttribute namespace="##other" processContents="lax"/>\r
        </attributeGroup>\r
        <element name="AccessControlProvider" type="conf:PluggableType"/>\r
@@ -536,7 +540,7 @@
                                        </complexType>\r
                                </element>\r
                        </choice>\r
-                       <attribute name="handlerURL" type="anyURI"/>\r
+                       <attribute name="handlerURL" type="anyURI" use="required"/>\r
                        <attribute name="handlerSSL" type="boolean"/>\r
                        <attribute name="exportLocation" type="conf:string"/>\r
                        <attribute name="exportACL" type="conf:listOfStrings"/>\r
@@ -550,6 +554,10 @@
                    <attribute name="maxTimeSinceAuthn" type="unsignedInt"/>\r
                        <attribute name="checkAddress" type="boolean"/>\r
                        <attribute name="consistentAddress" type="boolean"/>\r
+                       <attribute name="postData" type="conf:string"/>\r
+            <attribute name="postLimit" type="positiveInteger"/>\r
+                       <attribute name="postTemplate" type="conf:string"/>\r
+            <attribute name="postExpire" type="boolean"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -586,6 +594,7 @@
                     <attribute name="forceAuthn" type="boolean"/>\r
                     <attribute name="authnContextClassRef" type="anyURI"/>\r
                     <attribute name="authnContextComparison" type="samlp:AuthnContextComparisonType"/>\r
+                    <attribute name="requestDelegation" type="boolean"/>\r
                                        <anyAttribute namespace="##any" processContents="lax"/>\r
                                </restriction>\r
                        </complexContent>\r
@@ -678,9 +687,10 @@
                                                <documentation>Specifies a set of SecurityPolicyRule plugins</documentation>\r
                                        </annotation>\r
                                        <complexType>\r
-                                               <sequence>\r
+                                               <choice>\r
                                                        <element name="Rule" type="conf:PluggableType" minOccurs="1" maxOccurs="unbounded"/>\r
-                                               </sequence>\r
+                            <element name="PolicyRule" type="conf:PluggableType" minOccurs="1" maxOccurs="unbounded"/>\r
+                                               </choice>\r
                                                <attribute name="id" type="conf:string" use="required"/>\r
                                                <attribute name="validate" type="boolean"/>\r
                                                <anyAttribute namespace="##any" processContents="lax"/>\r