Bypass catch all handlers (upport from branch).

[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 05ffd7e..5352c19 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -207,6 +207,7 @@
                        <attribute name="logger" type="anyURI"/>\r
                        <attribute name="unsetHeaderValue" type="string"/>\r
                        <attribute name="checkSpoofing" type="boolean"/>\r
+                   <attribute name="catchAll" type="boolean"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -275,10 +276,15 @@
                <attribute name="requireSessionWith" type="conf:string"/>\r
                <attribute name="exportAssertion" type="boolean"/>\r
                <attribute name="redirectToSSL" type="unsignedInt"/>\r
+               <attribute name="entityID" 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="sessionError" type="anyURI"/>\r
+               <attribute name="metadataError" type="anyURI"/>\r
+               <attribute name="accessError" type="anyURI"/>\r
+               <attribute name="sslError" type="anyURI"/>\r
                <anyAttribute namespace="##other" processContents="lax"/>\r
        </attributeGroup>\r
        <element name="AccessControlProvider" type="conf:PluggableType"/>\r
@@ -318,6 +324,7 @@
                        <choice minOccurs="0" maxOccurs="unbounded">\r
                                <element ref="conf:Path"/>\r
                                <element ref="conf:PathRegex"/>\r
+                               <element ref="conf:Query"/>\r
                        </choice>\r
                </sequence>\r
                <attribute name="scheme">\r
@@ -349,6 +356,7 @@
                                <choice minOccurs="0" maxOccurs="unbounded">\r
                                        <element ref="conf:Path"/>\r
                                        <element ref="conf:PathRegex"/>\r
+                                       <element ref="conf:Query"/>\r
                                </choice>\r
                        </sequence>\r
                        <attribute name="regex" type="conf:string" use="required"/>\r
@@ -369,6 +377,7 @@
                        <choice minOccurs="0" maxOccurs="unbounded">\r
                                <element ref="conf:Path"/>\r
                                <element ref="conf:PathRegex"/>\r
+                               <element ref="conf:Query"/>\r
                        </choice>\r
                </sequence>\r
                        <attribute name="name" type="conf:string" use="required"/>\r
@@ -385,6 +394,7 @@
                                        <element ref="conf:AccessControl"/>\r
                                        <element ref="conf:AccessControlProvider"/>\r
                                </choice>\r
+                               <element ref="conf:Query" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="regex" type="conf:string" use="required"/>\r
                        <attribute name="ignoreCase" type="boolean" default="true"/>\r
@@ -393,6 +403,22 @@
                </complexType>\r
        </element>\r
        \r
+       <element name="Query">\r
+               <complexType>\r
+                       <sequence>\r
+                               <choice minOccurs="0">\r
+                                       <element ref="conf:htaccess"/>\r
+                                       <element ref="conf:AccessControl"/>\r
+                                       <element ref="conf:AccessControlProvider"/>\r
+                               </choice>\r
+                               <element ref="conf:Query" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+                       <attribute name="name" type="conf:string" use="required"/>\r
+                       <attribute name="regex" type="conf:string"/>\r
+                       <attributeGroup ref="conf:ContentSettings"/>\r
+               </complexType>\r
+       </element>\r
+       \r
        <element name="Applications">\r
                <annotation>\r
                        <documentation>Container for global settings and application-specific overrides</documentation>\r
@@ -450,6 +476,7 @@
                <attribute name="homeURL" type="anyURI" default="/"/>\r
                <attribute name="REMOTE_USER" type="conf:listOfStrings"/>\r
                <attribute name="unsetHeaders" type="conf:listOfStrings"/>\r
+               <attribute name="metadataAttributePrefix" type="conf:string"/>\r
                <attribute name="redirectErrors" type="anyURI"/>\r
                <attribute name="localLogout" type="anyURI"/>\r
                <attribute name="globalLogout" type="anyURI"/>\r
@@ -475,6 +502,7 @@
                                                                        <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                                                                </sequence>\r
                                                                <attribute name="Location" type="anyURI" use="required"/>\r
+                                                               <anyAttribute namespace="##any" processContents="lax"/>\r
                                                        </restriction>\r
                                                </complexContent>\r
                                        </complexType>\r
@@ -560,7 +588,6 @@
                        </sequence>\r
                        <attribute name="session" type="anyURI" use="required"/>\r
                        <attribute name="metadata" type="anyURI"/>\r
-                       <attribute name="rm" type="anyURI"/>\r
                        <attribute name="access" type="anyURI"/>\r
                        <attribute name="ssl" type="anyURI"/>\r
                        <attribute name="supportContact" type="conf:string"/>\r
@@ -613,12 +640,10 @@
                <attribute name="authType" type="conf:string"/>\r
                <attribute name="authUsername" type="conf:string"/>\r
                <attribute name="authPassword" type="conf:string"/>\r
-               <attribute name="signRequests" type="conf:bindingBoolean"/>\r
-               <attribute name="signResponses" type="conf:bindingBoolean"/>\r
-               <attribute name="signatureAlg" type="anyURI"/>\r
+               <attribute name="signing" type="conf:bindingBoolean"/>\r
+               <attribute name="signingAlg" type="anyURI"/>\r
                <attribute name="digestAlg" type="anyURI"/>\r
-               <attribute name="encryptRequests" type="conf:bindingBoolean"/>\r
-               <attribute name="encryptResponses" type="conf:bindingBoolean"/>\r
+               <attribute name="encryption" type="conf:bindingBoolean"/>\r
                <attribute name="encryptionAlg" type="anyURI"/>\r
                <attribute name="keyName" type="conf:string"/>\r
                <attribute name="artifactEndpointIndex" type="unsignedShort"/>\r
@@ -636,6 +661,7 @@
                                        </annotation>\r
                                        <complexType>\r
                                                <sequence>\r
+                                                       <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>\r
                                                        <element name="Rule" type="conf:PluggableType" minOccurs="1" maxOccurs="unbounded"/>\r
                                                </sequence>\r
                                                <attribute name="id" type="conf:string" use="required"/>\r
@@ -652,5 +678,19 @@
                        </sequence>\r
                </complexType>\r
        </element>\r
+\r
+       <element name="TransportOption">\r
+               <annotation>\r
+                       <documentation>Implementation-specific option to pass to SOAPTransport provider.</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <simpleContent>\r
+                               <extension base="anySimpleType">\r
+                                       <attribute name="provider" type="conf:string" use="required"/>\r
+                                       <attribute name="option" type="conf:string" use="required"/>\r
+                               </extension>\r
+                       </simpleContent>\r
+               </complexType>\r
+       </element>\r
        \r
 </schema>\r