projects / shibboleth / sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Moved logout templates to Errors tag.
[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 7c8f170..54d9b3a 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -61,6 +61,26 @@
                                <element ref="conf:Extensions" minOccurs="0"/>\r
                                <element ref="conf:OutOfProcess"/>\r
                                <element ref="conf:InProcess"/>\r
+                <choice minOccurs="0">\r
+                    <element name="UnixListener">\r
+                        <complexType>\r
+                            <attribute name="address" type="conf:string" use="required"/>\r
+                        </complexType>\r
+                    </element>\r
+                    <element name="TCPListener">\r
+                        <complexType>\r
+                            <attribute name="address" type="conf:string" use="required"/>\r
+                            <attribute name="port" type="unsignedInt" use="required"/>\r
+                            <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>\r
+                        </complexType>\r
+                    </element>\r
+                    <element name="Listener" type="conf:PluggableType"/>\r
+                </choice>\r
+                <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>\r
+                <element ref="conf:SessionCache" minOccurs="0"/>\r
+                <element ref="conf:ReplayCache" minOccurs="0"/>\r
+                <element ref="conf:ArtifactMap" minOccurs="0"/>\r
+                <element name="RequestMapper" type="conf:PluggableType" minOccurs="0"/>\r
                                <element ref="conf:Applications"/>\r
                                <element ref="conf:SecurityPolicies"/>\r
                        </sequence>\r
@@ -151,33 +171,15 @@
        \r
        <element name="OutOfProcess">\r
                <annotation>\r
-                       <documentation>Container for shibd out-of-process configuration</documentation>\r
+                       <documentation>Container for out-of-process (shibd) configuration</documentation>\r
                </annotation>\r
                <complexType>\r
                        <sequence>\r
                                <element ref="conf:Extensions" minOccurs="0"/>\r
-                               <choice>\r
-                                       <element name="UnixListener">\r
-                                               <complexType>\r
-                                                       <attribute name="address" type="conf:string" use="required"/>\r
-                                               </complexType>\r
-                                       </element>\r
-                                       <element name="TCPListener">\r
-                                               <complexType>\r
-                                                       <attribute name="address" type="conf:string" use="required"/>\r
-                                                       <attribute name="port" type="unsignedInt" use="required"/>\r
-                                                       <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>\r
-                                               </complexType>\r
-                                       </element>\r
-                                       <element name="Listener" type="conf:PluggableType"/>\r
-                               </choice>\r
-                               <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>\r
-                               <element ref="conf:SessionCache" minOccurs="0"/>\r
-                               <element ref="conf:ReplayCache" minOccurs="0"/>\r
-                               <element ref="conf:ArtifactMap" minOccurs="0"/>\r
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r
+                   <attribute name="catchAll" type="boolean"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -192,21 +194,13 @@
                <complexType>\r
                        <sequence>\r
                                <element ref="conf:Extensions" minOccurs="0"/>\r
-                               <element ref="conf:SessionCache" minOccurs="0"/>\r
-                               <element name="RequestMapper" type="conf:PluggableType"/>\r
-                               <element name="Implementation" minOccurs="0">\r
-                                       <complexType>\r
-                                               <sequence>\r
-                                                       <element ref="conf:ISAPI" minOccurs="0"/>\r
-                                                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
-                                               </sequence>\r
-                                       </complexType>\r
-                               </element>\r
+                               <element ref="conf:ISAPI" minOccurs="0"/>\r
                                <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="checkSpoofing" type="boolean"/>\r
+                   <attribute name="catchAll" type="boolean"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -249,6 +243,7 @@
                        <element ref="conf:OR"/>\r
                        <element ref="conf:NOT"/>\r
                        <element ref="conf:Rule"/>\r
+                   <element ref="conf:RuleRegex"/>\r
                </choice>\r
        </complexType>\r
        <complexType name="MultiOperatorType">\r
@@ -257,6 +252,7 @@
                        <element ref="conf:OR"/>\r
                        <element ref="conf:NOT"/>\r
                        <element ref="conf:Rule"/>\r
+                   <element ref="conf:RuleRegex"/>\r
                </choice>\r
        </complexType>\r
        <element name="Rule">\r
@@ -264,10 +260,21 @@
                        <simpleContent>\r
                                <extension base="conf:listOfStrings">\r
                                        <attribute name="require" type="conf:string" use="required"/>\r
+                                   <attribute name="list" type="boolean"/>\r
                                </extension>\r
                        </simpleContent>\r
                </complexType>\r
        </element>\r
+    <element name="RuleRegex">\r
+        <complexType>\r
+            <simpleContent>\r
+                <extension base="conf:string">\r
+                    <attribute name="require" type="conf:string" use="required"/>\r
+                    <attribute name="ignoreCase" type="boolean"/>\r
+                </extension>\r
+            </simpleContent>\r
+        </complexType>\r
+    </element>\r
        \r
        <attributeGroup name="ContentSettings">\r
                <attribute name="authType" type="conf:string"/>\r
@@ -275,10 +282,16 @@
                <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="redirectErrors" type="anyURI"/>\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 +331,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 +363,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 +384,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 +401,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 +410,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
@@ -401,7 +434,7 @@
                        <sequence>\r
                                <element ref="conf:Sessions"/>\r
                                <element ref="conf:Errors" minOccurs="0"/>\r
-                               <element ref="conf:DefaultRelyingParty"/>\r
+                               <element ref="conf:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>\r
                                <element ref="conf:Notify" minOccurs="0" maxOccurs="unbounded"/>\r
                                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>\r
                 <element name="MetadataProvider" type="conf:PluggableType"/>\r
@@ -416,6 +449,7 @@
                        <attribute name="entityID" type="anyURI" use="required"/>\r
                        <attribute name="policyId" type="conf:string" use="required"/>\r
                        <attributeGroup ref="conf:ApplicationGroup"/>\r
+                   <attributeGroup ref="conf:RelyingPartyGroup"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -428,7 +462,7 @@
                        <sequence>\r
                                <element ref="conf:Sessions" minOccurs="0"/>\r
                                <element ref="conf:Errors" minOccurs="0"/>\r
-                               <element ref="conf:DefaultRelyingParty" minOccurs="0"/>\r
+                               <element ref="conf:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>\r
                                <element ref="conf:Notify" minOccurs="0" maxOccurs="unbounded"/>\r
                                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>\r
                                <element name="MetadataProvider" type="conf:PluggableType" minOccurs="0"/>\r
@@ -442,6 +476,7 @@
                        <attribute name="entityID" type="anyURI"/>\r
                        <attribute name="policyId" type="conf:string"/>\r
                        <attributeGroup ref="conf:ApplicationGroup"/>\r
+                   <attributeGroup ref="conf:RelyingPartyGroup"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -450,11 +485,29 @@
                <attribute name="homeURL" type="anyURI" default="/"/>\r
                <attribute name="REMOTE_USER" type="conf:listOfStrings"/>\r
                <attribute name="unsetHeaders" type="conf:listOfStrings"/>\r
-               <attribute name="redirectErrors" type="anyURI"/>\r
-               <attribute name="localLogout" type="anyURI"/>\r
-               <attribute name="globalLogout" type="anyURI"/>\r
+               <attribute name="metadataAttributePrefix" type="conf:string"/>\r
+           <attribute name="attributePrefix" type="conf:string"/>\r
        </attributeGroup>\r
-               \r
+\r
+    <attributeGroup name="RelyingPartyGroup">\r
+        <attribute name="authType" type="conf:string"/>\r
+        <attribute name="authUsername" type="conf:string"/>\r
+        <attribute name="authPassword" type="conf:string"/>\r
+        <attribute name="signing" type="conf:bindingBoolean"/>\r
+        <attribute name="signingAlg" type="anyURI"/>\r
+        <attribute name="digestAlg" type="anyURI"/>\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
+        <attribute name="chunkedEncoding" type="boolean"/>\r
+        <attribute name="connectTimeout" type="unsignedShort"/>\r
+        <attribute name="timeout" type="unsignedShort"/>\r
+        <attribute name="requireConfidentiality" type="boolean"/>\r
+        <attribute name="requireTransportAuth" type="boolean"/>\r
+        <attribute name="signedAssertions" type="boolean"/>\r
+    </attributeGroup>\r
+    \r
        <element name="Sessions">\r
                <annotation>\r
                        <documentation>Container for specifying protocol handlers and session policy</documentation>\r
@@ -475,6 +528,8 @@
                                                                        <any namespace="##any" processContents="lax" 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
                                                        </restriction>\r
                                                </complexContent>\r
                                        </complexType>\r
@@ -486,10 +541,11 @@
                        <attribute name="exportACL" type="conf:listOfStrings" default="127.0.0.1"/>\r
                        <attribute name="cookieName" type="conf:string"/>\r
                        <attribute name="cookieProps" type="conf:string"/>\r
-                       <attribute name="idpHistory" type="boolean" default="true"/>\r
+                       <attribute name="idpHistory" type="boolean" default="false"/>\r
                        <attribute name="idpHistoryDays" type="unsignedInt"/>\r
                        <attribute name="lifetime" type="unsignedInt" default="28800"/>\r
                        <attribute name="timeout" type="unsignedInt" default="3600"/>\r
+                   <attribute name="maxTimeSinceAuthn" type="unsignedInt"/>\r
                        <attribute name="checkAddress" type="boolean" default="true"/>\r
                        <attribute name="consistentAddress" type="boolean" default="true"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
@@ -524,6 +580,10 @@
                                        <attribute name="postArtifact" type="boolean"/>\r
                                        <attribute name="acsByIndex" type="boolean"/>\r
                                        <attribute name="defaultACSIndex" type="unsignedShort"/>\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
                                        <anyAttribute namespace="##any" processContents="lax"/>\r
                                </restriction>\r
                        </complexContent>\r
@@ -541,6 +601,7 @@
                                                <any namespace="##any" processContents="lax" 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
@@ -558,11 +619,13 @@
                        <sequence>\r
                                <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
-                       <attribute name="session" type="anyURI" use="required"/>\r
+            <attribute name="redirectErrors" type="anyURI"/>\r
+                       <attribute name="session" type="anyURI"/>\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="localLogout" type="anyURI"/>\r
+            <attribute name="globalLogout" type="anyURI"/>\r
                        <attribute name="supportContact" type="conf:string"/>\r
                        <attribute name="logoLocation" type="anyURI"/>\r
                        <attribute name="styleSheet" type="anyURI"/>\r
@@ -570,6 +633,19 @@
                </complexType>\r
        </element>\r
 \r
+    <element name="RelyingParty">\r
+        <annotation>\r
+            <documentation>Container for specifying settings to use with particular peers</documentation>\r
+        </annotation>\r
+        <complexType>\r
+            <sequence/>\r
+            <attribute name="Name" type="conf:string" use="required"/>\r
+            <attributeGroup ref="conf:RelyingPartyGroup"/>\r
+            <attribute name="entityID" type="anyURI"/>\r
+            <anyAttribute namespace="##other" processContents="lax"/>\r
+        </complexType>\r
+    </element>\r
+    \r
        <element name="Notify">\r
                <annotation>\r
                        <documentation>Used to specify locations to receive application notifications</documentation>\r
@@ -589,41 +665,6 @@
                </complexType>\r
        </element>\r
        \r
-       <element name="DefaultRelyingParty">\r
-               <annotation>\r
-                       <documentation>Container for specifying security methods to use with particular peers</documentation>\r
-               </annotation>\r
-               <complexType>\r
-                       <sequence>\r
-                               <element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">\r
-                                       <complexType>\r
-                                               <sequence/>\r
-                                               <attribute name="Name" type="conf:string" use="required"/>\r
-                                               <attributeGroup ref="conf:RelyingPartyGroup"/>\r
-                                               <anyAttribute namespace="##other" processContents="lax"/>\r
-                                       </complexType>\r
-                               </element>\r
-                       </sequence>\r
-                       <attributeGroup ref="conf:RelyingPartyGroup"/>\r
-               <anyAttribute namespace="##other" processContents="lax"/>\r
-               </complexType>\r
-       </element>\r
-       \r
-       <attributeGroup name="RelyingPartyGroup">\r
-               <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="digestAlg" type="anyURI"/>\r
-               <attribute name="encryptRequests" type="conf:bindingBoolean"/>\r
-               <attribute name="encryptResponses" type="conf:bindingBoolean"/>\r
-               <attribute name="encryptionAlg" type="anyURI"/>\r
-               <attribute name="keyName" type="conf:string"/>\r
-               <attribute name="artifactEndpointIndex" type="unsignedShort"/>\r
-       </attributeGroup>\r
-       \r
        <element name="SecurityPolicies">\r
                <annotation>\r
                        <documentation>Container for specifying sets of policy rules to apply to incoming messages</documentation>\r
@@ -641,12 +682,6 @@
                                                </sequence>\r
                                                <attribute name="id" type="conf:string" use="required"/>\r
                                                <attribute name="validate" type="boolean" default="false"/>\r
-                                               <attribute name="signedAssertions" type="boolean" default="false"/>\r
-                                               <attribute name="requireConfidentiality" type="boolean" default="true"/>\r
-                                               <attribute name="requireTransportAuth" type="boolean" default="true"/>\r
-                                               <attribute name="chunkedEncoding" type="boolean" default="true"/>\r
-                                               <attribute name="connectTimeout" type="unsignedShort" default="15"/>\r
-                                               <attribute name="timeout" type="unsignedShort" default="30"/>\r
                                                <anyAttribute namespace="##any" processContents="lax"/>\r
                                        </complexType>\r
                                </element>\r
Shibboleth SP