Added redirectToSSL option to block non-SSL access.
[shibboleth/sp.git] / schemas / shibboleth-targetconfig-1.0.xsd
index 6bdeb03..aa446d7 100644 (file)
@@ -2,40 +2,58 @@
 <schema targetNamespace="urn:mace:shibboleth:target:config:1.0"
        xmlns="http://www.w3.org/2001/XMLSchema"
        xmlns:conf="urn:mace:shibboleth:target:config:1.0"
-       xmlns:cred="urn:mace:shibboleth:credentials:1.0"
-       xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" 
+       xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+       xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
        elementFormDefault="qualified"
        attributeFormDefault="unqualified"
        blockDefault="substitution"
-       version="1.0">
+       version="1.1">
 
-       <import namespace="urn:mace:shibboleth:credentials:1.0" schemaLocation="credentials.xsd"/>
        <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-1.1.xsd"/>
+       <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="saml-schema-metadata-2.0.xsd"/>
 
        <annotation>
                <documentation>
        1.0 schema for XML-based configuration of Shibboleth target libraries and modules.
-       First appearing in Shibboleth 1.3 release.
+       First appearing in Shibboleth 1.2 release.
        </documentation>
     </annotation>
 
-       <element name="ShibbolethTargetConfig">
+       <complexType name="PluggableType">
+               <sequence>
+                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+               </sequence>
+               <attribute name="type" type="string" use="required"/>
+               <attribute name="uri" type="anyURI" use="optional"/>
+               <anyAttribute namespace="##any" processContents="lax"/>
+       </complexType>
+
+       <element name="ShibbolethTargetConfig" type="conf:SPConfigType"/>
+       <element name="SPConfig" type="conf:SPConfigType"/>
+       <complexType name="SPConfigType">
                <annotation>
-                       <documentation>Outer element of configuration file</documentation>
+                       <documentation>Root element of configuration file</documentation>
                </annotation>
-               <complexType>
-                       <sequence>
-                               <element ref="conf:Extensions" minOccurs="0"/>
-                               <element ref="cred:Credentials" minOccurs="0"/>
-                               <element ref="conf:SHAR" minOccurs="0"/>
-                               <element ref="conf:SHIRE" minOccurs="0"/>
-                               <element ref="conf:Applications"/>
-                       </sequence>
-                       <attribute name="schemadir" type="anyURI" use="required"/>
-                       <attribute name="logger" type="anyURI" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
-               </complexType>
-       </element>
+               <sequence>
+                       <element ref="conf:Extensions" minOccurs="0"/>
+                       <choice minOccurs="0">
+                               <element name="OutOfProcess" type="conf:OutOfProcessType"/>
+                               <element name="Global" type="conf:OutOfProcessType"/>
+                               <element name="SHAR" type="conf:OutOfProcessType"/>
+                       </choice>
+                       <choice minOccurs="0">
+                               <element name="InProcess" type="conf:InProcessType"/>
+                               <element name="Local" type="conf:InProcessType"/>
+                               <element name="SHIRE" type="conf:InProcessType"/>
+                       </choice>
+                       <element ref="conf:Applications"/>
+                       <element name="CredentialsProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
+                       <element ref="conf:AttributeFactory" minOccurs="0" maxOccurs="unbounded"/>
+               </sequence>
+               <attribute name="logger" type="anyURI" use="optional"/>
+               <attribute name="clockSkew" type="unsignedInt" use="optional"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
+       </complexType>
 
        <element name="Extensions">
                <annotation>
                        <sequence>
                                <element name="Library" minOccurs="0" maxOccurs="unbounded">
                                        <complexType>
-                                   <complexContent>
-                                       <extension base="anyType">
-                                               <attribute name="path" type="anyURI" use="required"/>
-                                                               <attribute name="fatal" type="boolean" use="optional"/>
-                                       </extension>
-                                   </complexContent>
+                                               <sequence>
+                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                                               </sequence>
+                                               <attribute name="path" type="anyURI" use="required"/>
+                                               <attribute name="fatal" type="boolean" use="optional"/>
+                                               <anyAttribute namespace="##other" processContents="lax"/>
                                        </complexType>
                                </element>
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                </complexType>
        </element>
 
-       <complexType name="PluggableType">
-               <complexContent>
-                       <extension base="anyType">
-                               <attribute name="type" type="string" use="required"/>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <element name="SHAR">
-               <annotation>
-                       <documentation>Container for SHAR configuration</documentation>
-               </annotation>
+       <attributeGroup name="SessionCacheProperties">
+               <attribute name="cleanupInterval" type="unsignedInt" use="optional" default="300"/>
+               <attribute name="cacheTimeout" type="unsignedInt" use="optional" default="28800"/>
+               <attribute name="AAConnectTimeout" type="unsignedInt" use="optional" default="15"/>
+               <attribute name="AATimeout" type="unsignedInt" use="optional" default="30"/>
+               <attribute name="defaultLifetime" type="unsignedInt" use="optional" default="1800"/>
+               <attribute name="retryInterval" type="unsignedInt" use="optional" default="300"/>
+               <attribute name="strictValidity" type="boolean" use="optional" default="true"/>
+               <attribute name="propagateErrors" type="boolean" use="optional" default="false"/>
+               <attribute name="writeThrough" type="boolean" use="optional" default="false"/>
+       </attributeGroup>
+       
+       <element name="MemorySessionCache">
+               <complexType>
+                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="ODBCSessionCache">
                <complexType>
                        <sequence>
-                               <element name="Listener" type="conf:PluggableType" minOccurs="0"/>
-                               <element name="SessionCache" minOccurs="0">
+                               <element name="ConnectionString" type="string" minOccurs="0"/>
+                       </sequence>
+                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                       <attribute name="odbcTimeout" type="unsignedInt" use="optional" default="14400"/>
+                       <attribute name="storeAttributes" type="boolean" use="optional" default="false"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="MySQLSessionCache">
+               <complexType>
+                       <sequence>
+                               <element name="Argument" type="string" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                       <attribute name="mysqlTimeout" type="unsignedInt" use="optional" default="14400"/>
+                       <attribute name="storeAttributes" type="boolean" use="optional" default="false"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="SessionCache">
+               <complexType>
+                       <complexContent>
+                               <extension base="conf:PluggableType">
+                                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                               </extension>
+                       </complexContent>
+               </complexType>
+       </element>
+       
+       <complexType name="OutOfProcessType">
+               <annotation>
+                       <documentation>Container for global (server independent) configuration</documentation>
+               </annotation>
+               <sequence>
+                       <element ref="conf:Extensions" minOccurs="0"/>
+                       <choice>
+                               <element name="UnixListener">
                                        <complexType>
-                                   <complexContent>
-                                       <extension base="conf:PluggableType">
-                                               <attribute name="cleanupInterval" type="unsignedInt" use="optional"/>
-                                               <attribute name="timeout" type="unsignedInt" use="optional"/>
-                                       </extension>
-                                   </complexContent>
+                                               <attribute name="address" type="string" use="required"/>
                                        </complexType>
                                </element>
-                               <element name="AttributeCache" minOccurs="0">
+                               <element name="TCPListener">
                                        <complexType>
-                                   <complexContent>
-                                       <extension base="anyType">
-                                                               <attribute name="AAConnectTimeout" type="unsignedInt" use="optional"/>
-                                                               <attribute name="AATimeout" type="unsignedInt" use="optional"/>
-                                                               <attribute name="defaultLifetime" type="unsignedInt" use="optional"/>
-                                                               <attribute name="retryInterval" type="unsignedInt" use="optional"/>
-                                                               <attribute name="strictValidity" type="boolean" use="optional"/>
-                                                               <attribute name="propagateErrors" type="boolean" use="optional"/>
-                                       </extension>
-                                   </complexContent>
+                                               <attribute name="address" type="string" use="required"/>
+                                               <attribute name="port" type="unsignedInt" use="required"/>
+                                               <attribute name="acl" use="optional" default="127.0.0.1">
+                                                       <simpleType>
+                                                               <list itemType="string"/>
+                                                       </simpleType>
+                                               </attribute>
                                        </complexType>
                                </element>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                       </sequence>
-                       <attribute name="logger" type="anyURI" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
-               </complexType>
-       </element>
+                               <element name="MemoryListener" type="conf:PluggableType"/>
+                               <element name="Listener" type="conf:PluggableType"/>
+                       </choice>
+                       <choice>
+                               <element ref="conf:MemorySessionCache"/>
+                               <element ref="conf:ODBCSessionCache"/>
+                               <element ref="conf:MySQLSessionCache"/>
+                               <element ref="conf:SessionCache"/>
+                       </choice>
+                       <choice minOccurs="0">
+                               <element name="ODBCReplayCache">
+                                       <complexType>
+                                               <sequence>
+                                                       <element name="ConnectionString" type="string" minOccurs="0"/>
+                                               </sequence>
+                                               <anyAttribute namespace="##other" processContents="lax"/>
+                                       </complexType>
+                               </element>
+                               <element name="MySQLReplayCache">
+                                       <complexType>
+                                               <sequence>
+                                                       <element name="Argument" type="string" minOccurs="0" maxOccurs="unbounded"/>
+                                               </sequence>
+                                               <anyAttribute namespace="##other" processContents="lax"/>
+                                       </complexType>
+                               </element>
+                               <element name="ReplayCache" type="conf:PluggableType"/>
+                       </choice>
+                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+               </sequence>
+               <attribute name="logger" type="anyURI" use="optional"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
+       </complexType>
 
-       <element name="SHIRE">
+       <complexType name="InProcessType">
                <annotation>
                        <documentation>
-                       Container for configuration glue between target library and the surrounding application environment.
+                       Container for configuration of locally integrated or platform-specific
+                       features (e.g. web server filters)
                        </documentation>
                </annotation>
-               <complexType>
-                       <sequence>
-                               <element ref="conf:ApplicationMap" minOccurs="0"/>
-                               <element name="ImplementationSpecific" minOccurs="0">
-                                       <complexType>
-                                               <choice maxOccurs="unbounded">
-                                                       <element ref="conf:ISAPI"/>
-                                                       <element ref="conf:NSAPI"/>
-                                                       <element ref="conf:Apache"/>
-                                                       <element ref="conf:Java"/>
-                                                       <any namespace="##other" processContents="lax"/>
-                                               </choice>
-                                       </complexType>
-                               </element>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                       </sequence>
-                       <attribute name="logger" type="anyURI" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
-               </complexType>
-       </element>
+               <sequence>
+                       <element ref="conf:Extensions" minOccurs="0"/>
+                       <choice minOccurs="0">
+                               <element ref="conf:MemorySessionCache"/>
+                               <element ref="conf:SessionCache"/>
+                       </choice>
+                       <element name="RequestMapProvider" type="conf:PluggableType" minOccurs="0"/>
+                       <element name="Implementation" minOccurs="0">
+                               <complexType>
+                                       <choice maxOccurs="unbounded">
+                                               <element ref="conf:ISAPI"/>
+                                               <any namespace="##other" processContents="lax"/>
+                                       </choice>
+                               </complexType>
+                       </element>
+                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+               </sequence>
+               <attribute name="logger" type="anyURI" use="optional"/>
+               <attribute name="localRelayState" type="boolean" use="optional" default="false"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
+       </complexType>
        
        <element name="ISAPI">
                <complexType>
                        <sequence>
                                <element name="Site" maxOccurs="unbounded">
                                        <complexType>
-                                               <simpleContent>
-                                                       <extension base="string">
-                                                               <attribute name="InstanceID" type="unsignedInt" use="required"/>
-                                                               <anyAttribute namespace="##any" processContents="lax"/>
-                                                       </extension>
-                                               </simpleContent>
+                                               <sequence>
+                                                       <element name="Alias" type="string" minOccurs="0" maxOccurs="unbounded"/>
+                                               </sequence>
+                                               <attribute name="id" type="unsignedInt" use="required"/>
+                                               <attribute name="name" type="string" use="required"/>
+                                               <attribute name="port" type="unsignedInt" use="optional"/>
+                                               <attribute name="sslport" type="unsignedInt" use="optional"/>
+                                               <attribute name="scheme" type="string" use="optional"/>
                                        </complexType>
                                </element>
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
-                       <anyAttribute namespace="##any" processContents="lax"/>
-               </complexType>
-       </element>
-       <element name="Apache">
-               <complexType>
-            <complexContent>
-                <extension base="anyType">
-                                       <attribute name="apacheConfig" type="boolean" use="optional"/>
-                </extension>
-            </complexContent>
+                       <attribute name="normalizeRequest" type="boolean" use="optional"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
        <element name="NSAPI" type="anyType"/>
        <element name="Java" type="anyType"/>
-       
-       <group name="ContentSettings">
+
+       <element name="AccessControl" type="conf:UniOperatorType">
                <annotation>
                        <documentation>
-                       Group of settings that can be applied to elements in the ApplicationMap, supersedes httpd.conf/htaccess
+                       A simple example access policy language extension that supersedes Apache .htaccess
                        </documentation>
                </annotation>
-               <sequence>
-                       <element name="requireSession" type="boolean" minOccurs="0"/>
-                       <element name="exportAssertion" type="boolean" minOccurs="0"/>
-                       <choice minOccurs="0">
-                               <element name="htaccess">
-                                       <complexType>
-                                               <choice>
-                                                       <element name="OR" type="conf:OperatorType"/>
-                                                       <element name="AND" type="conf:OperatorType"/>
-                                                       <element name="NOT">
-                                                               <complexType>
-                                                                       <complexContent>
-                                                                               <restriction base="conf:OperatorType">
-                                                                                       <sequence>
-                                                                                               <element ref="conf:Rule"/>
-                                                                                       </sequence>
-                                                                               </restriction>
-                                                                       </complexContent>
-                                                               </complexType>
-                                                       </element>
-                                                       <element ref="conf:Rule"/>
-                                               </choice>
-                                               <anyAttribute namespace="##any" processContents="lax"/>
-                                       </complexType>
-                               </element>
-                               <element name="accessPolicy" type="conf:PluggableType"/>
-                       </choice>
-                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </group>
-       
+       </element>
+       <element name="OR" type="conf:MultiOperatorType"/>
+       <element name="AND" type="conf:MultiOperatorType"/>
+       <element name="NOT" type="conf:UniOperatorType"/>
+       <complexType name="UniOperatorType">
+               <choice>
+                       <element ref="conf:AND"/>
+                       <element ref="conf:OR"/>
+                       <element ref="conf:NOT"/>
+                       <element ref="conf:Rule"/>
+               </choice>
+       </complexType>
+       <complexType name="MultiOperatorType">
+               <choice minOccurs="2" maxOccurs="unbounded">
+                       <element ref="conf:AND"/>
+                       <element ref="conf:OR"/>
+                       <element ref="conf:NOT"/>
+                       <element ref="conf:Rule"/>
+               </choice>
+       </complexType>
        <element name="Rule">
                <complexType>
                        <simpleContent>
-                               <extension base="string">
-                                       <attribute name="requires" type="string" use="required"/>
+                               <extension base="conf:listOfStrings">
+                                       <attribute name="require" type="string" use="required"/>
                                </extension>
                        </simpleContent>
                </complexType>
        </element>
-       <complexType name="OperatorType">
-               <sequence>
-                       <element ref="conf:Rule" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
+       <simpleType name="listOfStrings">
+               <list itemType="string"/>
+       </simpleType>
+       
+       <attributeGroup name="ContentSettings">
+               <attribute name="authType" type="string" use="optional"/>
+               <attribute name="requireSession" type="boolean" use="optional"/>
+               <attribute name="requireSessionWith" type="string" use="optional"/>
+               <attribute name="exportAssertion" type="boolean" use="optional"/>
+               <attribute name="redirectToSSL" type="unsignedInt" use="optional"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
+       </attributeGroup>
+       <element name="AccessControlProvider" type="conf:PluggableType"/>
+       <element name="htaccess" type="conf:PluggableType"/>
 
-    <element name="ApplicationMap">
+    <element name="RequestMap">
+               <annotation>
+                       <documentation>
+                       Built-in request mapping syntax, decomposes URLs into Host/Path/Path/...
+                       </documentation>
+               </annotation>
         <complexType>
             <sequence>
-               <group ref="conf:ContentSettings"/>
+               <choice minOccurs="0">
+                       <element ref="conf:htaccess"/>
+                                       <element ref="conf:AccessControl"/>
+                       <element ref="conf:AccessControlProvider"/>
+                   </choice>
                 <element ref="conf:Host" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
-            <attribute name="uri" type="anyURI" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
+            <attribute name="applicationId" type="string" fixed="default"/>
+               <attributeGroup ref="conf:ContentSettings"/>
         </complexType>
     </element>
 
     <element name="Host">
        <complexType>
                <sequence>
-               <group ref="conf:ContentSettings"/>
+               <choice minOccurs="0">
+                       <element ref="conf:htaccess"/>
+                                       <element ref="conf:AccessControl"/>
+                       <element ref="conf:AccessControlProvider"/>
+                   </choice>
                        <element ref="conf:Path" minOccurs="0" maxOccurs="unbounded"/>
                </sequence>
-               <attribute name="scheme" use="optional" default="http">
+               <attribute name="scheme" use="optional">
                            <simpleType>
                                <restriction base="string">
                                    <enumeration value="http"/>
                <attribute name="name" type="string" use="required"/>
                <attribute name="port" type="unsignedInt" use="optional"/>
                <attribute name="applicationId" type="string" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
+               <attributeGroup ref="conf:ContentSettings"/>
        </complexType>
     </element>
 
     <element name="Path">
         <complexType>
                <sequence>
-               <group ref="conf:ContentSettings"/>
+               <choice minOccurs="0">
+                       <element ref="conf:htaccess"/>
+                                       <element ref="conf:AccessControl"/>
+                       <element ref="conf:AccessControlProvider"/>
+                   </choice>
                        <element ref="conf:Path" minOccurs="0" maxOccurs="unbounded"/>
                </sequence>
                <attribute name="name" type="string" use="required"/>
                <attribute name="applicationId" type="string" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
+               <attributeGroup ref="conf:ContentSettings"/>
         </complexType>
     </element>
 
        <element name="Applications">
                <annotation>
-                       <documentation>
-                       Container for global target settings and application-specific overrides
-                       </documentation>
+                       <documentation>Container for global target settings and application-specific overrides</documentation>
                </annotation>
                <complexType>
                        <sequence>
                                <element ref="conf:Sessions"/>
                                <element ref="conf:Errors"/>
-                               <element ref="conf:Policy"/>
-                               <element ref="conf:CredentialUse"/>
+                               <element ref="conf:CredentialUse" minOccurs="0"/>
+                               <choice minOccurs="0" maxOccurs="unbounded">
+                    <element ref="saml:AttributeDesignator"/>
+                    <element ref="saml:Audience"/>
+                    <element name="AAPProvider" type="conf:PluggableType"/>
+                    <!-- deprecated --> <element name="FederationProvider" type="conf:PluggableType"/>
+                    <element name="MetadataProvider" type="conf:PluggableType"/>
+                    <element name="TrustProvider" type="conf:PluggableType"/>
+                               </choice>
                                <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
+                       <attribute name="id" type="string" fixed="default"/>
                        <attribute name="providerId" type="anyURI" use="required"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="homeURL" type="anyURI" use="optional"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
        
        <element name="Application">
                <annotation>
-                       <documentation>
-                       Container for application-specific overrides
-                       </documentation>
+                       <documentation>Container for application-specific overrides</documentation>
                </annotation>
                <complexType>
                        <sequence>
-                               <element ref="conf:Sessions"/>
+                               <element ref="conf:Sessions" minOccurs="0"/>
                                <element ref="conf:Errors" minOccurs="0"/>
-                               <element ref="conf:Policy" minOccurs="0"/>
                                <element ref="conf:CredentialUse" minOccurs="0"/>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                               <choice minOccurs="0" maxOccurs="unbounded">
+                    <element ref="saml:AttributeDesignator"/>
+                    <element ref="saml:Audience"/>
+                    <element name="AAPProvider" type="conf:PluggableType"/>
+                    <!-- deprecated --> <element name="FederationProvider" type="conf:PluggableType"/>
+                    <element name="MetadataProvider" type="conf:PluggableType"/>
+                    <element name="TrustProvider" type="conf:PluggableType"/>
+                               </choice>
                        </sequence>
                        <attribute name="id" type="string" use="required"/>
                        <attribute name="providerId" type="anyURI" use="optional"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="homeURL" type="anyURI" use="optional"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
 
-       <element name="Errors">
+       <element name="KeyInfoResolver" type="conf:PluggableType">
                <annotation>
                        <documentation>
-                       Container for error templates and associated details
+                       Custom plug-in that resolves ds:KeyInfo elements into public keys, used in
+                       TrustProvider elements.
                        </documentation>
                </annotation>
-               <complexType>
-            <complexContent>
-                <extension base="anyType">
-                       <attribute name="shire" type="anyURI" use="required"/>
-                       <attribute name="rm" type="anyURI" use="required"/>
-                       <attribute name="access" type="anyURI" use="required"/>
-                       <attribute name="supportContact" type="string" use="required"/>
-                       <attribute name="logoLocation" type="anyURI" use="required"/>
-                </extension>
-            </complexContent>
-               </complexType>
        </element>
 
        <element name="Sessions">
                <annotation>
-                       <documentation>
-                       Container for specifying app session establishment and policy
-                       </documentation>
+                       <documentation>Container for specifying app session establishment and policy</documentation>
                </annotation>
                <complexType>
-                       <sequence>
-                               <element name="shireURL">
-                                       <complexType>
-                                               <simpleContent>
-                                                       <extension base="anyURI">
-                                                               <attribute name="SSLOnly" type="boolean" use="optional"/>
-                                                       </extension>
-                                               </simpleContent>
-                                       </complexType>
-                               </element>
-                               <element name="cookieName">
-                                       <complexType>
-                                               <simpleContent>
-                                                       <extension base="string">
-                                                               <attribute name="SSLOnly" type="boolean" use="optional"/>
-                                                       </extension>
-                                               </simpleContent>
-                                       </complexType>
-                               </element>
-                               <element name="wayfURL" type="anyURI" minOccurs="0"/>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                       </sequence>
+                       <choice minOccurs="0" maxOccurs="unbounded">
+                               <element ref="conf:SessionInitiator"/>
+                               <element ref="md:AssertionConsumerService"/>
+                               <element ref="md:SingleLogoutService"/>
+                               <element ref="conf:DiagnosticService"/>
+                               <element name="ExtensionService" type="conf:PluggableType"/>
+                       </choice>
+                       <!-- deprecated --> <attribute name="wayfURL" type="anyURI" use="optional"/>
+                       <!-- deprecated --> <attribute name="shireURL" type="anyURI" use="optional"/>
+                       <!-- deprecated --> <attribute name="shireSSL" type="boolean" use="optional"/>
+                       <attribute name="handlerURL" type="anyURI" use="optional"/>
+                       <attribute name="handlerSSL" type="boolean" use="optional" default="true"/>
+                       <attribute name="cookieName" type="string" use="optional"/>
+                       <attribute name="cookieProps" type="string" use="optional"/>
+                       <attribute name="idpHistory" type="boolean" use="optional" default="true"/>
+                       <attribute name="idpHistoryDays" type="unsignedInt" use="optional"/>
                        <attribute name="lifetime" type="unsignedInt" use="optional"/>
                        <attribute name="timeout" type="unsignedInt" use="optional"/>
-                       <attribute name="normalizeRequest" type="boolean" use="optional"/>
                        <attribute name="checkAddress" type="boolean" use="optional"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="consistentAddress" type="boolean" use="optional" default="true"/>
+                       <attribute name="checkReplay" type="boolean" use="optional" default="true"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="SessionInitiator">
+               <annotation>
+                       <documentation>Used to specify WAYF/Discovery services (external or internal)</documentation>
+               </annotation>
+               <complexType>
+                       <sequence>
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <attribute name="Location" type="anyURI" use="required"/>
+                       <attribute name="Binding" type="anyURI" use="required"/>
+                       <attribute name="wayfURL" type="anyURI" use="optional"/>
+                       <attribute name="wayfBinding" type="anyURI" use="optional"/>
+                       <attribute name="checkCDC" type="anyURI" use="optional"/>
+                       <attribute name="isDefault" type="boolean" use="optional"/>
+                       <attribute name="id" type="string" use="optional"/>
+                       <anyAttribute namespace="##any" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="DiagnosticService">
+               <annotation>
+                       <documentation>Used to specify internal diagnostic capabilities</documentation>
+               </annotation>
+               <complexType>
+                       <sequence>
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <attribute name="Location" type="anyURI" use="required"/>
+                       <attribute name="Binding" type="anyURI" use="required"/>
+                       <attribute name="echo" type="boolean" use="optional"/>
+                       <attribute name="log" type="boolean" use="optional"/>
+                       <attribute name="config" type="boolean" use="optional"/>
+                       <attribute name="acl" use="optional">
+                               <simpleType>
+                                       <list itemType="string"/>
+                               </simpleType>
+                       </attribute>
+                       <anyAttribute namespace="##any" processContents="lax"/>
                </complexType>
        </element>
 
-       <element name="Policy">
+       <element name="Errors">
                <annotation>
-                       <documentation>
-                       Container for specifying various policies for attributes, trust, and federations
-                       </documentation>
+                       <documentation>Container for error templates and associated details</documentation>
                </annotation>
                <complexType>
                        <sequence>
-                               <element name="Attributes" minOccurs="0">
-                                       <complexType>
-                                               <sequence>
-                                                       <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
-                                                       <element name="AAPProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                                               </sequence>
-                                               <attribute name="signRequest" type="boolean" use="optional"/>
-                                               <attribute name="signedResponse" type="boolean" use="optional"/>
-                                               <anyAttribute namespace="##any" processContents="lax"/>
-                                       </complexType>
-                               </element>
-                               <element name="FederationProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                               <element name="TrustProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                               <element name="Audiences" minOccurs="0">
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <!-- deprecated --> <attribute name="shire" type="anyURI" use="optional"/>
+                       <attribute name="session" type="anyURI" use="optional"/>
+                       <attribute name="metadata" type="anyURI" use="optional"/>
+                       <attribute name="rm" type="anyURI" use="required"/>
+                       <attribute name="access" type="anyURI" use="optional"/>
+                       <attribute name="ssl" type="anyURI" use="optional"/>
+                       <attribute name="supportContact" type="string" use="optional"/>
+                       <attribute name="logoLocation" type="anyURI" use="optional"/>
+                       <attribute name="styleSheet" type="anyURI" use="optional"/>
+                       <anyAttribute namespace="##any" processContents="lax"/>
+               </complexType>
+       </element>
+
+       <attributeGroup name="CredentialUseGroup">
+               <attribute name="TLS" type="string" use="optional"/>
+               <attribute name="Signing" type="string" use="optional"/>
+               <attribute name="signRequest" type="boolean" use="optional" default="false"/>
+               <attribute name="signatureAlg" type="anyURI" use="optional"/>
+               <attribute name="digestAlg" type="anyURI" use="optional"/>
+               <attribute name="signedResponse" type="boolean" use="optional" default="false"/>
+               <attribute name="signedAssertions" type="boolean" use="optional" default="false"/>
+               <attribute name="authType" use="optional">
+                       <simpleType>
+                               <restriction base="string">
+                                       <enumeration value="basic"/>
+                                       <enumeration value="digest"/>
+                                       <enumeration value="ntlm"/>
+                                       <enumeration value="gss"/>
+                               </restriction>
+                       </simpleType>
+               </attribute>
+               <attribute name="authUsername" use="optional"/>
+               <attribute name="authPassword" use="optional"/>
+       </attributeGroup>
+
+       <element name="CredentialUse">
+               <annotation>
+                       <documentation>Container for specifying credentials to use</documentation>
+               </annotation>
+               <complexType>
+                       <sequence>
+                               <element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">
                                        <complexType>
                                                <sequence>
-                                                       <element ref="saml:Audience" maxOccurs="unbounded"/>
+                                                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                                                </sequence>
-                                               <anyAttribute namespace="##any" processContents="lax"/>
+                                               <attribute name="Name" type="string" use="required"/>
+                                               <attributeGroup ref="conf:CredentialUseGroup"/>
+                                               <anyAttribute namespace="##other" processContents="lax"/>
                                        </complexType>
                                </element>
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attributeGroup ref="conf:CredentialUseGroup"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
        
-       <element name="CredentialUse">
+       <element name="AttributeFactory">
                <annotation>
-                       <documentation>
-                       Container for specifying credentials to use
-                       </documentation>
+                       <documentation>Specifies a plugin that implements a specialized SAML attribute</documentation>
                </annotation>
                <complexType>
                        <sequence>
-                               <element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">
-                                       <complexType>
-                                               <complexContent>
-                                                       <extension base="anyType">
-                                                               <attribute name="Name" type="string" use="required"/>
-                                                               <attribute name="TLS" type="string" use="required"/>
-                                                               <attribute name="Signing" type="string" use="required"/>
-                                                       </extension>
-                                               </complexContent>
-                                       </complexType>
-                               </element>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
-                       <attribute name="TLS" type="string" use="required"/>
-                       <attribute name="Signing" type="string" use="required"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="type" type="string" use="required"/>
+                       <attribute name="AttributeName" type="string" use="required"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
+       
 </schema>