Enhance relay state handling.

[shibboleth/sp.git] / schemas / shibboleth-spconfig-2.0.xsd

diff --git a/schemas/shibboleth-spconfig-2.0.xsd b/schemas/shibboleth-spconfig-2.0.xsd
index c145ce2..ac09d3d 100644 (file)
--- a/schemas/shibboleth-spconfig-2.0.xsd
+++ b/schemas/shibboleth-spconfig-2.0.xsd
@@ -261,6 +261,11 @@
                <attribute name="requireSessionWith" type="conf:string"/>\r
                <attribute name="exportAssertion" type="boolean"/>\r
                <attribute name="redirectToSSL" type="unsignedInt"/>\r
+               <attribute name="isPassive" type="boolean"/>\r
+               <attribute name="forceAuthn" type="boolean"/>\r
+               <attribute name="authnContextClassRef" type="anyURI"/>\r
+               <attribute name="authnContextDeclRef" type="anyURI"/>\r
+               <attribute name="authnContextComparison" type="conf:string"/>\r
                <anyAttribute namespace="##other" processContents="lax"/>\r
        </attributeGroup>\r
        <element name="AccessControlProvider" type="conf:PluggableType"/>\r
@@ -347,9 +352,9 @@
                                <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="id" type="conf:string" fixed="default"/>\r
-                       <attribute name="providerId" type="anyURI" use="required"/>\r
+                       <attribute name="entityID" type="anyURI" use="required"/>\r
                        <attribute name="policyId" type="conf:string" use="required"/>\r
-                       <attribute name="homeURL" type="anyURI"/>\r
+                       <attribute name="homeURL" type="anyURI" default="/"/>\r
                        <attribute name="attributeIds" type="conf:listOfStrings"/>\r
                <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
@@ -371,9 +376,9 @@
                                <element name="CredentialResolver" type="conf:PluggableType" minOccurs="0"/>\r
                        </sequence>\r
                        <attribute name="id" type="conf:string" use="required"/>\r
-                       <attribute name="providerId" type="anyURI"/>\r
+                       <attribute name="entityID" type="anyURI"/>\r
                        <attribute name="policyId" type="conf:string"/>\r
-                       <attribute name="homeURL" type="anyURI"/>\r
+                       <attribute name="homeURL" type="anyURI" default="/"/>\r
                        <attribute name="attributeIds" type="conf:listOfStrings"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
@@ -425,23 +430,27 @@
 \r
        <element name="SessionInitiator">\r
                <annotation>\r
-                       <documentation>Used to specify handlers that can issue AuthnRequests</documentation>\r
+                       <documentation>Used to specify handlers that can issue AuthnRequests or perform discovery</documentation>\r
                </annotation>\r
                <complexType>\r
-                       <sequence>\r
-                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
-                       </sequence>\r
-                       <attribute name="Location" type="anyURI" use="required"/>\r
-                       <attribute name="Binding" type="anyURI" use="required"/>\r
-                       <attribute name="id" type="conf:string"/>\r
-                       <attribute name="isDefault" type="boolean"/>\r
-                       <attribute name="wayfURL" type="anyURI"/>\r
-                       <attribute name="wayfBinding" type="anyURI"/>\r
-                       <attribute name="relayState" type="conf:string"/>\r
-                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                       <complexContent>\r
+                               <restriction base="conf:PluggableType">\r
+                                       <sequence>\r
+                                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                       </sequence>\r
+                                       <attribute name="Location" type="anyURI"/>\r
+                                       <attribute name="id" type="conf:string"/>\r
+                                       <attribute name="isDefault" type="boolean"/>\r
+                                       <attribute name="relayState" type="conf:string"/>\r
+                                       <attribute name="entityIDParam" type="conf:string"/>\r
+                                       <attribute name="entityID" type="anyURI"/>\r
+                                       <attribute name="URL" type="anyURI"/>\r
+                                       <anyAttribute namespace="##any" processContents="lax"/>\r
+                               </restriction>\r
+                       </complexContent>\r
                </complexType>\r
        </element>\r
-\r
+       \r
        <element name="Errors">\r
                <annotation>\r
                        <documentation>Container for error templates and associated details</documentation>\r
@@ -488,7 +497,9 @@
                <attribute name="authPassword" type="conf:string"/>\r
                <attribute name="signRequests" type="boolean" default="false"/>
                <attribute name="signatureAlg" type="anyURI"/>\r
+               <attribute name="digestAlg" type="anyURI"/>\r
                <attribute name="encryptRequests" type="boolean" default="true"/>\r
+               <attribute name="encryptionAlg" type="anyURI"/>\r
        </attributeGroup>\r
        \r
        <element name="SecurityPolicies">