IIS fix to properly handle URL c14n

[shibboleth/sp.git] / configs / shibboleth.xml.in

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index ff13aaa..7739810 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -28,10 +28,10 @@
         -->
         <!--
         <MemorySessionCache cleanupInterval="300" cacheTimeout="3600" AATimeout="30" AAConnectTimeout="15"
-            defaultLifetime="1800" retryInterval="300" strictValidity="false" propagateErrors="false"/>
+            defaultLifetime="1800" retryInterval="300" strictValidity="false" propagateErrors="true"/>
         -->
         <MySQLSessionCache cleanupInterval="300" cacheTimeout="3600" AATimeout="30" AAConnectTimeout="15"
-               defaultLifetime="1800" retryInterval="300" strictValidity="false" propagateErrors="false"
+               defaultLifetime="1800" retryInterval="300" strictValidity="false" propagateErrors="true"
                mysqlTimeout="14400">
             <Argument>&#x2D;&#x2D;language=@-PREFIX-@/share/english</Argument>
             <Argument>&#x2D;&#x2D;datadir=@-PREFIX-@/data</Argument>
@@ -40,7 +40,7 @@
     
     <SHIRE logger="@-PKGSYSCONFDIR-@/shire.logger">
         <!--
-        To customize behavior, map hostnames and path components to application names.
+        To customize behavior, map hostnames and path components to applicationId and other settings.
         Can be either a pointer to an external file or an inline configuration.
         -->
         <!--
@@ -51,9 +51,10 @@
         <RequestMapProvider type="edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap">
             <RequestMap applicationId="default">
                 <!--
-                This requires a session for documents in /secure on the containing host on 80 and 443.
-                Note that the name in the <Host> elements MUST match Apache's ServerName directive
-                or the IIS host mapping in the <ISAPI> element below.
+                This requires a session for documents in /secure on the containing host with http and
+                https on the default ports. Note that the name and port in the <Host> elements MUST match
+                Apache's ServerName and Port directives or the IIS Site mapping in the <ISAPI> element
+                below.
                 -->
                 <Host name="localhost" scheme="https">
                     <Path name="secure" requireSession="true" exportAssertion="true"/>
@@ -66,7 +67,8 @@
         
         <Implementation>
             <ISAPI normalizeRequest="true">
-                <Site id="1" host="localhost"/>    <!-- Maps IIS IID values to the vhost name. -->
+               <!-- Maps IIS IID values to the host scheme/name/port. -->
+                <Site id="1" scheme="http" name="localhost" port="80"/>
             </ISAPI>
         </Implementation>
     </SHIRE>
@@ -84,8 +86,7 @@
         for internal testing against your own origin.
         -->
         <Sessions lifetime="7200" timeout="3600" checkAddress="true" checkReplay="true"
-            shireURL="/Shibboleth.shire" shireSSL="false" cookieName="shib-default-app" cookieProps="; path=/"
-            wayfURL="https://wayf.internet2.edu/InQueue/WAYF"/>
+            shireURL="/Shibboleth.shire" shireSSL="false" wayfURL="https://wayf.internet2.edu/InQueue/WAYF"/>
 
         <!-- You should customize the pages! You can add attributes with values that can be plugged in. -->
         <Errors shire="@-PKGSYSCONFDIR-@/shireError.html"
@@ -126,8 +127,8 @@
                                        <OriginSite Name="https://example.org/shibboleth/origin">
                                                <Alias>Localhost Test Deployment</Alias>
                                                <Contact Type="technical" Name="Your Name Here" Email="root@localhost"/>
-                                               <HandleService Location="https://localhost/shibboleth/HS" Name="CN=localhost,O=Shibboleth Project,C=US"/>
-                                               <AttributeAuthority Location="https://localhost/shibboleth/AA" Name="CN=localhost,O=Shibboleth Project,C=US"/>
+                                               <HandleService Location="https://localhost/shibboleth/HS" Name="CN=localhost, O=Shibboleth Project, C=US"/>
+                                               <AttributeAuthority Location="https://localhost/shibboleth/AA" Name="CN=localhost, O=Shibboleth Project, C=US"/>
                                                <Domain>localhost</Domain>
                                        </OriginSite>
                                </SiteGroup>
@@ -155,7 +156,7 @@
         <!-- customize behavior of specific applications -->
         <!-- 
         <Application id="foo-admin">
-            <Sessions shireURL="https:///admin/Shibboleth.shire" cookieName="shib-foo-admin"/>
+            <Sessions shireURL="https:///admin/Shibboleth.shire"/>
             <Policy>
                 <saml:AttributeDesignator AttributeName="urn:mace:dir:attribute-def:eduPersonPrincipalName"
                     AttributeNamespace="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>