Revised commands again, updated later sections

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1050 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/DEPLOY-GUIDE-TARGET.html b/doc/DEPLOY-GUIDE-TARGET.html
index fbdc64a..1045a48 100644 (file)
--- a/doc/DEPLOY-GUIDE-TARGET.html
+++ b/doc/DEPLOY-GUIDE-TARGET.html
@@ -78,6 +78,17 @@ background-image: url('none');
 margin: 0px;
 padding: 2px
 }
 margin: 0px;
 padding: 2px
 }

+.attributeopt
+{
+font-size: 115%;
+font-color: #000000;
+text-align: left;
+background-color: #EEEEEE;
+border: 1px inset black;
+background-image: url('none');
+margin: 0px;
+padding: 2px
+}

 .value
 {
 font-color: #000000;
 .value
 {
 font-color: #000000;

@@ -124,7 +135,7 @@ color: #00FF00
 </center>
 <p>Shibboleth Target Deployment Guide<br>
 Shibboleth Version 1.2<br />
 </center>
 <p>Shibboleth Target Deployment Guide<br>
 Shibboleth Version 1.2<br />

-April 4, 2004<br />
+April 30, 2004<br />

 <h3>This version of the deploy guide is for Shibboleth v1.2. For documentation 
 related to prior versions of Shibboleth, please consult the appropriate branch 
 in the Shibboleth CVS.</h3>
 <h3>This version of the deploy guide is for Shibboleth v1.2. For documentation 
 related to prior versions of Shibboleth, please consult the appropriate branch 
 in the Shibboleth CVS.</h3>

@@ -138,17 +149,8 @@ in conjunction with proper trust settings and policies.</h3>
 
 <p>The Shibboleth target implementation has been substantially redesigned for this release. Most of the
 configuration process has changed to accomodate more complex deployments but many of the defaults work
 
 <p>The Shibboleth target implementation has been substantially redesigned for this release. Most of the
 configuration process has changed to accomodate more complex deployments but many of the defaults work

-fine for testing and simpler applications. Among the new features:</p>
-<ul>
-    <li>New XML-based configuration system supporting runtime adjustment of many settings and better
-        integration with supplemental configuration files</li>
-    <li>Ability to partition deployment into "Applications" at the vhost, path, or document level</li>
-    <li>"Lazy" sessions allow applications to redirect browser to initiate a session, allows
-        content to decide it needs authentication or attributes at runtime</li>
-    <li>Flexible support for multilateral and bilateral trust arrangements</li>
-    <li>Support for more types of key and certificate formats</li>
-    <li>Improved pluggability for many aspects of system, including access control modules</li>
-</ul>
+fine for testing and simpler applications. For a list of new features, please refer to the NEWS.txt
+file in the doc/ folder of the distribution.</p>

 
 <p>Before starting, please sign up for all applicable
 <a href="http://shibboleth.internet2.edu/shib-misc.html#mailinglist">mailing 
 
 <p>Before starting, please sign up for all applicable
 <a href="http://shibboleth.internet2.edu/shib-misc.html#mailinglist">mailing 

@@ -187,7 +189,7 @@ that arises.</p>
         <li><a href="#2.c."><font color="black">Security Considerations</font></a></li>
         <li><a href="#2.d."><font color="black">Server Certificates</font></a></li>
         <li><a href="#2.e."><font color="black">Attribute Release Policies</font></a></li>
         <li><a href="#2.c."><font color="black">Security Considerations</font></a></li>
         <li><a href="#2.d."><font color="black">Server Certificates</font></a></li>
         <li><a href="#2.e."><font color="black">Attribute Release Policies</font></a></li>

-        <li><a href="#2.f."><font color="#000000">Attribute Acceptance Policies</font></a></li>
+        <li><a href="#2.f."><font color="black">Attribute Acceptance Policies</font></a></li>

         <li><a href="#2.g."><font color="black">Browser Requirements</font></a></li>
         <li><a href="#2.h."><font color="black">Clocks</font></a></li>
         <li><a href="#2.i."><font color="black">Other Considerations</font></a></li>
         <li><a href="#2.g."><font color="black">Browser Requirements</font></a></li>
         <li><a href="#2.h."><font color="black">Clocks</font></a></li>
         <li><a href="#2.i."><font color="black">Other Considerations</font></a></li>

@@ -427,43 +429,32 @@ requesting attributes.</p>
 <hr>
 <h3><a name="2."></a>2. Planning</h3>
 <p>There are several essential elements that must be present in the environment 
 <hr>
 <h3><a name="2."></a>2. Planning</h3>
 <p>There are several essential elements that must be present in the environment 

-to ensure Shibboleth functions well, both political and technical. Shibboleth is 
-entirely written in Java on the origin side. These are the recommendations and 
-requirements for a successful implementation of a Shibboleth origin.</p>
+to ensure Shibboleth functions well, both political and technical. Shibboleth 
+currently runs on a specific range of platforms and web server environments. The 
+SHAR and SHIRE are implemented entirely in C/C++. These are the recommendations 
+and requirements for a successful implementation of a Shibboleth target.</p>

 <h4><a name="2.a."></a>2.a. Requirements</h4>
 <h4><a name="2.a."></a>2.a. Requirements</h4>

-<ul>
-    <li>A common institutional directory service should be operational; 
-    Shibboleth comes with LDAP and SQL capabilities built in, and the Attribute 
-    Authority has a Java API which will allow specification of interfaces with 
-    legacy directories. This is discussed further in <a href="#4.d.">section 4.d</a>.</li>
-    <li>A method to authenticate browser users must be in place, preferably in 
-    the form of an enterprise authentication service. Some form of an SSO or a 
-    WebISO service is not explicitly necessary for Shibboleth; however, it is 
-    highly recommended. Implementation details of this are discussed in
-    <a href="#4.c.">section 4.c</a>.</li>
-    <li>Shibboleth is known to work on Windows, Linux, and Solaris, but should
-    function on any platform that has a Tomcat implementation.</li>
-    <li>A Java servlet container; Shibboleth has been tested extensively with
-    Tomcat.</li>
-    <li>It is recommended that a web server such as Apache be deployed in front
-    of Tomcat to provide authentication services and to control the flow of
-    requests to Tomcat.  There may be issues surrounding the number of maximum
-    connections to the web server and to the servlet container.</li>
-</ul>
+<blockquote>
+    <p>Shibboleth currently supports Windows NT/2000/XP/2003, Linux, and 
+    Solaris. At present, Shibboleth consists of Apache (or IIS) plugins and a 
+    separate SHAR process. The plugins use the Sun/ONC RPC mechanism to communicate 
+    with the SHAR over Unix domain or TCP sockets. The target&#39;s web servers must 
+    be running <a href="http://http://www.apache.org/dist/httpd/">Apache</a> 
+    1.3+, 2.0+, or Microsoft IIS 4.0+ More precise technical 
+    details are discussed in <a href="#3.a.">3.a</a>.</p>
+</blockquote>

 <h4><a name="2.b."></a>2.b. Join a Federation</h4>
 <blockquote>
     <p>While it is not necessary for a target or origin to join a federation, 
     doing so greatly facilitates the implementation of multilateral trust 
 <h4><a name="2.b."></a>2.b. Join a Federation</h4>
 <blockquote>
     <p>While it is not necessary for a target or origin to join a federation, 
     doing so greatly facilitates the implementation of multilateral trust 

-    relationships. Each federation will have a different application process. 
-    When an origin is accepted into a federation, its information is added to 
-    the sites file used by the WAYF and target sites.</p>
-    <p>Attribute release and acceptance policies, the use and caching of
-    attributes, and definition of commonly traded attributes are examples of
-    specifications a federation may make.  <b>The default configuration that
-    ships with Shibboleth is intended for use in testing against a <span
-    class="fixed">localhost</span> target.  In order to interoperate with other
-    relying parties, such as a federation, consult the steps provided by the
-    guidelines of that relying party.</b></p>
+    relationships. Each federation will have a different application process.</p>
+    <p>For more information on federations, refer to <a href="#1.d.">1.d</a> or 
+    the Shibboleth v1.0 architectural document.</p>
+    <p>For testing in a private environment, Shibboleth comes with a default
+    configuration that demonstrates how to implement a local peered agreement
+    and supports testing both origin and target on the same box using localhost
+    URLs. The sample key and certificate is for ease of testing only, and should
+    always be replaced for real world use.</p>

 </blockquote>
 <h4><a name="2.c."></a>2.c. Security Considerations</h4>
 <blockquote>
 </blockquote>
 <h4><a name="2.c."></a>2.c. Security Considerations</h4>
 <blockquote>

@@ -473,7 +464,9 @@ requirements for a successful implementation of a Shibboleth origin.</p>
     Shibboleth is as secure as possible, there are several recommended security 
     precautions which should be in place at local sites.</p>
     <ol type="i">
     Shibboleth is as secure as possible, there are several recommended security 
     precautions which should be in place at local sites.</p>
     <ol type="i">

-        <li>SSL use is optional for origin sites. Federation guidelines should 
+        <li>SSL use is optional for target sites, but should be used if at all 
+        possible, at least in the processing of incoming sessions (called the 
+        SHIRE URL or assertion consumer service). Federation guidelines should 

         be considered when determining whether to implement SSL, and, in 
         general, SSL should be used for interactions with client machines to 
         provide the necessary authentication and encryption to ensure protection 
         be considered when determining whether to implement SSL, and, in 
         general, SSL should be used for interactions with client machines to 
         provide the necessary authentication and encryption to ensure protection 

@@ -486,7 +479,7 @@ requirements for a successful implementation of a Shibboleth origin.</p>
         against this is safeguarding the WAYF service and ensuring that rogue 
         targets and origins are not used, generally by development of the trust 
         model underneath Shibboleth. Shibboleth also leverages DNS for security, 
         against this is safeguarding the WAYF service and ensuring that rogue 
         targets and origins are not used, generally by development of the trust 
         model underneath Shibboleth. Shibboleth also leverages DNS for security, 

-        which is not uncommon, but attacks concerning bad domain information 
+        which is not uncommon, but attacks concerning domain name lookups

         should be considered.</li>
         <li>Information regarding origin users is generally provided by the 
         authoritative enterprise directory, and the acceptance of requests from 
         should be considered.</li>
         <li>Information regarding origin users is generally provided by the 
         authoritative enterprise directory, and the acceptance of requests from 

@@ -500,17 +493,18 @@ requirements for a successful implementation of a Shibboleth origin.</p>
         recipe</a> for more information). Use of plaintext passwords is strongly 
         advised against.</li>
         <li>Server platforms should be properly secured, commensurate with the 
         recipe</a> for more information). Use of plaintext passwords is strongly 
         advised against.</li>
         <li>Server platforms should be properly secured, commensurate with the 

-        level that would be expected for a campus&#39; other security services, and 
-        cookie stores on client machines should be well protected.</li>
+        level that would be expected for an organization&#39;s other security 
+        services, and cookie stores on client machines should be well protected.</li>

     </ol>
 </blockquote>
 <h4><a name="2.d."></a>2.d. Server Certs</h4>
 <blockquote>
     </ol>
 </blockquote>
 <h4><a name="2.d."></a>2.d. Server Certs</h4>
 <blockquote>

-    <p>In the Shibboleth architecture, the origin and target must each have 
+    <p>In the Shibboleth architecture, the origin and target software must all have 

     various client and/or server certificates for use in signing assertions and 
     various client and/or server certificates for use in signing assertions and 

-    creating SSL channels. These should be issued by a commonly accepted CA, 
-    which may be stipulated by some Federation rules. Different federations may 
-    require the use of different CA&#39;s.</p>
+    creating SSL connections These should be issued by a commonly accepted CA, 
+    which may be stipulated by your federation. After understanding the CA&#39;s 
+    acceptible to your federations, consult chapter <a href="#4.c.">4.c</a> for 
+    information on certificate and key generation.</p>

 </blockquote>
 <h4><a name="2.e."></a>2.e. Attribute Release Policies</h4>
 <blockquote>
 </blockquote>
 <h4><a name="2.e."></a>2.e. Attribute Release Policies</h4>
 <blockquote>

@@ -547,15 +541,20 @@ requirements for a successful implementation of a Shibboleth origin.</p>
     can be maintained either administratively or by the users themselves. All 
     ARP&#39;s are specified using the same syntax and semantics.</p>
 </blockquote>
     can be maintained either administratively or by the users themselves. All 
     ARP&#39;s are specified using the same syntax and semantics.</p>
 </blockquote>

-<h4><a name="2.f."></a>2.f. Designate Contacts</h4>
+<h4><a name="2.f."></a>2.f. Attribute Acceptance Policies</h4>

 <blockquote>
 <blockquote>

-    <p>Since Shibboleth deals both with daily technical and operational issues
-    and also with contractual issues, a set of contacts should be set up to
-    support the user base and to facilitate interactions with other Shibboleth
-    sites and federation members. It is recommended that at least technical and
-    administrative contacts be designated.  These contacts are then supplied to
-    the federation and optionally to relying parties individually to facilitate
-    communications and troubleshooting.</p>
+    <p>When a target receives a set of attributes, it must evaluate them in the 
+    context of the Attribute Authority that is providing them, to assess their 
+    &quot;reasonableness&quot;. For example, if the value of an attribute is expected to 
+    be from a small set of enumerated choices, the value should be compared 
+    against that list. If a particular attribute or value is only trusted when 
+    asserted by specific origins, that too should be checked.</p>
+    <p>Targets are configured to accept specific attributes that they understand 
+    and care about, and are also configured with the rules to apply before 
+    accepting the attributes for use by the RM or an application. Attributes and 
+    values that don&#39;t meet the target&#39;s requirements are filtered out. The set 
+    of configuration rules to make these decisions is called an Attribute 
+    Acceptance Policy (AAP).</p>

 </blockquote>
 <h4><a name="2.g."></a>2.g. Browser Requirements</h4>
 <blockquote>
 </blockquote>
 <h4><a name="2.g."></a>2.g. Browser Requirements</h4>
 <blockquote>

@@ -568,11 +567,11 @@ requirements for a successful implementation of a Shibboleth origin.</p>
 <h4><a name="2.h."></a>2.h. Clocks</h4>
 <blockquote>
     <p><a href="http://www.ntp.org/">NTP</a> should be run on all 
 <h4><a name="2.h."></a>2.h. Clocks</h4>
 <blockquote>
     <p><a href="http://www.ntp.org/">NTP</a> should be run on all 

-    web servers. Shibboleth employs a short handle issuance time to protect 
+    web servers. Shibboleth employs a short assertion acceptance window to protect 

     against replay attacks. Because of this, any significant degree of clock 
     skew can hinder the ability of users to access sites successfully.</p>
 </blockquote>
     against replay attacks. Because of this, any significant degree of clock 
     skew can hinder the ability of users to access sites successfully.</p>
 </blockquote>

-<h4><a name="2.i."></a>2.i. Other Considerations</h4>
+<h4><a name="2.h."></a>2.i. Other Considerations</h4>

 <blockquote>
     <p>Especially for higher education, there are a handful of laws enacted 
     which may have important ramifications on the disclosure of personal 
 <blockquote>
     <p>Especially for higher education, there are a handful of laws enacted 
     which may have important ramifications on the disclosure of personal 

@@ -612,8 +611,8 @@ most minor &quot;letter&quot; updates should be usable.</p>
             should include SSL support (preferably using <span class="fixed">mod_ssl</span>),
             and EAPI support (which <span class="fixed">mod_ssl</span> requires and provides).</p>
             <p><b>Portions of the <span class="fixed">libphp4</span> Apache 
             should include SSL support (preferably using <span class="fixed">mod_ssl</span>),
             and EAPI support (which <span class="fixed">mod_ssl</span> requires and provides).</p>
             <p><b>Portions of the <span class="fixed">libphp4</span> Apache 

-            module are written in C++, as is Shibboleth. There is a known 
-            conflict between the PHP extensions <span class="fixed">libpspell.so</span> 
+            module are written in C++, as is Shibboleth. There is a known conflict on Unix
+            platforms between the PHP extensions <span class="fixed">libpspell.so</span> 

             and <span class="fixed">libsablot.so</span> which will manifest 
             itself as segmentation faults when starting Apache. If a site wants 
             to use <span class="fixed">libphp4.so</span> and Shibboleth at the same time, 
             and <span class="fixed">libsablot.so</span> which will manifest 
             itself as segmentation faults when starting Apache. If a site wants 
             to use <span class="fixed">libphp4.so</span> and Shibboleth at the same time, 

@@ -664,7 +663,12 @@ most minor &quot;letter&quot; updates should be usable.</p>
                 <li>
                 <p>Any Apache modules used, and Apache itself, must be compiled 
                 with the Microsoft DLL-based runtime, selected by compiling with 
                 <li>
                 <p>Any Apache modules used, and Apache itself, must be compiled 
                 with the Microsoft DLL-based runtime, selected by compiling with 

-                the /MD switch.</p>
+                the /MD switch. The binary distribution was built against Apache
+                versions 1.3.29 (with EAPI patches from mod_ssl 2.8.16) and 2.0.48.
+                Forward compatibility is likely, but errors will result if an
+                Apache implementation such as IBM's IHS product or any other
+                non-EAPI version of 1.3 is used. In such cases, you must build
+                the Shibboleth Apache modules from source.</p>

                 </li>
                 <li>
                 <p>The installer will prompt for an install path, change default 
                 </li>
                 <li>
                 <p>The installer will prompt for an install path, change default 

@@ -685,8 +689,8 @@ most minor &quot;letter&quot; updates should be usable.</p>
         <li>RedHat Linux 7.2,7.3:
             <ul type="disc">
             <li>
         <li>RedHat Linux 7.2,7.3:
             <ul type="disc">
             <li>

-                <p>The most recent Red Hat RPM (1.3.27-2 as of this writing) is sufficient for
-                use with Shibboleth. You can use the older version of OpenSSL included, for this
+                <p>The most recent Red Hat RPM for Apache (1.3.27-2 as of this writing) is sufficient for
+                use with Shibboleth. You can use the older version of OpenSSL included with the OS, for this

                 release, but be advised this may change in the future.</p>
             </li>
             <li>
                 release, but be advised this may change in the future.</p>
             </li>
             <li>

@@ -701,14 +705,14 @@ most minor &quot;letter&quot; updates should be usable.</p>
         <li>RedHat Linux 9 / Fedora
             <ul type="disc">
             <li>
         <li>RedHat Linux 9 / Fedora
             <ul type="disc">
             <li>

-                <p>Apache 2.0 is included as the default version in this release.</p>
+                <p>Apache 2.0 is included as the default Apache version in this release.</p>

             </li>
             </ul>
         </li>
         <li>RedHat Enterprise Linux
             <ul type="disc">
             <li>
             </li>
             </ul>
         </li>
         <li>RedHat Enterprise Linux
             <ul type="disc">
             <li>

-                <p>Apache 2.0 is included as the default version in this release.</p>
+                <p>Apache 2.0 is included as the default Apache version in this release.</p>

             </li>
             </ul>
         </li>
             </li>
             </ul>
         </li>

@@ -733,7 +737,7 @@ most minor &quot;letter&quot; updates should be usable.</p>
             <li>
                 <p>The shared library version of OpenSSL is required by 
                 Shibboleth. The static libraries may be installed as well if 
             <li>
                 <p>The shared library version of OpenSSL is required by 
                 Shibboleth. The static libraries may be installed as well if 

-                necessary for other applications, but cannot be used within 
+                necessary for other applications, but cannot be linked into

                 mod_ssl or any other Apache modules. If mod_ssl's libssl.so
                 module is linked against the static version, bus errors will
                 result.</p>
                 mod_ssl or any other Apache modules. If mod_ssl's libssl.so
                 module is linked against the static version, bus errors will
                 result.</p>

@@ -752,9 +756,9 @@ most minor &quot;letter&quot; updates should be usable.</p>
                 from <a href="http://www.sunfreeware.com">http://www.sunfreeware.com</a>.
                 If building your own, GCC must be configured to use Sun's linker. Note that
                 you should use a consistent version of GCC across any other C++ libraries
                 from <a href="http://www.sunfreeware.com">http://www.sunfreeware.com</a>.
                 If building your own, GCC must be configured to use Sun's linker. Note that
                 you should use a consistent version of GCC across any other C++ libraries

-                in use within Apache, but other C++ code can freely use a different version
-                as long as the necessary <span class="fixed">libstdc++.so</span> for a given
-                version is available</p>
+                in use within Apache, but other C++ code on your server can freely use a
+                different version as long as the necessary <span class="fixed">libstdc++.so</span>
+                for a given version is available</p>

             </li>
             <li>
                 <p>Use of GCC is recommended, but new releases of Sun's Forte compiler have
             </li>
             <li>
                 <p>Use of GCC is recommended, but new releases of Sun's Forte compiler have

@@ -776,7 +780,7 @@ most minor &quot;letter&quot; updates should be usable.</p>
     <p>On Windows, use of the installer is recommended. Visual Studio 6.0
     project files are included with the OpenSAML and Shibboleth source
     distributions for source builds if maximum flexibility to deal with
     <p>On Windows, use of the installer is recommended. Visual Studio 6.0
     project files are included with the OpenSAML and Shibboleth source
     distributions for source builds if maximum flexibility to deal with

-    security issues is desired.</p>
+    security issues or Apache variants is desired.</p>

 </blockquote>
 <h4><a name="3.c."></a>3.c. Configure Apache</h4>
 <blockquote>
 </blockquote>
 <h4><a name="3.c."></a>3.c. Configure Apache</h4>
 <blockquote>

@@ -814,15 +818,18 @@ most minor &quot;letter&quot; updates should be usable.</p>
             incoming sessions and lazy session startup for Shibboleth-protected
             resources. This works in concert with the <span class="fixed">shireURL</span>
             settings in the XML configuration file. Any virtual locations that are to be
             incoming sessions and lazy session startup for Shibboleth-protected
             resources. This works in concert with the <span class="fixed">shireURL</span>
             settings in the XML configuration file. Any virtual locations that are to be

-            used for this purpose should be defined to Apache here.</p></dd>
+            used for this purpose should be defined to Apache here.</p>
+            <p>Another option for some sites is to configure Shibboleth globally in
+            &quot;lazy&quot; session mode for all content. This allows the module to
+            detect session requests and pass them to the handler without the need to
+            configure the handler itself.</p>
+            </dd>

         </dl>
         </li>
         <li>If the OpenSSL libraries are not in the system&#39;s search path, they 
         should be added to the <span class="fixed">LD_LIBRARY_PATH</span> used by
         </dl>
         </li>
         <li>If the OpenSSL libraries are not in the system&#39;s search path, they 
         should be added to the <span class="fixed">LD_LIBRARY_PATH</span> used by

-        Apache. Generally libtool&#39;s linker options will insure that the modules
-        can locate the Shibboleth libraries, but if not, you may need to add
-        <span class="fixed">/opt/shibboleth/lib</span> to <span class="fixed">
-        LD_LIBRARY_PATH</span> as well.</li>
+        Apache. You will also usually need to add <span class="fixed">/opt/shibboleth/lib</span>
+        to <span class="fixed">LD_LIBRARY_PATH</span> as well.</li>

         <li>The SHAR must be started along with Apache. Among other methods on 
         Unix, this can be done either by creating a separate SHAR startup script 
         or by modifying Apache&#39;s RC script to start/stop the <span class="fixed">
         <li>The SHAR must be started along with Apache. Among other methods on 
         Unix, this can be done either by creating a separate SHAR startup script 
         or by modifying Apache&#39;s RC script to start/stop the <span class="fixed">

@@ -856,11 +863,12 @@ most minor &quot;letter&quot; updates should be usable.</p>
 <blockquote>
     <ol type="1">
         <li>The package includes an ISAPI filter and bundled extension for 
 <blockquote>
     <ol type="1">
         <li>The package includes an ISAPI filter and bundled extension for 

-        session processing in a single library, <span class="fixed">libexec\isapi_shib.dll</span>. 
+        session startup in a single library, <span class="fixed">libexec\isapi_shib.dll</span>. 

         This filter is configured using commands in <span class="fixed">
         C:\opt\shibboleth\etc\shibboleth\shibboleth.xml</span> (or wherever you've
         installed the software). Make sure you or the installer has added the lib
         directory to the path as directed in <a href="#3.b.">section 3.b.</a>
         This filter is configured using commands in <span class="fixed">
         C:\opt\shibboleth\etc\shibboleth\shibboleth.xml</span> (or wherever you've
         installed the software). Make sure you or the installer has added the lib
         directory to the path as directed in <a href="#3.b.">section 3.b.</a>

+        You will generally need to restart the system after installation.

         <p>Installing the extension into IIS is a two step process:
         <ol type="1">
             <li type="a">First, add the filter using the Internet Services 
         <p>Installing the extension into IIS is a two step process:
         <ol type="1">
             <li type="a">First, add the filter using the Internet Services 

@@ -871,9 +879,9 @@ most minor &quot;letter&quot; updates should be usable.</p>
             make sure it appears in the list <b>below</b> the &quot;sspifilt&quot; entry. 
             Restart IIS and make sure the filter shows up with a green arrow. 
             Check the Windows event log if it fails to load.</li>
             make sure it appears in the list <b>below</b> the &quot;sspifilt&quot; entry. 
             Restart IIS and make sure the filter shows up with a green arrow. 
             Check the Windows event log if it fails to load.</li>

-            <li type="a">Secondly, map a special file extension, such as
+            <li type="a">Secondly, map a special, distinct file extension, such as

             <span class="fixed">.shire</span>, to the ISAPI library so that 
             <span class="fixed">.shire</span>, to the ISAPI library so that 

-            virtual URLs can be specified to invoke the SHIRE handler for each 
+            virtual URLs can be specified to invoke the extension handler for each 

             web site. Right click on the machine icon on the left, and edit the 
             WWW Service master properties. On the &quot;Home Directory&quot; tab, add a 
             script mapping using the &quot;Configuration&quot; button. The &quot;Executable&quot; 
             web site. Right click on the machine icon on the left, and edit the 
             WWW Service master properties. On the &quot;Home Directory&quot; tab, add a 
             script mapping using the &quot;Configuration&quot; button. The &quot;Executable&quot; 

@@ -881,7 +889,10 @@ most minor &quot;letter&quot; updates should be usable.</p>
             &quot;Extension&quot; can be set to anything unlikely to conflict, but
             <span class="fixed">.shire</span> is assumed (and the dot must be 
             included). You should NOT select the option to limit verbs, and 
             &quot;Extension&quot; can be set to anything unlikely to conflict, but
             <span class="fixed">.shire</span> is assumed (and the dot must be 
             included). You should NOT select the option to limit verbs, and 

-            you MUST uncheck the &quot;Check that file exists&quot; box.</li>
+            you MUST uncheck the &quot;Check that file exists&quot; box. On newer
+            versions of IIS, checking the &quot;Script Engine&quot; box is suggested,
+            as it will permit the extension to handle requests in directories with only
+            script permissions assigned.</li>

             <li type="a"><font color=#444499>(IIS 6 Only)</font>  A new Web
             Service Extension must be defined for Shibboleth; without this, the
             mapping from <span class="fixed">*.shire</span> to <span
             <li type="a"><font color=#444499>(IIS 6 Only)</font>  A new Web
             Service Extension must be defined for Shibboleth; without this, the
             mapping from <span class="fixed">*.shire</span> to <span

@@ -893,8 +904,9 @@ most minor &quot;letter&quot; updates should be usable.</p>
         <li>All other aspects of configuration are handled via the
         <span class="fixed">shibboleth.xml</span> file and associated XML
         files described in subsequent sections. Particular use is made of 
         <li>All other aspects of configuration are handled via the
         <span class="fixed">shibboleth.xml</span> file and associated XML
         files described in subsequent sections. Particular use is made of 

-        the <span class="fixed">/SHIRE/Implementation/ISAPI</span> element that allows the
-        IIS sites to be mapped to fully-qualified hostnames for proper request mapping.</li>
+        the <span class="fixed">/SHIRE/Implementation/ISAPI</span> element that allows
+        IIS sites to be mapped to scheme, hostname, and port for proper request
+        mapping and generation of redirects.</li>

         <li>Instance IDs are used in the IIS metabase to identify web sites. In older versions,
         they are applied starting with 1(one) and number the web sites in order in the
         Internet Services Manager from top to bottom. Newer versions appear to assign
         <li>Instance IDs are used in the IIS metabase to identify web sites. In older versions,
         they are applied starting with 1(one) and number the web sites in order in the
         Internet Services Manager from top to bottom. Newer versions appear to assign

@@ -950,122 +962,161 @@ most minor &quot;letter&quot; updates should be usable.</p>
 <h3><a name="4."></a>4. Getting Running</h3>
 <h4><a name="4.a."></a>4.a. Configuring <span class="fixed">shibboleth.xml</span></h4>
 <blockquote>
 <h3><a name="4."></a>4. Getting Running</h3>
 <h4><a name="4.a."></a>4.a. Configuring <span class="fixed">shibboleth.xml</span></h4>
 <blockquote>

-       <p>The configuration for the target is mostly contained within <span class="fixed">shibboleth.xml</span>, located by default at <span class="fixed">\opt\shibboleth\etc\shibboleth\shibboleth.xml</span>.  The target comes pre-configured with certificates and settings that will work against a test origin running on the same server; however, there are several values that must later be changed to interoperate with other sites securely and effectively.</p><p>The following is a hyperlinked version of a basic configuration file, followed by a list of elements and attributes that must be modified.  The actual example shipped with Shibboleth includes many more options that are commented out and other elements necessary to support test functionality.  Click on any attribute or element for more information on its population and definition.</p>
+       <p>The configuration for the target is mostly contained within <span class="fixed">shibboleth.xml</span>,
+       located by default at <span class="fixed">\opt\shibboleth\etc\shibboleth\shibboleth.xml</span>.
+       The target comes pre-configured with certificates and settings that will work against a test origin
+       running on the same server; however, there are several values that must later be changed to interoperate
+       with other sites securely and effectively.</p>
+       <p>The following is a hyperlinked version of a basic configuration file, followed by a list of elements
+       and attributes that must be modified. The actual example shipped with Shibboleth includes many more options
+       that are commented out and other elements necessary to support test functionality.
+       Click on any attribute or element for more information on its population and definition.</p>

 
 

-<blockquote><span class="fixed">
+<pre>

 <a class="fixedlink" href="#confShibbolethTargetConfig">&lt;ShibbolethTargetConfig     xmlns=&quot;urn:mace:shibboleth:target:config:1.0&quot;
 <a class="fixedlink" href="#confShibbolethTargetConfig">&lt;ShibbolethTargetConfig     xmlns=&quot;urn:mace:shibboleth:target:config:1.0&quot;

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;logger=&quot;/opt/shibboleth/etc/shibboleth/shibboleth.logger&quot; clockSkew=&quot;180&quot;&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confExtensions">&lt;Extensions&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confLibrary">&lt;Library path=&quot;/opt/shibboleth/libexec/xmlproviders.so&quot; fatal=&quot;true&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confExtensions">&lt;/Extensions&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confSHAR">&lt;SHAR logger=&quot;/opt/shibboleth/etc/shibboleth/shar.logger&quot;&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confExtensions">&lt;Extensions&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confLibrary">&lt;Library path=&quot;/opt/shibboleth/libexec/shib-mysql-ccache.so&quot; fatal=&quot;false&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confExtensions">&lt;/Extensions&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confUnixListener">&lt;UnixListener address=&quot;/tmp/shar-socket&quot;/&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;!-- Primarily for IIS Deployments:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confTCPListener">&lt;TCPListener address=&quot;127.0.0.1&quot; port=&quot;12345&quot; acl=&quot;127.0.0.1&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confMemorySessionCache">&lt;MemorySessionCache cleanupInterval=&quot;300&quot; cacheTimeout=&quot;3600&quot; AATimeout=&quot;30&quot; AAConnectTimeout=&quot;15&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;defaultLifetime=&quot;1800&quot; retryInterval=&quot;300&quot; strictValidity=&quot;true&quot; propagateErrors=&quot;true&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confSHAR">&lt;/SHAR&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confSHIRE">&lt;SHIRE logger=&quot;/opt/shibboleth/etc/shibboleth/shire.logger&quot;&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confRequestMapProvider">&lt;RequestMapProvider type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confRequestMap">&lt;RequestMap applicationId=&quot;default&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confHost">&lt;Host name=&quot;localhost&quot; scheme=&quot;https&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confPath">&lt;Path name=&quot;secure&quot; requireSession=&quot;true&quot; exportAssertion=&quot;true&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confHost">&lt;/Host&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confHost">&lt;Host name=&quot;localhost&quot; scheme=&quot;http&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confPath">&lt;Path name=&quot;secure&quot; requireSession=&quot;true&quot; exportAssertion=&quot;true&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confHost">&lt;/Host&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confRequestMap">&lt;/RequestMap&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confRequestMapProvider">&lt;/RequestMapProvider&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;!-- IIS only:
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confImplementation">&lt;Implementation&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confISAPI">&lt;ISAPI normalizeRequest=&quot;true&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confSite">&lt;Site id=&quot;1&quot; host=&quot;localhost&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confISAPI">&lt;/ISAPI&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confImplementation">&lt;/Implementation&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --&gt;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confSHIRE">&lt;/SHIRE&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confApplications">&lt;Applications xmlns:saml=&quot;urn:oasis:names:tc:SAML:1.0:assertion&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;applicationId=&quot;default&quot; providerId=&quot;https://localhost/shibboleth/target&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confSessions">&lt;Sessions lifetime=&quot;7200&quot; timeout=&quot;3600&quot; checkAddress=&quot;true&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;shireURL=&quot;/Shibboleth.shire&quot; shireSSL=&quot;false&quot; cookieName=&quot;_shibsession_default&quot; cookieProps=&quot;; path=/&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;wayfURL=&quot;https://wayf.internet2.edu/InQueue/WAYF&quot;/&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confErrors">&lt;Errors shire=&quot;/opt/shibboleth/etc/shibboleth/shireError.html&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rm=&quot;/opt/shibboleth/etc/shibboleth/rmError.html&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;access=&quot;/opt/shibboleth/etc/shibboleth/accessError.html&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;supportContact=&quot;root@localhost&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;logoLocation=&quot;/shibtarget/logo.jpg&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;styleSheet=&quot;/shibtarget/main.css&quot;/&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confPolicy">&lt;Policy signRequest=&quot;false&quot; signedResponse=&quot;false&quot; signedAssertions=&quot;false&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;!--
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confAttributeDesignator">&lt;AttributeDesignator AttributeName=&quot;urn:mace:dir:attribute-def:eduPersonScopedAffiliation&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;AttributeNamespace=&quot;urn:mace:shibboleth:1.0:attributeNamespace:uri&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confAAPProvider">&lt;AAPProvider type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLAAP&quot; uri=&quot;/opt/shibboleth/etc/shibboleth/AAP.xml&quot;/&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confFederationProvider">&lt;FederationProvider type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLMetadata&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uri=&quot;/opt/shibboleth/etc/shibboleth/sites.xml&quot;/&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confTrustProvider">&lt;TrustProvider type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLTrust&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uri=&quot;/opt/shibboleth/etc/shibboleth/trust.xml&quot;/&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;!--
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confRevocationProvider">&lt;RevocationProvider type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLRevocation&quot;
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uri=&quot;/opt/shibboleth/etc/shibboleth/trust.xml&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&gt;
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="confAudience">&lt;saml:Audience&gt;urn:mace:inqueue&lt;/saml:Audience&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confPolicy">&lt;/Policy&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCredentialUse">&lt;CredentialUse TLS=&quot;defcreds&quot; Signing=&quot;defcreds&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confRelyingParty">&lt;RelyingParty Name=&quot;urn:mace:inqueue&quot; TLS=&quot;inqueuecreds&quot; Signing=&quot;inqueuecreds&quot;/&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCredentialUse">&lt;/CredentialUse&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confApplications">&lt;/Applications&gt;</a>
-<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCredentialsProvider">&lt;CredentialsProvider type=&quot;edu.internet2.middleware.shibboleth.common.Credentials&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCredentials">&lt;Credentials xmlns=&quot;urn:mace:shibboleth:credentials:1.0&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confFileResolver">&lt;FileResolver Id=&quot;defcreds&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confKey">&lt;Key format=&quot;PEM&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confPath">&lt;Path&gt;/opt/shibboleth/etc/shibboleth/shar.key&lt;/Path&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confKey">&lt;/Key&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCertificate">&lt;Certificate format=&quot;PEM&quot;&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confPath">&lt;Path&gt;/opt/shibboleth/etc/shibboleth/shar.crt&lt;/Path&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCertificate">&lt;/Certificate&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confFileResolver">&lt;/FileResolver&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCredentials">&lt;/Credentials&gt;</a>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;<a class="fixedlink" href="#confCredentialsProvider">&lt;/CredentialsProvider&gt;</a>
-<br>
-<br><a class="fixedlink" href="#confShibbolethTargetConfig">&lt;/ShibbolethTargetConfig&gt;</a>
-<br>
-</span></blockquote>
+    logger=&quot;/opt/shibboleth/etc/shibboleth/shibboleth.logger&quot; clockSkew=&quot;180&quot;&gt;</a>
+
+    <a class="fixedlink" href="#confExtensions">&lt;Extensions&gt;</a>
+        <a class="fixedlink" href="#confLibrary">&lt;Library path=&quot;/opt/shibboleth/libexec/xmlproviders.so&quot; fatal=&quot;true&quot;/&gt;</a>
+    <a class="fixedlink" href="#confExtensions">&lt;/Extensions&gt;</a>
+
+    <a class="fixedlink" href="#confSHAR">&lt;SHAR logger=&quot;/opt/shibboleth/etc/shibboleth/shar.logger&quot;&gt;</a>
+
+        <a class="fixedlink" href="#confExtensions">&lt;Extensions&gt;</a>
+            <a class="fixedlink" href="#confLibrary">&lt;Library path=&quot;/opt/shibboleth/libexec/shib-mysql-ccache.so&quot; fatal=&quot;false&quot;/&gt;</a>
+        <a class="fixedlink" href="#confExtensions">&lt;/Extensions&gt;</a>
+
+        <a class="fixedlink" href="#confUnixListener">&lt;UnixListener address=&quot;/tmp/shar-socket&quot;/&gt;</a>
+
+        &lt;!-- Primarily for Windows Deployments:
+        <a class="fixedlink" href="#confTCPListener">&lt;TCPListener address=&quot;127.0.0.1&quot; port=&quot;12345&quot; acl=&quot;127.0.0.1&quot;/&gt;</a>
+        --&gt;
+
+        &lt;!--
+        <a class="fixedlink" href="#confMemorySessionCache">&lt;MemorySessionCache cleanupInterval=&quot;300&quot; cacheTimeout=&quot;3600&quot; AATimeout=&quot;30&quot; AAConnectTimeout=&quot;15&quot;
+            defaultLifetime=&quot;1800&quot; retryInterval=&quot;300&quot; strictValidity=&quot;true&quot; propagateErrors=&quot;true&quot;/&gt;</a>
+        --&gt;
+        
+        <a class="fixedlink" href="#confMySQLSessionCache">&lt;MySQLSessionCache cleanupInterval=&quot;300&quot; cacheTimeout=&quot;3600&quot; AATimeout=&quot;30&quot; AAConnectTimeout=&quot;15&quot;
+                defaultLifetime=&quot;1800&quot; retryInterval=&quot;300&quot; strictValidity=&quot;true&quot; propagateErrors=&quot;true&quot;
+                mysqlTimeout=&quot;14400&quot;&gt;</a>
+            <a class="fixedlink" href="#confArgument">&lt;Argument&gt;&#x2D;&#x2D;language=/opt/shibboleth/share/english&lt;/Argument&gt;</a>
+            <a class="fixedlink" href="#confArgument">&lt;Argument&gt;datadir=/opt/shibboleth/data&lt;/Argument&gt;</a>
+        &lt;/MySQLSessionCache&gt;
+
+    <a class="fixedlink" href="#confSHAR">&lt;/SHAR&gt;</a>
+
+    <a class="fixedlink" href="#confSHIRE">&lt;SHIRE logger=&quot;/opt/shibboleth/etc/shibboleth/shire.logger&quot;&gt;</a>
+
+        <a class="fixedlink" href="#confRequestMapProvider">&lt;RequestMapProvider type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap&quot;&gt;</a>
+            <a class="fixedlink" href="#confRequestMap">&lt;RequestMap applicationId=&quot;default&quot;&gt;</a>
+                <a class="fixedlink" href="#confHost">&lt;Host name=&quot;localhost&quot; scheme=&quot;https&quot;&gt;</a>
+                    <a class="fixedlink" href="#confPath">&lt;Path name=&quot;secure&quot; requireSession=&quot;true&quot; exportAssertion=&quot;true&quot;&gt;
+                            &lt;!-- Example shows a subfolder on the SSL port assigned to a separate &lt;Application&gt; --&gt;
+                            &lt;Path name=&quot;admin&quot; applicationId=&quot;foo-admin&quot;/&gt;
+                       &lt;/Path&gt;</a>
+                <a class="fixedlink" href="#confHost">&lt;/Host&gt;</a>
+                <a class="fixedlink" href="#confHost">&lt;Host name=&quot;localhost&quot; scheme=&quot;http&quot;&gt;</a>
+                    <a class="fixedlink" href="#confPath">&lt;Path name=&quot;secure&quot; requireSession=&quot;true&quot; exportAssertion=&quot;true&quot;/&gt;</a>
+                <a class="fixedlink" href="#confHost">&lt;/Host&gt;</a>
+            <a class="fixedlink" href="#confRequestMap">&lt;/RequestMap&gt;</a>
+        <a class="fixedlink" href="#confRequestMapProvider">&lt;/RequestMapProvider&gt;</a>
+
+        &lt;!-- IIS only:
+        <a class="fixedlink" href="#confImplementation">&lt;Implementation&gt;</a>
+            <a class="fixedlink" href="#confISAPI">&lt;ISAPI normalizeRequest=&quot;true&quot;&gt;</a>
+                <a class="fixedlink" href="#confSite">&lt;Site id=&quot;1&quot; scheme=&quot;https&quot; host=&quot;localhost&quot; port=&quot;443&quot;/&gt;</a>
+            <a class="fixedlink" href="#confISAPI">&lt;/ISAPI&gt;</a>
+        <a class="fixedlink" href="#confImplementation">&lt;/Implementation&gt;</a>
+        --&gt;
+    <a class="fixedlink" href="#confSHIRE">&lt;/SHIRE&gt;</a>
+
+    <a class="fixedlink" href="#confApplications">&lt;Applications xmlns:saml=&quot;urn:oasis:names:tc:SAML:1.0:assertion&quot;
+        applicationId=&quot;default&quot; providerId=&quot;https://example.org/shibboleth/target&quot;
+        signRequest=&quot;false&quot; signedResponse=&quot;false&quot; signedAssertions=&quot;false&quot;&gt;</a>
+
+        <a class="fixedlink" href="#confSessions">&lt;Sessions lifetime=&quot;7200&quot; timeout=&quot;3600&quot; checkAddress=&quot;true&quot;
+            shireURL=&quot;/Shibboleth.shire&quot; shireSSL=&quot;false&quot; cookieName=&quot;_shibsession_default&quot; cookieProps=&quot;; path=/&quot;
+            wayfURL=&quot;https://wayf.internet2.edu/InQueue/WAYF&quot;&gt;</a>
+
+        <a class="fixedlink" href="#confErrors">&lt;Errors shire=&quot;/opt/shibboleth/etc/shibboleth/shireError.html&quot;
+            rm=&quot;/opt/shibboleth/etc/shibboleth/rmError.html&quot;
+            access=&quot;/opt/shibboleth/etc/shibboleth/accessError.html&quot;
+            supportContact=&quot;root@localhost&quot;
+            logoLocation=&quot;/shibtarget/logo.jpg&quot;
+            styleSheet=&quot;/shibtarget/main.css&quot;/&gt;</a>
+
+        <a class="fixedlink" href="#confCredentialUse">&lt;CredentialUse TLS=&quot;defcreds&quot; Signing=&quot;defcreds&quot;&gt;</a>
+            <a class="fixedlink" href="#confRelyingParty">&lt;RelyingParty Name=&quot;urn:mace:inqueue&quot; TLS=&quot;inqueuecreds&quot; Signing=&quot;inqueuecreds&quot;/&gt;</a>
+        <a class="fixedlink" href="#confCredentialUse">&lt;/CredentialUse&gt;</a>
+
+        &lt;!--
+        <a class="fixedlink" href="#confAttributeDesignator">&lt;AttributeDesignator AttributeName=&quot;urn:mace:dir:attribute-def:eduPersonScopedAffiliation&quot;
+            AttributeNamespace=&quot;urn:mace:shibboleth:1.0:attributeNamespace:uri&quot;/&gt;</a>
+        --&gt;
+
+        <a class="fixedlink" href="#confAAPProvider">&lt;AAPProvider type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLAAP&quot;
+            uri=&quot;/opt/shibboleth/etc/shibboleth/AAP.xml&quot;/&gt;</a>
+
+        <a class="fixedlink" href="#confFederationProvider">&lt;FederationProvider type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLMetadata&quot;
+            uri=&quot;/opt/shibboleth/etc/shibboleth/sites.xml&quot;/&gt;</a>
+
+        <a class="fixedlink" href="#confTrustProvider">&lt;TrustProvider type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLTrust&quot;
+            uri=&quot;/opt/shibboleth/etc/shibboleth/trust.xml&quot;/&gt;</a>
+
+        &lt;!--
+        <a class="fixedlink" href="#confRevocationProvider">&lt;RevocationProvider type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLRevocation&quot;
+            uri=&quot;/opt/shibboleth/etc/shibboleth/trust.xml&quot;/&gt;</a>
+        --&gt;
+
+        <a class="fixedlink" href="confAudience">&lt;saml:Audience&gt;urn:mace:inqueue&lt;/saml:Audience&gt;</a>
+
+        &lt;!-- Override settings for this application.
+        <a class="fixedlink" href="confApplication">&lt;Application id=&quot;foo-admin&quot;&gt;</a>
+            <a class="fixedlink" href="#confSessions">&lt;Sessions lifetime=&quot;7200&quot; timeout=&quot;3600&quot; checkAddress=&quot;true&quot;
+                shireURL=&quot;/secure/admin/Shibboleth.shire&quot; shireSSL=&quot;true&quot; cookieProps=&quot;; path=/secure/admin; secure&quot;
+                wayfURL=&quot;https://wayf.internet2.edu/InQueue/WAYF&quot;/&gt;</a>
+            <a class="fixedlink" href="#confAttributeDesignator">&lt;saml:AttributeDesignator AttributeName=&quot;urn:mace:dir:attribute-def:eduPersonPrincipalName&quot;
+                AttributeNamespace=&quot;urn:mace:shibboleth:1.0:attributeNamespace:uri&quot;/&gt;</a>
+        <a class="fixedlink" href="confApplication">&lt;/Application&gt;</a>
+        --&gt;
+
+    <a class="fixedlink" href="#confApplications">&lt;/Applications&gt;</a>
+
+    <a class="fixedlink" href="#confCredentialsProvider">&lt;CredentialsProvider type=&quot;edu.internet2.middleware.shibboleth.common.Credentials&quot;&gt;</a>
+        <a class="fixedlink" href="#confCredentials">&lt;Credentials xmlns=&quot;urn:mace:shibboleth:credentials:1.0&quot;&gt;</a>
+            <a class="fixedlink" href="#confFileResolver">&lt;FileResolver Id=&quot;defcreds&quot;&gt;</a>
+                <a class="fixedlink" href="#confKey">&lt;Key format=&quot;PEM&quot; password=&quot;secret&quot;&gt;</a>
+                    <a class="fixedlink" href="#confCredPath">&lt;Path&gt;/opt/shibboleth/etc/shibboleth/shar.key&lt;/Path&gt;</a>
+                <a class="fixedlink" href="#confKey">&lt;/Key&gt;</a>
+                <a class="fixedlink" href="#confCertificate">&lt;Certificate format=&quot;PEM&quot;&gt;</a>
+                    <a class="fixedlink" href="#confCredPath">&lt;Path&gt;/opt/shibboleth/etc/shibboleth/shar.crt&lt;/Path&gt;</a>
+                    <a class="fixedlink" href="#confCAPath">&lt;CAPath&gt;/opt/shibboleth/etc/shibboleth/ca.crt&lt;/CAPath&gt;</a>
+                <a class="fixedlink" href="#confCertificate">&lt;/Certificate&gt;</a>
+            <a class="fixedlink" href="#confFileResolver">&lt;/FileResolver&gt;</a>
+        <a class="fixedlink" href="#confCredentials">&lt;/Credentials&gt;</a>
+    <a class="fixedlink" href="#confCredentialsProvider">&lt;/CredentialsProvider&gt;</a>
+
+<a class="fixedlink" href="#confShibbolethTargetConfig">&lt;/ShibbolethTargetConfig&gt;</a>
+</pre>

 
 <p>The following changes must be made to the default configuration before the target will interoperate in a federation.</p>
     <ol type="1">
         <li> 
 
 <p>The following changes must be made to the default configuration before the target will interoperate in a federation.</p>
     <ol type="1">
         <li> 

-        <p>The main <a href="#confApplications"><span class="fixed">Applications</span></a> element's <span class="fixed">providerId</span> attribute must be changed to reflect the URI this target will use to identify itself to origins by default. This will often be approved or supplied by a federation.</p>
+        <p>The main <a href="#confApplications"><span class="fixed">Applications</span></a> element's
+        <span class="fixed">providerId</span> attribute must be changed to reflect the URI this target will
+        use to identify itself to origins by default. This will often be approved or supplied by a federation.</p>

                </li>
                <li>
                </li>
                <li>

-               <p>The <span class="fixed">supportContact</span> and error templates for the target found in the <a href="#confErrors"><span class="fixed">Errors</span></a> element should be changed to ensure that users have a proper support mechanism.</p>
+               <p>The <span class="fixed">supportContact</span> and error templates for the target found in the
+               <a href="#confErrors"><span class="fixed">Errors</span></a> element should be changed to ensure that
+               users have a proper support mechanism.</p>

                </li>
                <li>
                </li>
                <li>

-               <p>Proper credentials for this target signed by an authority that the federation recognizes must be referenced by the <a href="#confCredentials"><span class="fixed">Credentials</span></a> element.  The default configuration points at flat files with widely-available, insecure keys and certificates.  Note that keys are supported in a variety of formats: DER, PEM, encrypted PEM, PKCS8, and encrypted PKCS8.</p>
+               <p>Proper credentials for this target signed by an authority that the federation recognizes must be
+                referenced by the <a href="#confCredentials"><span class="fixed">Credentials</span></a> element.
+                The default configuration points at files containing widely-available, insecure keys and certificates.
+                Note that keys are supported in a variety of formats: DER, PEM, encrypted PEM, PKCS8, and encrypted PKCS8.</p>

         </li>
         <li>
         <p><a href="#confFederationProvider"><span class="fixed">FederationProvider</span></a> and
         </li>
         <li>
         <p><a href="#confFederationProvider"><span class="fixed">FederationProvider</span></a> and

@@ -1085,154 +1136,377 @@ most minor &quot;letter&quot; updates should be usable.</p>
     It is recommended that after initial installation is 
     completed, the log level in both files be left at either <span class="fixed">
     INFO</span> or <span class="fixed">WARN</span>.</p>
     It is recommended that after initial installation is 
     completed, the log level in both files be left at either <span class="fixed">
     INFO</span> or <span class="fixed">WARN</span>.</p>

-    <p>All elements are optional unless otherwise specified.  All attributes of an element are optional unless designated <span class="mandatory">mandatory</span> by a purple background.</p>
+    <p>All elements are optional unless otherwise specified.  All attributes of an element are optional unless
+    designated <span class="mandatory">mandatory</span> by a purple background.</p>

     <dl>
         <dd class="attribute"><a name="confAAPProvider"><span class="fixed">&lt;AAPProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLAAP&quot;</span> uri=&quot;<i>pathname</i>&quot;/&gt;</span></dd>
     <dl>
         <dd class="attribute"><a name="confAAPProvider"><span class="fixed">&lt;AAPProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLAAP&quot;</span> uri=&quot;<i>pathname</i>&quot;/&gt;</span></dd>

-        <dd class="value">This element is used to specify individual attribute acceptance policies that will apply to this application and may appear zero or more times within the <a href="#confPolicy"><span class="fixed">Policy</span></a> element.  For information about these policies and their format, refer to <a href="#4.e.">section 4.e</a>.
-        <p>The default set of AAP providers can be overridden within individual <a href="#confApplication"><span class="fixed">Application</span></a> elements.</p></dd>
+        <dd class="value">
+        <p>This element is used to specify individual attribute acceptance policies that will apply to an application
+        and may appear zero or more times within the <a href="#confApplications"><span class="fixed">Applications</span></a>
+        or <a href="#confApplication"><span class="fixed">Application</span></a> element. For information about these
+        policies and their format, refer to <a href="#4.e.">section 4.e</a>.</p>
+        <p>The default set of AAP providers in the <a href="#confApplications"><span class="fixed">Applications</span></a>
+        element can be replaced within individual <a href="#confApplication"><span class="fixed">Application</span></a> elements.</p>
+        </dd>

 
 

-        <dd class="attribute"><a name="confApplication"><span class="fixed">&lt;Application <span class="mandatory">id=&quot;<i>identifier</i>&quot;</span> providerId=&quot;<i>identifier</i>&quot;&gt;</span></dd>
-        <dd class="value">Individual applications that require different attributes, session settings, policies, etc. can be differentiated from the default configuration as specified in the <a href="#confApplications"><span class="fixed">Applications</span></a> element, which contains this element.  It must contain a <a href="#confSessions"><span class="fixed">Sessions</span></a> element, but overriding the default <a href="#confErrors"><span class="fixed">Errors</span></a>, <a href="#confPolicy"><span class="fixed">Policy</span></a>, and <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a> elements is optional.
-<ul>
-<li class="mandatory"><span class="fixed">id</span>: This attribute defines an internal identifier allowing individual <span class="fixed">applicationId</span> attributes as part of <a href="#confHost"><span class="fixed">Host</span></a> and <a href="#confPath"><span class="fixed">Path</span></a> elements to point to this <span class="fixed">Application</span> to handle requests.</li>
-<li><span class="fixed">providerId</span>: Distinct from the internal identifier, the <span class="fixed">providerId</span> is the unique identifier that will be used when communicating with origin sites to request authentication or attributes.  This value is referenced by origins when creating rules for the release of attributes to targets and will often provided to federations to facilitate transactions.  If none is specified, the default <a href="#confApplications><span class="fixed">Applications</span></a> element's <span class="fixed">providerId</span> applies.</li>
-</ul></dd>
+        <dd class="attribute"><a name="confApplication"><span class="fixed">&lt;Application <span class="mandatory">id=&quot;<i>identifier</i>&quot;</span> providerId=&quot;<i>identifier</i>&quot; signRequest=&quot;<i>true/false</i>&quot; signedResponse=&quot;<i>true/false</i>&quot; signedAssertions=&quot;<i>true/false</i>&quot;&gt;</span></dd>
+        <dd class="value">
+        <p>Individual applications that require different attributes, session settings, metadata, etc. can be differentiated
+        from the default configuration as specified in the <a href="#confApplications"><span class="fixed">Applications</span></a>
+        element. It must contain a <a href="#confSessions"><span class="fixed">Sessions</span></a> element, but overriding other
+        elements is optional.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">id</span>: This attribute defines an internal identifier allowing
+                individual <span class="fixed">applicationId</span> attributes as part of
+                <a href="#confHost"><span class="fixed">Host</span></a> and <a href="#confPath"><span class="fixed">Path</span></a>
+                elements to point to this <span class="fixed">Application</span> to handle requests.</li>
+            <li><span class="fixed">providerId</span>: Distinct from the internal identifier, this is the unique identifier
+                that will be used when communicating with origin sites to request authentication or attributes.
+                This value is referenced by origins when creating rules for the release of attributes to targets and will
+                often be provided to federations to facilitate origin configuration. If none is specified, the default
+                <a href="#confApplications><span class="fixed">Applications</span></a> element's
+                <span class="fixed">providerId</span> applies.</li>
+            <li><span class="fixed">signRequest</span>: If <span class="fixed">true</span>, the target will sign attribute
+            requests that it sends to origins on behalf of this application. This is usually unnecessary, as the
+            TLS/SSL transport can provide authentication more efficiently.</li>
+            <li><span class="fixed">signedResponse</span>: If <span class="fixed">true</span>, the target will require that
+            all SAML attribute responses it receives for this application be signed.</li>
+            <li><span class="fixed">signedAssertions</span>: If <span class="fixed">true</span>, the target will require that
+            individual SAML assertions it receives for this application be signed. This may be particularly useful if the
+            application is forwarding the assertion, but requires a liberal (or no) AAP to avoid corrupting the signature.</li>
+            </ul>
+        </dd>

 
 

-        <dd class="attribute"><a name="confApplications"><span class="fixed">&lt;Applications id=&quot;<i>default</i>&quot; <span class="mandatory">providerId=&quot;<i>identifier</i>&quot;</span>&gt;</span></dd>
-        <dd class="value">The <span class="fixed">Applications</span> element must appear once and contains default settings for requests handled by the target whose applicable request mapping using matching <a href="#confHost"><span class="fixed">Host</span></a> and <a href="#confPath"><span class="fixed">Path</span></a> elements has no declared <span class="fixed">applicationId</span> attribute.  These values are also used as defaults if individual <a href="#confApplication"><span class="fixed">Application</span></a> elements do not specify some settings.  It must contain at least one each of the <a href="#confSessions"><span class="fixed">Sessions</span></a>, <a href="#confErrors"><span class="fixed">Errors</span></a>, <a href="#confPolicy"><span class="fixed">Policy</span></a>, and <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a> elements, and may contain individual <a href="#confApplication"><span class="fixed">Application</span></a> elements.  Contained by the main <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element.
-<ul>
-<li><span class="fixed">id</span>: This attribute has a fixed value of "default" and should not be changed.</li>
-<li class="mandatory"><span class="fixed">providerId</span>: Distinct from the internal identifier, the <span class="fixed">providerId</span> is the unique identifier that will be used when communicating with origin sites to request authentication or attributes.  This value is referenced by origins when creating rules for the release of attributes to targets and will often provided to federations to facilitate transactions.</li>
-</ul></dd>
+        <dd class="attribute"><a name="confApplications"><span class="fixed">&lt;Applications <span class="mandatory">id=&quot;<i>default</i>&quot; providerId=&quot;<i>identifier</i>&quot;</span> signRequest=&quot;<i>true/false</i>&quot; signedResponse=&quot;<i>true/false</i>&quot; signedAssertions=&quot;<i>true/false</i>&quot;&gt;</span></dd>
+        <dd class="value">
+        <p>The <span class="fixed">Applications</span> element must appear once and contains default settings for requests
+        handled by the target. It must contain at least one each of the <a href="#confSessions"><span class="fixed">Sessions</span></a>,
+        and <a href="#confErrors"><span class="fixed">Errors</span></a> elements, and may contain
+        <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a>,
+        <a href="#confAttributeDesignator"><span class="fixed">saml:AttributeDesignator</span></a>,
+        <a href="#confAudience"><span class="fixed">saml:Audience</span></a>,
+        <a href="#confFederationProvider"><span class="fixed">FederationProvider</span></a>,
+        <a href="#confTrustProvider"><span class="fixed">TrustProvider</span></a>,
+        <a href="#confRevocationProvider"><span class="fixed">RevocationProvider</span></a>,
+        and <a href="#confApplication"><span class="fixed">Application</span></a> elements.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">id</span>: This attribute has a fixed value of "default" and should not be changed.</li>
+            <li class="mandatory"><span class="fixed">providerId</span>: Distinct from the internal identifier, the
+                <span class="fixed">providerId</span> is the unique identifier that will be used when communicating
+                with origin sites to request authentication or attributes. This value is referenced by origins when
+                creating rules for the release of attributes to targets and will often be provided to federations to
+                facilitate origin configuration.</li>
+            <li><span class="fixed">signRequest</span>: If <span class="fixed">true</span>, the target will sign attribute
+            requests that it sends to origins by default. This is usually unnecessary, as the TLS/SSL transport can provide
+            authentication more efficiently.</li>
+            <li><span class="fixed">signedResponse</span>: If <span class="fixed">true</span>, the target will require that
+            all SAML attribute responses it receives are signed by default.</li>
+            <li><span class="fixed">signedAssertions</span>: If <span class="fixed">true</span>, the target will require that
+            individual SAML assertions it receives are signed by default. This may be particularly useful if the
+            application is forwarding the assertion, but requires a liberal (or no) AAP to avoid corrupting the signature.</li>
+            </ul>
+        <p>Default settings can be overridden by using the <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> to
+        assign a non-default <span class="fixed">applicationId</span> to particular content in
+        <a href="#confHost"><span class="fixed">Host</span></a> and <a href="#confPath"><span class="fixed">Path</span></a>
+        elements. An <a href="#confApplication"><span class="fixed">Application</span></a> element is then inserted containing
+        a matching <span class="fixed">id</span> attribute, and finally specific elements that override the defaults are
+        placed within it. A fully specified <a href="#confSessions"><span class="fixed">Sessions</span></a> element is
+        always required for any new application created, because each application needs a distinct
+        <span class="fixed">shireURL</span> so that new sessions can be unambiguously mapped to a particular application.</p>
+        </dd>

 
         <dd class="attribute"><a name="confArgument"><span class="fixed">&lt;Argument&gt;<i>value</i>&lt;/Argument&gt;</span></dd>
 
         <dd class="attribute"><a name="confArgument"><span class="fixed">&lt;Argument&gt;<i>value</i>&lt;/Argument&gt;</span></dd>

-        <dd class="value">The <span class="fixed">Argument</span> element is used in the <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> element to specify one or more arguments to pass to the MySQL database engine.</dd>
+        <dd class="value">
+        <p>The <span class="fixed">Argument</span> element is used in the
+        <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> element to specify one or more
+        arguments to pass to the MySQL database engine.</p>
+        </dd>

 
         <dd class="attribute"><a name="confAttributeDesignator"><span class="fixed">&lt;saml:AttributeDesignator <span class="mandatory">AttributeName=&quot;<i>name</i>&quot; AttributeNamespace=&quot;<i>namespace</i>&quot;</span>&gt;</span></dd>
 
         <dd class="attribute"><a name="confAttributeDesignator"><span class="fixed">&lt;saml:AttributeDesignator <span class="mandatory">AttributeName=&quot;<i>name</i>&quot; AttributeNamespace=&quot;<i>namespace</i>&quot;</span>&gt;</span></dd>

-        <dd class="value">The <span class="fixed">AttributeDesignator</span> element is used in the <a href="#confPolicy"><span class="fixed">Policy</span></a> element to name an attribute to specifically request from origins on behalf of an application. If none are specified, the application will be given anything the origin allows it to see.
-<ul>
-<li class="mandatory"><span class="fixed">AttributeName</span>: Specifies the name of a SAML attribute, generally a URI.</li>
-<li class="mandatory"><span class="fixed">AttributeNamespace</span>: Specifies the attribute's SAML namespace, which Shibboleth by convention sets to &quot;urn:mace:shibboleth:1.0:attributeNamespace:uri&quot;.</li>
-</ul>
-<p>The default set of designators can be overridden within individual <a href="#confApplication"><span class="fixed">Application</span></a> elements, but if defaults are specified, it isn't possible to &quot;remove&quot; them and revert to none.</p>
-</dd>
+        <dd class="value">
+        <p>The <span class="fixed">AttributeDesignator</span> element is used in the
+        <a href="#confApplications"><span class="fixed">Applications</span></a> and
+        <a href="#confApplication"><span class="fixed">Application</span></a> elements to name an attribute to specifically
+        request from origins on behalf of an application. If none are specified, the application will be given anything
+        the origin allows it to receive.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">AttributeName</span>: Specifies the name of a SAML attribute, generally a URI.</li>
+            <li class="mandatory"><span class="fixed">AttributeNamespace</span>: Specifies the attribute's SAML namespace,
+            which Shibboleth by convention sets to &quot;urn:mace:shibboleth:1.0:attributeNamespace:uri&quot;.</li>
+            </ul>
+        <p>The default set of designators can be overridden within individual
+        <a href="#confApplication"><span class="fixed">Application</span></a> elements, but if default elements are specified,
+        it isn't possible to &quot;remove&quot; them and revert to none within a particular application.</p>
+        </dd>

 
         <dd class="attribute"><a name="confAudience"><span class="fixed">&lt;saml:Audience&gt;<i>value</i>&lt;/saml:Audience&gt;</span></dd>
 
         <dd class="attribute"><a name="confAudience"><span class="fixed">&lt;saml:Audience&gt;<i>value</i>&lt;/saml:Audience&gt;</span></dd>

-        <dd class="value">The <span class="fixed">Audience</span> element is used in the <a href="#confPolicy"><span class="fixed">Policy</span></a> element to specify one or more SAML audience URIs to treat as valid while processing assertions. A target application always includes its own <span class="fixed">providerId</span> as an audience value.
-            <p>Within an <a href="#confApplication"><span class="fixed">Application</span></a> element, this setting is not inherited from the <a href="#confApplications"><span class="fixed">Applications</span></a> element. All values desired must be specified.</p></dd>
+        <dd class="value">
+        <p>The <span class="fixed">Audience</span> element is used in the
+        <a href="#confApplications"><span class="fixed">Applications</span></a> and
+        <a href="#confApplication"><span class="fixed">Application</span></a> elements element to specify one or more
+        SAML audience URIs to designate while processing assertions. Audience values are used by origins to constrain the
+        parties they issue assertions for. A target application always includes its own <span class="fixed">providerId</span>
+        as an audience value.</p>
+        <p>Within an <a href="#confApplication"><span class="fixed">Application</span></a> element, this setting is not
+        inherited from the <a href="#confApplications"><span class="fixed">Applications</span></a> element. Any values
+        desired must be specified. In most cases, this element can be omitted.</p>
+        </dd>

 
         <dd class="attribute"><a name="confCAPath"><span class="fixed">&lt;CAPath&gt;<i>pathname</i>&lt;/CAPath&gt;</span></dd>
 
         <dd class="attribute"><a name="confCAPath"><span class="fixed">&lt;CAPath&gt;<i>pathname</i>&lt;/CAPath&gt;</span></dd>

-        <dd class="value">Paired with a <a href="#confPath"><span class="fixed">Path</span></a> element and contained by a <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> element, this element allows for the specification of additional certificates in the chain up to the trust anchor.  As many <span class="fixed">CAPath</span> elements as necessary to complete the chain may be specified.  May be needed if the relying party does not possess the entire CA chain already.</dd>
+        <dd class="value">
+        <p>Paired with a <a href="#confCredPath"><span class="fixed">Path</span></a> element within a
+        <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> element, it allows for the specification
+        of additional certificates in a chain up to a trust anchor. As many <span class="fixed">CAPath</span> elements as
+        necessary to complete the chain may be specified. May be needed if the relying party does not possess the entire CA
+        chain already.</p>
+        </dd>

 
         <dd class="attribute"><a name="confCertificate"><span class="fixed">&lt;Certificate format=&quot;<i>type</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confCertificate"><span class="fixed">&lt;Certificate format=&quot;<i>type</i>&quot;&gt;</span></dd>

-        <dd class="value">This specifies the certificate corresponding to this set of credentials.  The certificate itself must be referred to using a <a href="#confPath"><span class="fixed">Path</span></a> element contained by this element.  If this certificate isn't self-signed or signed by a root familiar to the relying party, the files of certificates in the path to the root may be specified using one or more <a href="#confPath"><span class="fixed">CAPath</span></a> elements.  Valid encodings are <span class="fixed">PEM</span>, <span class="fixed">DER</span>, and <span class="fixed">PKCS12</span>.  It resides within the <a href="#confFileResolver"><span class="fixed">FileResolver</span> element and must be paired with the corresponding private key using the <a href="#confKey"><span class="fixed">Key</span></a> element.</dd>
+        <dd class="value">
+        <p>This specifies the certificate corresponding to this set of credentials. The certificate itself must be specified
+        by a <a href="#confCredPath"><span class="fixed">Path</span></a> element contained by this element. If the certificate
+        isn't self-signed or signed by an authority familiar to the relying party, the files of certificates in the path to
+        the root authority may be specified using one or more <a href="#confCAPath"><span class="fixed">CAPath</span></a> elements.
+        Valid formats are <span class="fixed">PEM</span>, <span class="fixed">DER</span>, and <span class="fixed">PKCS12</span>.</p>
+        <p>It's placed within the <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> element and must be
+        paired with the corresponding private key using the <a href="#confKey"><span class="fixed">Key</span></a> element.</p>
+        </dd>

 
         <dd class="attribute"><a name="confCredentials"><span class="fixed">&lt;Credentials xmlns=&quot;urn:mace:shibboleth:credentials:1.0&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confCredentials"><span class="fixed">&lt;Credentials xmlns=&quot;urn:mace:shibboleth:credentials:1.0&quot;&gt;</span></dd>

-        <dd class="value">This element is the container for credentials used by the XML-based credentials provider with type &quot;edu.internet2.middleware.shibboleth.common.Credentials&quot;.  These credentials are used by the target to authenticate itself in SSL sessions or sign attribute requests, depending on configuration.  It must contain one or more <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> elements.</dd>
+        <dd class="value">
+        <p>This element is the container for credentials used by the XML-based credentials provider with type
+        &quot;edu.internet2.middleware.shibboleth.common.Credentials&quot;. These credentials are used by the target to
+        authenticate itself in SSL sessions or sign attribute requests, depending on application configuration. It must contain
+        one or more <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> elements.</p>
+        </dd>

 
         <dd class="attribute"><a name="confCredentialsProvider"><span class="fixed">&lt;CredentialsProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.Credentials&quot;</span>&gt;</span></dd>
 
         <dd class="attribute"><a name="confCredentialsProvider"><span class="fixed">&lt;CredentialsProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.Credentials&quot;</span>&gt;</span></dd>

-        <dd class="value">This element is the container for providers of credentials used by the target and is contained by the <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element.  The supplied provider of type &quot;edu.internet2.middleware.shibboleth.common.Credentials&quot; must contain one <a href="#confCredentials"><span class="fixed">Credentials</span></a> element detailing the individual credentials to be used by the target. Other provider types might require different content.</dd>
+        <dd class="value">
+        <p>This element is the container for providers of credentials used by the target and is placed inside the
+        <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element. The supplied
+        provider of type &quot;edu.internet2.middleware.shibboleth.common.Credentials&quot; must contain one
+        <a href="#confCredentials"><span class="fixed">Credentials</span></a> element detailing the credentials
+        to be used by the target. Other provider types might require different content.</p>
+        </dd>

 
         <dd class="attribute"><a name="confCredentialUse"><span class="fixed">&lt;CredentialUse <span class="mandatory">TLS=&quot;<i>string</i>&quot; Signing=&quot;<i>string</i>&quot;</span>&gt;</span></dd>
 
         <dd class="attribute"><a name="confCredentialUse"><span class="fixed">&lt;CredentialUse <span class="mandatory">TLS=&quot;<i>string</i>&quot; Signing=&quot;<i>string</i>&quot;</span>&gt;</span></dd>

-        <dd class="value">Required in the <a href="#confApplications"><span class="fixed">Applications</span></a> element or used in <a href="#confApplication"><span class="fixed">Application</span></a> elements to override the defaults, this specifies the credentials used by the target for signing and TLS/SSL. The <span class="fixed">TLS</span> and <span class="fixed">Signing</span> attribute values reference the identifiers of credential resolvers defined in <a href="#confCredentialsProvider"><span class="fixed">CredentialsProvider</span></a> elements. May also contain <a href="#confRelyingParty"><span class="fixed">RelyingParty</span></a> elements that specify the credentials to use for specific origins or federations.</dd>
+        <dd class="value">
+        <p>Used in the <a href="#confApplications"><span class="fixed">Applications</span></a> or
+        <a href="#confApplication"><span class="fixed">Application</span></a> elements to specify the credentials used by
+        applications for signing and TLS/SSL. The <span class="fixed">TLS</span> and <span class="fixed">Signing</span>
+        attribute values reference the identifiers of credential resolvers defined in the
+        <a href="#confCredentialsProvider"><span class="fixed">CredentialsProvider</span></a> element. May also contain
+        <a href="#confRelyingParty"><span class="fixed">RelyingParty</span></a> elements that specify the credentials
+        to use for specific origins or federations.</p>
+        </dd>

 
         <dd class="attribute"><a name="confErrors"><span class="fixed">&lt;Errors <span class="mandatory">shire=&quot;<i>pathname</i>&quot; rm=&quot;<i>pathname</i>&quot; access=&quot;<i>pathname</i>&quot;</span> supportContact=&quot;<i>e-mail</i>&quot; logoLocation=&quot;<i>URL</i>&quot;/&gt;</span></dd>
 
         <dd class="attribute"><a name="confErrors"><span class="fixed">&lt;Errors <span class="mandatory">shire=&quot;<i>pathname</i>&quot; rm=&quot;<i>pathname</i>&quot; access=&quot;<i>pathname</i>&quot;</span> supportContact=&quot;<i>e-mail</i>&quot; logoLocation=&quot;<i>URL</i>&quot;/&gt;</span></dd>

-        <dd class="value">Shibboleth is capable of displaying customized error pages based on templates and special resources provided by additional attributes in this element.  These should all be customized to fit the requirements of the target application.  For more information on configuration of error page generation, please see <a href="#4.b.">section 4.b</a>.
-<ul>
-<li class="mandatory"><span class="fixed">shire</span>: Specifies the location of the template for the error page generated when there is an error re-directing the user to the WAYF or processing a new session sign-on.</li>
-<li class="mandatory"><span class="fixed">rm</span>: Specifies the location of the template for the error page generated if internal errors occur when supplying attributes to the application.</li>
-<li class="mandatory"><span class="fixed">accessError</span>: Specifies the location of the template for the page displayed to users when access to a protected resource is denied based on access control. This is distinct from when errors occur during the evaluation process itself, and indicates a denial of authorization.</li>
-<li><span class="fixed">supportContact</span>: Specifies a support e-mail address for the user to contact.</li>
-<li><span class="fixed">logoLocation</span>: Specifies the location of the logo used in the generation of error pages. This logo can be in any format that the web browser will understand, and should be a URL (absolute or relative) that will return a valid logo.</li>
-</ul>
-The last two attributes are examples of tags that can be inserted at runtime into the templates. Arbitrary attributes may be specified in this element simply by adding them; no additional configuration is necessary.  If there is a matching ShibMLP tag in the error page template as designed in <a href="#4.b.">4.b</a>, Shibboleth will insert the value of that attribute.
-</dd>
+        <dd class="value">
+        <p>Shibboleth is capable of displaying customized error pages based on templates and information provided by
+        additional attributes in this element. These should all be customized to fit the requirements of the target application.
+        For more information on configuration of error page generation, please see <a href="#4.b.">section 4.b</a>.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">shire</span>: Specifies the location of the template for the error page
+            generated when there is an error re-directing the user to the WAYF or processing a new session sign-on.</li>
+            <li class="mandatory"><span class="fixed">rm</span>: Specifies the location of the template for the error page
+            generated if internal errors occur when supplying attributes to the application.</li>
+            <li class="mandatory"><span class="fixed">accessError</span>: Specifies the location of the template for the page
+            displayed to users when access to a protected resource is denied based on access control. This is distinct
+            from when errors occur during the evaluation process itself, and indicates a denial of authorization.</li>
+            <li><span class="fixed">supportContact</span>: Specifies a support e-mail address for the user to contact.</li>
+            <li><span class="fixed">logoLocation</span>: Specifies the location of the logo used in the generation of error pages.
+            This logo can be in any format that the web browser will understand, and should be a URL (absolute or relative) that
+            will return a valid logo.</li>
+            </ul>
+        <p>The last two attributes are examples of tags that can be inserted at runtime into the templates. Arbitrary
+        attributes may be specified in this element simply by adding them; no additional configuration is necessary.
+        If there is a matching ShibMLP tag in the error page template as designed in <a href="#4.b.">4.b</a>, Shibboleth
+        will insert the value of that attribute.</p>
+        </dd>

 
         <dd class="attribute"><a name="confExtensions"><span class="fixed">&lt;Extensions&gt;</span></dd>
 
         <dd class="attribute"><a name="confExtensions"><span class="fixed">&lt;Extensions&gt;</span></dd>

-        <dd class="value">Extension libraries for one of the Shibboleth components or the entire target can be specified using this element depending on where it's present.  It may be contained by any of the <a href="#confSHAR"><span class="fixed">SHAR</span></a>, <a href="#confSHIRE"><span class="fixed">SHIRE</span></a>, or <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> elements.  It should always contain one or more <a href="#confLibrary"><span class="fixed">Library</span></a> elements.</dd>
+        <dd class="value">
+        Extension libraries for one of the Shibboleth components or the entire target can be specified using this element
+        depending on where it's present. It may be contained by any of the
+        <a href="#confSHAR"><span class="fixed">SHAR</span></a>, <a href="#confSHIRE"><span class="fixed">SHIRE</span></a>,
+        or <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> elements.
+        It must contain one or more <a href="#confLibrary"><span class="fixed">Library</span></a> elements.
+        </dd>

 
         <dd class="attribute"><a name="confFederationProvider"><span class="fixed">&lt;FederationProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLMetadata&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confFederationProvider"><span class="fixed">&lt;FederationProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLMetadata&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value">This element, when specified within a <a href="#confPolicy"><span class="fixed">Policy</span></a> element, points to operational metadata either inline within the element or in a local XML file. Federations will often publish signed XML files for targets to download periodically. This should be refreshed regularly; see <a href="#4.g.">section 4.g</a> for further details.
-        <p>If an <a href="#confApplication"><span class="fixed">Application</span></a> does not include any <span class="fixed">FederationProvider</span> elements, the default set is used.</p>
+        <dd class="value">
+        <p>This element, when specified within an <a href="#confApplications"><span class="fixed">Applications</span></a>
+        or <a href="#confApplication"><span class="fixed">Application</span></a> element, points to operational metadata either
+        inline within the element or in a local XML file. Federations will often publish signed XML files for targets to download
+        periodically. This should be refreshed regularly; see <a href="#4.g.">section 4.g</a> for further details.</p>
+        <p>The default set of federation providers in the <a href="#confApplications"><span class="fixed">Applications</span></a>
+        element can be replaced within individual <a href="#confApplication"><span class="fixed">Application</span></a> elements.</p>

         </dd>
 
         <dd class="attribute"><a name="confFileResolver"><span class="fixed">&lt;FileResolver <span class="mandatory">Id=&quot;<i>string</i>&quot;</span>&gt;</span></dd>
         </dd>
 
         <dd class="attribute"><a name="confFileResolver"><span class="fixed">&lt;FileResolver <span class="mandatory">Id=&quot;<i>string</i>&quot;</span>&gt;</span></dd>

-        <dd class="value">This element defines the files used to store a private key, certificate, and certificate authorities and associates the set with an identifier. Contained by the <a href="#confCredentials"><span class="fixed">Credentials</span></a> element. <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a> and <a href="#confRelyingParty"><span class="fixed">RelyingParty</span></a> elements will refer to these identifiers in their <span class="fixed">TLS</span> and <span class="fixed">Signing</span> attributes, allowing different credentials to be used for different applications and relying parties.  It must contain one <a href="#confKey"><span class="fixed">Key</span></a> element and should contain one <a href="#confCertificate"><span class="fixed">Certificate</span></a> element.</dd>
+        <dd class="value">
+        <p>This element defines files used to store a private key, certificate, and certificate authorities and associates
+        the set with an identifier. Placed inside the <a href="#confCredentials"><span class="fixed">Credentials</span></a>
+        element. <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a> and
+        <a href="#confRelyingParty"><span class="fixed">RelyingParty</span></a> elements will refer to these identifiers in
+        their <span class="fixed">TLS</span> and <span class="fixed">Signing</span> attributes, allowing different credentials
+        to be used for different applications and relying parties.</p>
+        <p>Must contain one <a href="#confKey"><span class="fixed">Key</span></a> element and should contain one
+        <a href="#confCertificate"><span class="fixed">Certificate</span></a> element.</p>
+        </dd>

 
         <dd class="attribute"><a name="confHost"><span class="fixed">&lt;Host scheme=&quot;<i>protocol</i>&quot; <span class="mandatory">name=&quot;<i>fqdn</i>&quot;</span> port=&quot;<i>integer</i>&quot; applicationId=&quot;<i>id</i>&quot; requireSession=&quot;<i>true/false</i>&quot; exportAssertion=&quot;<i>true/false</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confHost"><span class="fixed">&lt;Host scheme=&quot;<i>protocol</i>&quot; <span class="mandatory">name=&quot;<i>fqdn</i>&quot;</span> port=&quot;<i>integer</i>&quot; applicationId=&quot;<i>id</i>&quot; requireSession=&quot;<i>true/false</i>&quot; exportAssertion=&quot;<i>true/false</i>&quot;&gt;</span></dd>

-        <dd class="value">Individual (real or virtual) hosts that this target protects are enumerated by <span class="fixed">Host</span> elements in the <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element.  If a request is processed by Shibboleth for a URL on this host, these parameters will be applied to it.  If there are <a href="#confPath"><span class="fixed">Path</span></a> elements within this element that match the URL and contain the <span class="fixed">applicationId</span>, <span class="fixed">requireSession</span>, or <span class="fixed">exportAssertion</span> attributes, they will override those in this element; similarly, the ones within this element will override those in the containing <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element.
-<ul>
-<li><span class="fixed">scheme</span>: This specifies the protocol on which this host responds.  Valid choices are <span class="fixed">http</span>, <span class="fixed">https</span>, <span class="fixed">ftp</span>, <span class="fixed">ldap</span>, and <span class="fixed">ldaps</span>.</li>
-<li class="mandatory"><span class="fixed">name</span>: This is the fully-qualified domain name of the host.  This appended to the <span class="fixed">scheme</span> must match what is contained in the URL for the element's settings to apply to the request.</li>
-<li><span class="fixed">port</span>: This is the port the host is listening on, if not the standard port for the scheme.</li>
-<li><span class="fixed">requireSession</span>: This attribute controls whether Shibboleth will forcibly establish an authenticated session with the user before handing off the request to the web server or application.  If <span class="fixed">true</span>, Shibboleth will force session establishment.  If <span class="fixed">false</span> (the default), applications are responsible for ensuring that a session exists if necessary, so-called <a href="#1.f.">lazy session establishment</a>.  Most deployments should not specify <span class="fixed">false</span> for protected content without a full understanding of the implications.</li>
-<li><span class="fixed">exportAssertion</span>: When <span class="fixed">true</span>, the entire SAML attribute assertion received from the origin is exported to a CGI request header called <span class="fixed">Shib-Attributes</span>, encoded in <span class="fixed">base64</span>.  This requires an application to be able to parse the raw XML. Defaults to <span class="fixed">false</span>, which most deployments should use.</li>
-</ul></dd>
+        <dd class="value">
+        <p>Individual (real or virtual) hosts that this target protects are enumerated by <span class="fixed">Host</span> elements
+        inside the <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element. If a request is processed by
+        Shibboleth for a URL on this host, these parameters will be applied to it. If there are
+        <a href="#confPath"><span class="fixed">Path</span></a> elements within this element that match the URL and contain
+        the <span class="fixed">applicationId</span>, <span class="fixed">requireSession</span>, or
+        <span class="fixed">exportAssertion</span> attributes, they will override values in this element; similarly, values
+        within this element will override those in the containing
+        <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element.</p>
+            <ul>
+            <li><span class="fixed">scheme</span>: This specifies the protocol on which this host responds.
+            Valid choices are <span class="fixed">http</span>, <span class="fixed">https</span>, <span class="fixed">ftp</span>,
+            <span class="fixed">ldap</span>, and <span class="fixed">ldaps</span>.</li>
+            <li class="mandatory"><span class="fixed">name</span>: This is the fully-qualified domain name of the host.
+            This appended to the <span class="fixed">scheme</span> must match what is contained in the URL for the element's
+            settings to apply to the request.</li>
+            <li><span class="fixed">port</span>: This is the port the host is listening on, if not the standard port for the scheme.</li>
+            <li><span class="fixed">requireSession</span>: This attribute controls whether Shibboleth will forcibly establish
+            an authenticated session with the user before handing off the request to the web server or application.
+            If <span class="fixed">true</span>, Shibboleth will force session establishment. If <span class="fixed">false</span>
+            (the default), applications are responsible for ensuring that a session exists if necessary, so-called
+            <a href="#1.g.">lazy session establishment</a>. Most deployments should not specify <span class="fixed">false</span>
+            for protected content without a full understanding of the implications.</li>
+            <li><span class="fixed">exportAssertion</span>: When <span class="fixed">true</span>, the entire SAML attribute
+            assertion received from the origin is exported to a CGI request header called
+            <span class="fixed">Shib-Attributes</span>, encoded in <span class="fixed">base64</span>. This requires an
+            application to be able to parse the raw XML. Defaults to <span class="fixed">false</span>, which most deployments
+            should use.</li>
+            </ul>
+        </dd>

 
         <dd class="attribute"><a name="confImplementation"><span class="fixed">&lt;Implementation&gt;</span></dd>
 
         <dd class="attribute"><a name="confImplementation"><span class="fixed">&lt;Implementation&gt;</span></dd>

-        <dd class="value">A container element placed inside the <a href="#confSHIRE"><span class="fixed">SHIRE</span></a> element, the contents of this element will vary depending on the web server or environment that this Shibboleth deployment serves.  Multiple configurations may be specified, but only one per implementation type.  This element may contain the <a href="#confISAPI"><span class="fixed">ISAPI</span></a> element. <!--  NOT IMPLEMENTED: and <a href="#confNSAPI"><span class="fixed">NSAPI</span></a>, <a href="#confJava"><span class="fixed">Java</span></a> -->.</dd>
+        <dd class="value">
+        <p>A container element placed inside the <a href="#confSHIRE"><span class="fixed">SHIRE</span></a> element,
+        the contents of this element will vary depending on the web server or environment that this Shibboleth deployment serves.
+        Multiple configurations may be specified, but only one per implementation type. This element may contain the
+        <a href="#confISAPI"><span class="fixed">ISAPI</span></a> element.</p>
+        </dd>

 
         <dd class="attribute"><a name="confISAPI"><span class="fixed">&lt;ISAPI normalizeRequest=&quot;<i>true/false</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confISAPI"><span class="fixed">&lt;ISAPI normalizeRequest=&quot;<i>true/false</i>&quot;&gt;</span></dd>

-        <dd class="value">The configuration information for Shibboleth targets deployed on Microsoft IIS is stored inside this container element.  This element must contain one or more <a href="#confSite"><span class="fixed">Site</span></a> elements, each of which maps an INSTANCE ID value to a hostname.  If <span class="fixed">normalizeRequest</span> is <span class="fixed">true</span> (the default), all redirects and computed request URLs generated by Shibboleth will be created using the hostname assigned to the site instance handling the request.  If <span class="fixed">false</span>, the browser's supplied URL is sometimes used to compute the information.  Contained by the <a href="#confImplementation"><span class="fixed">Implementation</span></a> element.</dd>
+        <dd class="value">
+        <p>The configuration information for Shibboleth targets deployed on Microsoft IIS is stored inside this container element.
+        This element must contain one or more <a href="#confSite"><span class="fixed">Site</span></a> elements, each of which
+        maps an INSTANCE ID value to a hostname. If <span class="fixed">normalizeRequest</span> is
+        <span class="fixed">true</span> (the default), all redirects and computed request URLs generated by Shibboleth will
+        be created using the hostname assigned to the site instance handling the request. If <span class="fixed">false</span>,
+        the browser's supplied URL is sometimes used to compute the information. Placed inside the
+        <a href="#confImplementation"><span class="fixed">Implementation</span></a> element.</p>
+        </dd>

 
         <dd class="attribute"><a name="confKey"><span class="fixed">&lt;Key format=&quot;<i>type</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confKey"><span class="fixed">&lt;Key format=&quot;<i>type</i>&quot;&gt;</span></dd>

-        <dd class="value">This specifies the file containing a private key to be used by a set of credentials.  Valid encodings are <span class="fixed">PEM</span> (the default), <span class="fixed">DER</span>, and <span class="fixed">PKCS12</span>.  Keys are supported in a variety of formats: DER, PEM, encrypted PEM, and encrypted PKCS12.  It resides within the <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> element, should be paired with a <a href="#confCertificate"><span class="fixed">Certificate</span></a> element, and contain a <a href="#confPath"><span class="fixed">Path</span></a> element.</dd>
+        <dd class="value">
+        <p>Specifies a file containing a private key to be used within a set of credentials. Valid formats are
+        <span class="fixed">PEM</span> (the default), <span class="fixed">DER</span>, and <span class="fixed">PKCS12</span>.
+        Placed within a <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> element, it should be paired
+        with a <a href="#confCertificate"><span class="fixed">Certificate</span></a> element, and contain a
+        <a href="#confCredPath"><span class="fixed">Path</span></a> element.</p>
+        </dd>

 
         <dd class="attribute"><a name="confLibrary"><span class="fixed">&lt;Library <span class="mandatory">path=&quot;<i>pathname</i>&quot;</span> fatal=&quot;<i>true/false</i>&quot;/&gt;</span></dd>
 
         <dd class="attribute"><a name="confLibrary"><span class="fixed">&lt;Library <span class="mandatory">path=&quot;<i>pathname</i>&quot;</span> fatal=&quot;<i>true/false</i>&quot;/&gt;</span></dd>

-        <dd class="value">This element defines an extension library for one of Shibboleth's components when specified within an <a href="#confExtensions"><span class="fixed">Extensions</span></a> element.
-<ul><li class="mandatory"><span class="fixed">path</span>: This designates the complete pathname to where the library is.</li>
-<li><span class="fixed">fatal</span>: If set to <span class="fixed">true</span> and the library is not located or fails to load properly, the target will not start. The default is false.</li>
-</ul></dd>
+        <dd class="value">
+        <p>This element defines an extension library for one of Shibboleth's components and is placed within an
+        <a href="#confExtensions"><span class="fixed">Extensions</span></a> element.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">path</span>: This designates the complete pathname of the library.</li>
+            <li><span class="fixed">fatal</span>: If <span class="fixed">true</span> and the library is not located or fails
+            to load properly, the target will not successfully initialize. The default is false.</li>
+            </ul>
+        </dd>

 
         <dd class="attribute"><a name="confListener"><span class="fixed">&lt;Listener <span class="mandatory">type=&quot;<i>string</i>&quot;</span>&gt;</span></dd>
 
         <dd class="attribute"><a name="confListener"><span class="fixed">&lt;Listener <span class="mandatory">type=&quot;<i>string</i>&quot;</span>&gt;</span></dd>

-        <dd class="value">Specifies a pluggable implementation of a mechanism for communication between the web server and SHAR, specified in the <span class="fixed">type</span> attribute.  This element must be contained by the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with the <a href="#confTCPListener"><span class="fixed">TCPListener</span></a> and <a href="#confUnixListener"><span class="fixed">UnixListener</span></a> elements.</dd>
+        <dd class="value">
+        <p>Specifies a pluggable implementation of a mechanism for communication between the web server and SHAR,
+        specified in the <span class="fixed">type</span> attribute. This element is placed within the
+        <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with the
+        <a href="#confTCPListener"><span class="fixed">TCPListener</span></a> and
+        <a href="#confUnixListener"><span class="fixed">UnixListener</span></a> elements.</p>
+        </dd>

 
         <dd class="attribute"><a name="confMemorySessionCache"><span class="fixed">&lt;MemorySessionCache AAConnectTimeout=&quot;<i>seconds</i>&quot; AATimeout=&quot;<i>seconds</i>&quot; cacheTimeout=&quot;<i>seconds</i>&quot; cleanupInterval=&quot;<i>seconds</i>&quot; defaultLifetime=&quot;<i>seconds</i>&quot; propagateErrors=&quot;<i>true/false</i>&quot; retryInterval=&quot;<i>seconds</i>&quot; strictValidity=&quot;<i>true/false</i>&quot;/&gt;</span></dd>
 
         <dd class="attribute"><a name="confMemorySessionCache"><span class="fixed">&lt;MemorySessionCache AAConnectTimeout=&quot;<i>seconds</i>&quot; AATimeout=&quot;<i>seconds</i>&quot; cacheTimeout=&quot;<i>seconds</i>&quot; cleanupInterval=&quot;<i>seconds</i>&quot; defaultLifetime=&quot;<i>seconds</i>&quot; propagateErrors=&quot;<i>true/false</i>&quot; retryInterval=&quot;<i>seconds</i>&quot; strictValidity=&quot;<i>true/false</i>&quot;/&gt;</span></dd>

-        <dd class="value">Shibboleth will cache sessions and received attributes in memory if this element is placed in the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element. This element is mutually exclusive with the <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> and <a href="#confSessionCache"><span class="fixed">SessionCache</span></a> elements.
-<ul>
-<li><span class="fixed">AAConnectTimeout</span>: Time in seconds the target will wait before timing out on the initial connection to an origin to request attributes.  Defaults to <span class="fixed">15</span>.</li>
-<li><span class="fixed">AATimeout</span>: Time in seconds the target will wait before timing out while waiting for attributes from an origin once the initial connection is established.  Defaults to <span class="fixed">30</span>.</li>
-<li><span class="fixed">cacheTimeout</span>: Time in seconds to permit a session to stay in the cache before being purged.  Defaults to <span class="fixed">28800</span>.</li>
-<li><span class="fixed">cleanupInterval</span>: Seconds between runs of the background thread that purges expired sessions.  Defaults to <span class="fixed">300</span>.</li>
-<li><span class="fixed">defaultLifetime</span>: If the attribute assertion doesn't carry an explicit expiration time, the assertion will expire after this time in <span class="fixed">seconds</span> has elapsed.  Defaults to <span class="fixed">1800</span>.</li>
-<li><span class="fixed">propagateErrors</span>: If true, then any errors that occur during the attribute query stage are fatal and will be presented to the user as an error, terminating their session.  If false, any errors that occur during the query are non-fatal, and the
-application will be given older, expired attributes based on the <span class="fixed">strictValidity</span> setting.</p>
-<p>This should generally only be left to false (the default) by deployments that are using real principal names as subjects because attribute retrieval is treated as an optional process.</p></li>
-<li><span class="fixed">retryInterval</span>: Time in seconds between attempts to obtain fresh attributes.  If a query fails, a timer is set, and once the interval elapses, the next user request causes another query. This prevents pointless repeated attempts to query a failed origin. Defaults to <span class="fixed">300</span>.</li>
-<li><span class="fixed">strictValidity</span>: If true, expired attributes will never be made available to the Shibboleth application; if no valid attributes can be obtained, then an empty set is provided.  When false, if a fresh set of attributes cannot be retrieved due to failures, any cached, expired attributes are made available.  Defaults to <span class="fixed">true</span>.</li>
-</ul></dd>
+        <dd class="value">
+        <p>Shibboleth will cache sessions and received attributes in memory if this element is found in the
+        <a href="#confSHAR"><span class="fixed">SHAR</span></a> element. This element is mutually exclusive with the
+        <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> and
+        <a href="#confSessionCache"><span class="fixed">SessionCache</span></a> elements.</p>
+            <ul>
+            <li><span class="fixed">AAConnectTimeout</span>: Time in seconds the target will wait before timing out on the
+            initial connection to an origin to request attributes.  Defaults to <span class="fixed">15</span>.</li>
+            <li><span class="fixed">AATimeout</span>: Time in seconds the target will wait before timing out while waiting
+            for attributes from an origin once the initial connection is established. Defaults to <span class="fixed">30</span>.</li>
+            <li><span class="fixed">cacheTimeout</span>: Time in seconds to permit a session to stay in the cache before
+            being purged. Defaults to <span class="fixed">28800</span>.</li>
+            <li><span class="fixed">cleanupInterval</span>: Seconds between runs of the background thread that purges
+            expired sessions. Defaults to <span class="fixed">300</span>.</li>
+            <li><span class="fixed">defaultLifetime</span>: If the attribute assertion doesn't carry an explicit
+            expiration time, the assertion will expire after this time in <span class="fixed">seconds</span> has elapsed.
+            Defaults to <span class="fixed">1800</span>.</li>
+            <li><span class="fixed">propagateErrors</span>: If true, then any errors that occur during the attribute
+            query stage are fatal and will be presented to the user as an error, terminating their session. If false,
+            any errors that occur during the query are non-fatal, and the application will be given older, expired
+            attributes based on the <span class="fixed">strictValidity</span> setting.
+            <p>This should generally only be left to false (the default) by deployments that are using real principal
+            names as subjects because attribute retrieval is treated as an optional process.</p></li>
+            <li><span class="fixed">retryInterval</span>: Time in seconds between attempts to obtain fresh attributes.  If a query fails, a timer is set, and once the interval elapses, the next user request causes another query. This prevents pointless repeated attempts to query a failed origin. Defaults to <span class="fixed">300</span>.</li>
+            <li><span class="fixed">strictValidity</span>: If true, expired attributes will never be made available to the Shibboleth application; if no valid attributes can be obtained, then an empty set is provided.  When false, if a fresh set of attributes cannot be retrieved due to failures, any cached, expired attributes are made available.  Defaults to <span class="fixed">true</span>.</li>
+            </ul>
+        </dd>

 
         <dd class="attribute"><a name="confMySQLSessionCache"><span class="fixed">&lt;MySQLSessionCache mysqlTimeout=&quot;<i>seconds</i>&quot;/&gt;</span></dd>
 
         <dd class="attribute"><a name="confMySQLSessionCache"><span class="fixed">&lt;MySQLSessionCache mysqlTimeout=&quot;<i>seconds</i>&quot;/&gt;</span></dd>

-        <dd class="value">Shibboleth will back the memory cache of sessions using an embedded MySQL database if this element is placed in the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element.  Arguments may be passed directly to MySQL by populating this element with <span class="fixed"><a href="#confArgument">Argument</a></span> elements. The element may also specify any of the attributes defined for the <a href="#confMemorySessionCache">MemorySessionCache</a> element.  Mutually exclusive with the <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> and <a href="#confSessionCache"><span class="fixed">SessionCache</span></a> elements.
-<ul>
-<li><span class="fixed">mysqlTimeout</span>: Time in seconds to permit a session to stay in the persistent cache before being purged.  Defaults to <span class="fixed">28800</span>.</li>
-</ul></dd>
+        <dd class="value">
+        <p>Shibboleth will back the memory cache of sessions using an embedded MySQL database if this element is found
+        in the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element. Arguments may be passed directly to
+        MySQL by populating this element with <span class="fixed"><a href="#confArgument">Argument</a></span> elements.
+        The element may also specify any of the attributes defined for the <a href="#confMemorySessionCache">MemorySessionCache</a>
+        element. Mutually exclusive with the <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a>
+        and <a href="#confSessionCache"><span class="fixed">SessionCache</span></a> elements.</p>
+            <ul>
+            <li><span class="fixed">mysqlTimeout</span>: Time in seconds to permit a session to stay in the persistent
+            cache before being purged. Defaults to <span class="fixed">28800</span>.</li>
+            </ul>
+        </dd>

 
 

-        <dd class="attribute"><a name="confPath"><span class="fixed">&lt;Path <span class="mandatory">name=&quot;<i>pathname</i>&quot;</span> applicationId=&quot;<i>id</i>&quot; requireSession=&quot;<i>true/false</i>&quot; exportAssertion=&quot;<i>true/false</i>&quot;&gt;</span></dd>
-        <dd class="value">This element allows for different application identifiers and session handling to be defined iteratively for subdirectories or documents within a host.  Requests are processed on a best-match basis, with the innermost element taking precedence. Path elements may be contained by <a href="#confHost"><span class="fixed">Host</span></a> elements or other <a href="#confPath"><span class="fixed">Path</span></a> elements.
-<ul>
-<li class="mandatory"><span class="fixed">name</span>: This is the name of the path component or filename to match against the request.</li>
-<li><span class="fixed">requireSession</span>: This attribute controls whether Shibboleth will forcibly establish an authenticated session with the user before handing off the request to the web server or application.  If <span class="fixed">true</span>, Shibboleth will force session establishment.  If <span class="fixed">false</span> (the default), applications are responsible for ensuring that a session exists if necessary, so-called <a href="#1.f.">lazy session establishment</a>.  Most deployments should not specify <span class="fixed">false</span> for protected content without a full understanding of the implications.</li>
-<li><span class="fixed">exportAssertion</span>: When <span class="fixed">true</span>, the entire SAML attribute assertion received from the origin is exported to a CGI request header called <span class="fixed">Shib-Attributes</span>, encoded in <span class="fixed">base64</span>.  This requires an application to be able to parse the raw XML. Defaults to <span class="fixed">false</span>, which most deployments should use.</li>
-</ul></dd>
+        <dd class="attribute">(RequestMap) <a name="confPath"><span class="fixed">&lt;Path <span class="mandatory">name=&quot;<i>pathname</i>&quot;</span> applicationId=&quot;<i>id</i>&quot; requireSession=&quot;<i>true/false</i>&quot; exportAssertion=&quot;<i>true/false</i>&quot;&gt;</span></dd>
+        <dd class="value">
+        <p>This element allows for different application identifiers and session handling to be defined iteratively for
+        subdirectories or documents within a host. Requests are processed on a best-match basis, with the innermost
+        element taking precedence. Path elements may be contained by <a href="#confHost"><span class="fixed">Host</span></a>
+        elements or other <a href="#confPath"><span class="fixed">Path</span></a> elements.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">name</span>: This is the name of the path component or filename to match
+            against the request. Only exact matching is supported by the supplied request mapping provider.</li>
+            <li><span class="fixed">requireSession</span>: This attribute controls whether Shibboleth will forcibly establish
+            an authenticated session with the user before handing off the request to the web server or application.
+            If <span class="fixed">true</span>, Shibboleth will force session establishment. If <span class="fixed">false</span>
+            (the default), applications are responsible for ensuring that a session exists if necessary, so-called
+            <a href="#1.g.">lazy session establishment</a>. Most deployments should not specify <span class="fixed">false</span>
+            for protected content without a full understanding of the implications.</li>
+            <li><span class="fixed">exportAssertion</span>: When <span class="fixed">true</span>, the entire SAML attribute
+            assertion received from the origin is exported to a CGI request header called
+            <span class="fixed">Shib-Attributes</span>, encoded in <span class="fixed">base64</span>. This requires an
+            application to be able to parse the raw XML. Defaults to <span class="fixed">false</span>, which most deployments
+            should use.</li>
+            </ul>
+        </dd>

 
 

-        <dd class="attribute"><a name="confPolicy"><span class="fixed">&lt;Policy signRequest=&quot;<i>true/false</i>&quot; signedResponse=&quot;<i>true/false</i>&quot; signedAssertions=&quot;<i>true/false</i>&quot;&gt;</span></dd>
-        <dd class="value">This element is the main container for specifying policies for attributes, trust, and operational metadata by an application.  It must be contained by the <a href="#confApplications"><span class="fixed">Applications</span></a> element and, if contained by an <a href="#confApplication"><span class="fixed">Application</span></a> element, may override portions of the policies which would have been inherited by default.  The configuration for policy is defined by these elements, each of which is optional: <a href="#confAttributes"><span class="fixed">Attributes</span></a>, <a href="#confFederationProvider"><span class="fixed">FederationProvider</span></a>, <a href="#confTrustProvider"><span class="fixed">TrustProvider</span></a>, <a href="#confRevocationProvider"><span class="fixed">RevocationProvider</span></a>, and <a href="#confAudiences"><span class="fixed">saml:Audiences</span></a>.
-<ul>
-<li><span class="fixed">signRequest</span>: If <span class="fixed">true</span>, the target will sign attribute requests that it sends to origins from this application.  This is usually unnecessary, as the TLS/SSL transport can provide authentication more efficiently.</li>
-<li><span class="fixed">signedResponse</span>: If <span class="fixed">true</span>, the target will require that all SAML attribute responses it receives for this application be signed.</li>
-<li><span class="fixed">signedAssertions</span>: If <span class="fixed">true</span>, the target will require that individual SAML assertions it receives for this application be signed.  This may be particularly useful if the application is forwarding the assertion, but requires a liberal (or no) AAP to avoid corrupting the signature.</li>
-</ul></dd>
-
-        <dd class="attribute"><a name="confRequestMap"><span class="fixed">&lt;RequestMap <span class="mandatory">applicationId=&quot;<i>default</i>&quot;</span> requireSession=&quot;<i>true/false</i>&quot; exportAssertion=&quot;<i>true/false</i>&quot;
-uri=&quot;<i>URI</i>&quot;&gt;</span></dd>
-        <dd class="value"><p><b>For a general description of how the target handles incoming requests, please refer to <a href="#1.f.">section 1.f</a>.</b></p><p>The <span class="Fixed">RequestMap</span> element is a container holding <a href="#confHost"><span class="fixed">Host</span></a> and <a href="#confPath"><span class="fixed">Path</span></a> elements. The requested URL is parsed and matched against this set of elements in order to determine how to process the request. Attributes on the RequestMap, Host, and Path elements  specify whether to require a Shibboleth session, and  how  to locate the associated Application element.  If session requirement or assertion handling conditions varies across that granularity, additional <span class="fixed">RequestMap</span> elements may be specified for them.  Alternatively, these conditions may be specified on <a href="#confPath"><span class="fixed">Path</span></a> and <a href="#confHost"><span class="fixed">Host</span></a> elements within this element which will override these settings.</p>
-<ul>
-<li><span class="fixed">applicationId</span>: Contains a fixed value of "default" to reference the default <a href="#confApplications"><span class="fixed">Applications</span></a> element.</li>
-<li><span class="fixed">requireSession</span>: This attribute controls whether Shibboleth will forcibly establish an authenticated session with the user before handing off the request to the web server or application.  If <span class="fixed">true</span>, Shibboleth will force session establishment.  If <span class="fixed">false</span> (the default), applications are responsible for ensuring that a session exists if necessary, so-called <a href="#1.f.">lazy session establishment</a>.  Most deployments should not specify <span class="fixed">false</span> for protected content without a full understanding of the implications.</li>
-<li><span class="fixed">exportAssertion</span>: When <span class="fixed">true</span>, the entire SAML attribute assertion received from the origin is exported to a CGI request header called <span class="fixed">Shib-Attributes</span>, encoded in <span class="fixed">base64</span>.  This requires an application to be able to parse the raw XML. Defaults to <span class="fixed">false</span>, which most deployments should use.</li>
-<li><span class="fixed">uri</span>: If the request mapping configuration information is stored in a separate XML file that is referred by this file, it may be pointed to using this attribute.</li>
-</ul></dd>
+        <dd class="attribute">(Credential) <a name="confCredPath"><span class="fixed">&lt;Path&gt;<i>pathname</i>&lt;/Path&gt;</span></dd>
+        <dd class="value">
+        <p>Placed inside the <a href="#confKey"><span class="fixed">Key</span></a> and
+        <a href="#confCertificate"><span class="fixed">Certificate</span></a> elements to specify the pathname of the file
+        containing the credential.</p>
+        </dd>

 
         <dd class="attribute"><a name="confRelyingParty"><span class="fixed">&lt;RelyingParty <span class="mandatory">name=&quot;<i>string</i>&quot; TLS=&quot;<i>string</i>&quot; Signing=&quot;<i>string</i>&quot;</span></span>&gt;</dd>
         <dd class="value"><p>One or more <span class="fixed">RelyingParty</span> elements may be contained by a <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a> element to enumerate relying parties for which a distinct set of credentials should be used. The <span class="fixed">TLS</span> and <span class="fixed">Signing</span> attribute values reference the identifiers of credential resolvers defined in <a href="#confCredentialsProvider"><span class="fixed">CredentialsProvider</span></a> elements.</p>
 
         <dd class="attribute"><a name="confRelyingParty"><span class="fixed">&lt;RelyingParty <span class="mandatory">name=&quot;<i>string</i>&quot; TLS=&quot;<i>string</i>&quot; Signing=&quot;<i>string</i>&quot;</span></span>&gt;</dd>
         <dd class="value"><p>One or more <span class="fixed">RelyingParty</span> elements may be contained by a <a href="#confCredentialUse"><span class="fixed">CredentialUse</span></a> element to enumerate relying parties for which a distinct set of credentials should be used. The <span class="fixed">TLS</span> and <span class="fixed">Signing</span> attribute values reference the identifiers of credential resolvers defined in <a href="#confCredentialsProvider"><span class="fixed">CredentialsProvider</span></a> elements.</p>

@@ -1241,93 +1515,210 @@ uri=&quot;<i>URI</i>&quot;&gt;</span></dd>
 </ul>
 </dd>
 
 </ul>
 </dd>
 

+        <dd class="attribute"><a name="confRequestMap"><span class="fixed">&lt;RequestMap <span class="mandatory">applicationId=&quot;<i>default</i>&quot;</span> requireSession=&quot;<i>true/false</i>&quot; exportAssertion=&quot;<i>true/false</i>&quot;&gt;</span></dd>
+        <dd class="value">
+        <p>The <span class="fixed">RequestMap</span> element is a container holding
+        <a href="#confHost"><span class="fixed">Host</span></a> and <a href="#confPath"><span class="fixed">Path</span></a>
+        elements. Request URLs processed by Shibboleth are parsed and matched against this set of elements in order to
+        determine how to process the request. Attributes on the RequestMap, Host, and Path elements specify whether to
+        require an authenticated session, and how to locate the associated Application element and settings.</p>
+            <ul>
+            <li><span class="fixed">applicationId</span>: Contains a fixed value of "default" to reference the default
+            <a href="#confApplications"><span class="fixed">Applications</span></a> element.</li>
+            <li><span class="fixed">requireSession</span>: This attribute controls whether Shibboleth will forcibly establish
+            an authenticated session with the user before handing off the request to the web server or application.
+            If <span class="fixed">true</span>, Shibboleth will force session establishment. If <span class="fixed">false</span>
+            (the default), web applications are responsible for ensuring that a session exists if necessary, so-called
+            <a href="#1.g.">lazy session establishment</a>. Most deployments should not specify <span class="fixed">false</span>
+            for protected content without a full understanding of the implications.</li>
+            <li><span class="fixed">exportAssertion</span>: When <span class="fixed">true</span>, the entire SAML attribute
+            assertion received from the origin is exported to a CGI request header called
+            <span class="fixed">Shib-Attributes</span>, encoded in <span class="fixed">base64</span>. This requires an
+            application to be able to parse the raw XML. Defaults to <span class="fixed">false</span>, which most deployments
+            should use.</li>
+            </ul>
+        </dd>
+

         <dd class="attribute"><a name="confRequestMapProvider"><span class="fixed">&lt;RequestMapProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>
         <dd class="attribute"><a name="confRequestMapProvider"><span class="fixed">&lt;RequestMapProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value"><p>This element specifies a request mapper that defines how Shibboleth will handle sessions and access control for a given request.  For the built-in type &quot;edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap&quot;, there must be a <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element within this element, or the <span class="fixed">uri</span> attribute must contain the local pathname of an XML file containing one.</p></dd>
+        <dd class="value">
+        <p>This element specifies a request mapper that defines how Shibboleth will handle sessions and other behavior
+        for a given request. For the built-in type &quot;edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap&quot;,
+        there must be a <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element within this element, or
+        the <span class="fixed">uri</span> attribute must contain the local pathname of an XML file containing one.</p>
+        </dd>

 
         <dd class="attribute"><a name="confRevocationProvider"><span class="fixed">&lt;RevocationProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLRevocation&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confRevocationProvider"><span class="fixed">&lt;RevocationProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLRevocation&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value">This element, when specified within a <a href="#confPolicy"><span class="fixed">Policy</span></a> element, points to revocation metadata either inline within the element or in a local XML file. Federations will often publish signed XML files for targets to download periodically. This should be updated regularly; see <a href="#4.g.">section 4.g</a> for further details.
-        <p>If an <a href="#confApplication"><span class="fixed">Application</span></a> does not include any <span class="fixed">RevocationProvider</span> elements, the default set is used.</p>
-
+        <dd class="value">
+        <p>This element, when specified within an <a href="#confApplications"><span class="fixed">Applications</span></a>
+        or <a href="#confApplication"><span class="fixed">Application</span></a> element, points to revocation information either
+        inline within the element or in a local XML file. Federations will often publish signed XML files for targets to download
+        periodically. This should be refreshed regularly; see <a href="#4.g.">section 4.g</a> for further details.</p>
+        <p>The default set of revocation providers in the <a href="#confApplications"><span class="fixed">Applications</span></a>
+        element can be replaced within individual <a href="#confApplication"><span class="fixed">Application</span></a> elements.</p>
+        </dd>
+        

         <dd class="attribute"><a name="confSessionCache"><span class="fixed">&lt;SessionCache <span class="mandatory">type=&quot;<i>string</i>&quot;</span>&gt;</span></dd>
         <dd class="attribute"><a name="confSessionCache"><span class="fixed">&lt;SessionCache <span class="mandatory">type=&quot;<i>string</i>&quot;</span>&gt;</span></dd>

-        <dd class="value">Use this element to specify a pluggable session cache implementation of the specified <span class="fixed">type</span> This element must be contained by the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with the <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> and <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> elements.
-            <p>Any plugin should support the basic attributes defined by the <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> element.</p></dd>
+        <dd class="value">
+        <p>Specifies a pluggable session cache implementation of the specified <span class="fixed">type</span>. This element
+        is placed within the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with
+        the <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> and
+        <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> elements.</p>
+        <p>Any plugin should support the basic attributes defined by the
+        <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> element.</p>
+        </dd>

 
         <dd class="attribute"><a name="confSessions"><span class="fixed">&lt;Sessions
 <span class="mandatory">wayfURL=&quot;<i>URL</i>&quot;
 shireURL=&quot;<i>URL</i>&quot;</span>
 shireSSL=&quot;<i>true/false</i>&quot;
 
         <dd class="attribute"><a name="confSessions"><span class="fixed">&lt;Sessions
 <span class="mandatory">wayfURL=&quot;<i>URL</i>&quot;
 shireURL=&quot;<i>URL</i>&quot;</span>
 shireSSL=&quot;<i>true/false</i>&quot;

-cookieName=&quot;<i>URL</i>&quot;
-cookieProps=&quot;<i>URL</i>&quot;

 lifetime=&quot;<i>seconds</i>&quot;
 timeout=&quot;<i>seconds</i>&quot;
 lifetime=&quot;<i>seconds</i>&quot;
 timeout=&quot;<i>seconds</i>&quot;

-checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
-        <dd class="value">Configuration parameters that affect the way Shibboleth handles sessions for an individual application are bundled in this element, which must be included in each <a href="#confApplication"><span class="fixed">Application</span></a> and <a href="#confApplications"><span class="fixed">Applications</span></a> element.  Note that these parameters only apply to Shibboleth sessions, and not any sessions applications manage on their own behalf.
-<ul>
-<li class="mandatory"><span class="fixed">wayfURL</span>: The URL of the <a href="#1.c.">WAYF service</a> responsible for redirecting users accessing this application to their identity provider (origin).</li>
-<li class="mandatory"><p><span class="fixed">shireURL</span>: Specifies the SHIRE URL, or assertion consumer service, at which new sessions are initiated or lazy sessions are triggered. This can be an absolute URL, or a relative path to be prefixed by the base URL of the virtual host. Using an absolute URL allows a virtual server to funnel requests to a fixed location, to force use of SSL, for example.</p>
-    <p>Note that this URL issues the session cookie set on behalf of the application, and this cookie must be returned in subsequent requests, so the virtual host's domain name and port must be consistent with this domain name and port for some browsers to properly return the cookie. If default ports are used (and thus left unspecified), browsers will generally return cookies set via SSL to a non-SSL port. If non-default ports are used, it is recommended that this be a relative URL so that each virtual host handles its own cookie operations.</p>
-    <p>For Shibboleth to function properly in IIS, the file extension at the end of this URL must match the value configured into IIS and mapped to the ISAPI extension. This causes the request to be serviced properly, even though no file by that name actually exists.</p></li>
-<li><span class="fixed">shireSSL</span>: If <span class="fixed">true</span> (the default), the application will <b>only</b> accept new session requests over SSL, as is strongly recommended; see <a href="#2.c.">section 2.c</a> for more details.</li>
-<li><span class="fixed">cookieName</span>: Optionally specifies the name given to in-memory session cookies that are associated with this application. If omitted, Shibboleth will generate a cookie name for you of the form _shibsession_&lt;Application ID&gt;</li>
-<li><span class="fixed">cookieProps</span>: A string of additional Set-Cookie properties can be specified using this element which give the browser further instructions about cookie processing and use. Always begin with a semicolon to delineate from the session ID value.</li>
-<li><span class="fixed">lifetime</span>: Duration in seconds of the Shibboleth session; this does not affect the lifetime of application sessions initiated independently of Shibboleth.  Defaults to 3600. If 0 is specified, sessions are infinite, subject to purging by the cache.</li>
-<li><span class="fixed">timeout</span>: If the duration in seconds elapses following the last request in a session, the session will be expired for inactivity and a new session must be initiated upon the next request.  Defaults to 1800. If 0 is specified, there is no inactivity timeout</li>
-<li><span class="fixed">checkAddress</span>: If <span class="fixed">true</span> (the default), Shibboleth will check the browser's client address to insure that session cookies are issued and used by a consistent client address.  In most circumstances, this should be enabled to help prevent attacks using stolen cookies, but this can cause problems for users behind proxies or NAT devices.</li>
-</ul></dd>
+checkAddress=&quot;<i>true/false</i>&quot;
+cookieName=&quot;<i>URL</i>&quot;
+cookieProps=&quot;<i>URL</i>&quot;&gt;</span></dd>
+        <dd class="value">
+        <p>Configuration parameters that affect the way Shibboleth handles sessions for an individual application are bundled
+        in this element, which must be included in each <a href="#confApplication"><span class="fixed">Application</span></a>
+        and the default <a href="#confApplications"><span class="fixed">Applications</span></a> element. Note that these
+        parameters only apply to Shibboleth sessions, and not any sessions applications manage on their own behalf.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">wayfURL</span>: The URL of the <a href="#1.c.">WAYF service</a>
+            responsible for redirecting users accessing this application to their identity provider (origin).</li>
+            <li class="mandatory">
+                <p><span class="fixed">shireURL</span>: Specifies the SHIRE URL, or assertion consumer service, at which
+                new sessions are initiated or lazy sessions are triggered. This can be an absolute URL, or a relative path
+                to be prefixed by the base URL of the virtual host. Using an absolute URL allows a virtual server to funnel
+                requests to a fixed location, to force use of SSL, for example.</p>
+                <p>Note that this URL issues the session cookie set on behalf of the application, and this cookie must be
+                returned in subsequent requests, so the virtual host's domain name and port must be consistent with this
+                domain name and port for some browsers to properly return the cookie. If default ports are used (and thus
+                left unspecified), browsers will generally return cookies set via SSL to a non-SSL port. If non-default
+                ports are used, it is recommended that this be a relative URL so that each virtual host handles its own
+                cookie operations.</p>
+                <p>For Shibboleth to function properly in IIS, the file extension at the end of this URL must match the
+                value configured into IIS and mapped to the ISAPI extension. This causes the request to be serviced properly,
+                even though no file by that name actually exists.</p>
+            </li>
+            <li><span class="fixed">shireSSL</span>: If <span class="fixed">true</span> (the default), the application will
+            <b>only</b> accept new session requests over SSL, as is strongly recommended; see <a href="#2.c.">section 2.c</a>
+            for more details.</li>
+            <li><span class="fixed">cookieName</span>: Optionally specifies the name given to in-memory session cookies that
+            are associated with this application. If omitted, Shibboleth will generate a cookie name for you of the form
+            _shibsession_&lt;Application ID&gt;</li>
+            <li><span class="fixed">cookieProps</span>: A string of additional Set-Cookie properties can be specified using
+            this element which give the browser further instructions about cookie processing and use. Always begin with a
+            semicolon to delineate from the session ID value.</li>
+            <li><span class="fixed">lifetime</span>: Duration in seconds of the Shibboleth session; this does not affect
+            the lifetime of application sessions initiated independently of Shibboleth. Defaults to 3600. If 0 is specified,
+            sessions are infinite, subject to purging by the cache.</li>
+            <li><span class="fixed">timeout</span>: If the value in seconds elapses following the last request in a
+            session, the session will be expired for inactivity and a new session must be initiated upon the next request.
+            Defaults to 1800. If 0 is specified, there is no inactivity timeout</li>
+            <li><span class="fixed">checkAddress</span>: If <span class="fixed">true</span> (the default), Shibboleth will
+            check the browser's client address to insure that session cookies are issued and used by a consistent client address.
+            In most circumstances, this should be enabled to help prevent attacks using stolen cookies, but this can cause
+            problems for users behind proxies or NAT devices.</li>
+            </ul>
+        </dd>

 
         <dd class="attribute"><a name="confSHAR"><span class="fixed">&lt;SHAR logger=&quot;<i>pathname</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confSHAR"><span class="fixed">&lt;SHAR logger=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value">This is the container element for configuration information pertaining to the SHAR, the target component responsible for most attribute and session processing.  Its single attribute, <span class="fixed">logger</span>, points to a Log4J-format property configuration file that controls SHAR logging behavior.  It is contained by the <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element and may contain an <a href="#confExtensions"><span class="fixed">Extensions</span></a> element specifying additional libraries.</p>
-            <p>It must contain either a <a href="#confUnixListener"><span class="fixed">UnixListener</span></a> element to listen to the Apache module on a UNIX domain socket or a <a href="#confTCPListener"><span class="fixed">TCPListener</span></a> element to listen on a TCP port.  Session caching must also be specified using a <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> element to use in-memory session caching or a <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> element to backup session information in a MySQL database.</p></dd>
+        <dd class="value">
+        <p>This is the container element for configuration information pertaining to the SHAR, the target component responsible
+        for most attribute and session processing. Its single attribute, <span class="fixed">logger</span>, points to a
+        Log4J-format property configuration file that controls SHAR logging behavior. It is placed within the
+        <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element and may contain an
+        <a href="#confExtensions"><span class="fixed">Extensions</span></a> element specifying additional libraries.</p>
+        <p>It must contain either a <a href="#confUnixListener"><span class="fixed">UnixListener</span></a> element to listen
+        to the server module on a UNIX domain socket or a <a href="#confTCPListener"><span class="fixed">TCPListener</span></a>
+        element to listen on a TCP port. Session caching must also be specified using a
+        <a href="#confMemorySessionCache"><span class="fixed">MemorySessionCache</span></a> element to use in-memory session
+        caching or a <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a> element to backup session
+        information into a MySQL database.</p>
+        </dd>

 
         <dd class="attribute"><a name="confShibbolethTargetConfig"><span class="fixed">&lt;ShibbolethTargetConfig clockSkew=&quot;integer&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confShibbolethTargetConfig"><span class="fixed">&lt;ShibbolethTargetConfig clockSkew=&quot;integer&quot;&gt;</span></dd>

-        <dd class="value">This is the root element for target configuration and must be present once and only once.  It must always contain a <a href="#confSHAR"><span class="fixed">SHAR</span></a> element, a <a href="#confSHIRE"><span class="fixed">SHIRE</span></a> element, an <a href="#confApplications"><span class="fixed">Applications</span></a> element, one or more <a href="#confCredentialsProvider"><span class="fixed">CredentialsProvider</span></a> elements, and optionally an <a href="#confExtensions"><span class="fixed">Extensions</span></a> element.
-<ul><li><span class="fixed">clockSkew</span>: Controls allowed clock skew in seconds between target and origin servers when evaluating times sent in messages. Defaults to 180, and should be as small as practical.</li>
-</ul></dd>
+        <dd class="value">
+        <p>This is the root element for target configuration and must be present once and only once. It must always contain a
+        <a href="#confSHAR"><span class="fixed">SHAR</span></a> element, a
+        <a href="#confSHIRE"><span class="fixed">SHIRE</span></a> element, an
+        <a href="#confApplications"><span class="fixed">Applications</span></a> element, one or more
+        <a href="#confCredentialsProvider"><span class="fixed">CredentialsProvider</span></a> elements, and optionally an
+        <a href="#confExtensions"><span class="fixed">Extensions</span></a> element.</p>
+            <ul>
+            <li><span class="fixed">clockSkew</span>: Controls allowed clock skew in seconds between target and origin servers
+            when evaluating times sent in messages. Defaults to 180, and should be as small as practical.</li>
+            </ul>
+        </dd>

 
         <dd class="attribute"><a name="confSHIRE"><span class="fixed">&lt;SHIRE logger=&quot;<i>pathname</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confSHIRE"><span class="fixed">&lt;SHIRE logger=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value">This is the container element for configuration information pertaining to the SHIRE, the part of the target that integrates into the web server environment.  Its single attribute, <span class="fixed">logger</span>, points to a Log4J-format property configuration file that controls SHIRE logging behavior.  It is contained by the <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element and may contain an <a href="#confExtensions"><span class="fixed">Extensions</span></a> element specifying additional libraries.</p>
-            <p>It may contain an <a href="#confImplementation"><span class="fixed">Implementation</span></a> element, within which configuration for the SHIRE which varies by platform will be specified.</p>
-            <p>It may contain a <a href="#confRequestMapProvider"><span class="fixed">RequestMapProvider</span></a> element, which provides fine-grained control over aspects of target behavior at a host, path, or document level.</dd>
+        <dd class="value">
+        <p>This is the container element for configuration information pertaining to the SHIRE, the part of the target that
+        integrates into the web server environment. Its single attribute, <span class="fixed">logger</span>, points to a
+        Log4J-format property configuration file that controls SHIRE logging behavior. It is placed within the
+        <a href="#confShibbolethTargetConfig"><span class="fixed">ShibbolethTargetConfig</span></a> element and may contain an
+        <a href="#confExtensions"><span class="fixed">Extensions</span></a> element specifying additional libraries.</p>
+        <p>It may contain an <a href="#confImplementation"><span class="fixed">Implementation</span></a> element, within which
+        configuration for the SHIRE which varies by platform will be specified.</p>
+        <p>It may contain a <a href="#confRequestMapProvider"><span class="fixed">RequestMapProvider</span></a> element,
+        which provides fine-grained control over aspects of target behavior at a host, path, or document level.</p>
+        </dd>

 
 

-        <dd class="attribute"><a name="confSite"><span class="fixed">&lt;Site <span class="mandatory">id=&quot;<i>INSTANCE_ID</i>&quot; host=&quot;<i>fqdn</i>&quot;</span>/&gt;</span></dd>
-        <dd class="value">This element is placed in the <a href="#confISAPI"><span class="fixed">ISAPI</span></a> element to specify a mapping from individual instance ID's to respective vhost domain names.</dd>
+        <dd class="attribute"><a name="confSite"><span class="fixed">&lt;Site <span class="mandatory">id=&quot;<i>INSTANCE_ID</i>&quot; host=&quot;<i>fqdn</i>&quot;</span> scheme=&quot;<i>http/https</i>&quot; port=&quot;<i>integer</i>&quot;&gt;</span></dd>
+        <dd class="value">
+        <p>This element is placed in the <a href="#confISAPI"><span class="fixed">ISAPI</span></a> element to specify a
+        mapping from individual instance ID's to the corresponding host, port, and scheme.</p>
+        </dd>

 
         <dd class="attribute"><a name="confTCPListener"><span class="fixed">&lt;TCPListener <span class="mandatory">address=&quot;<i>pathname</i>&quot;  port=&quot;<i>integer</i>&quot;</span> acl=&quot;<i>ip</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confTCPListener"><span class="fixed">&lt;TCPListener <span class="mandatory">address=&quot;<i>pathname</i>&quot;  port=&quot;<i>integer</i>&quot;</span> acl=&quot;<i>ip</i>&quot;&gt;</span></dd>

-        <dd class="value">This element must be contained by the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with the <a href="#confUnixListener"><span class="fixed">UnixListener</span></a> and <a href="#confListener"><span class="fixed">Listener</span></a> elements.  It allows the SHAR to communicate with the web-server component using TCP.
-<ul><li class="mandatory"><span class="fixed">address</span>: Specifies the IP address of the listener.</li>
-<li class="mandatory"><span class="fixed">port</span>: Specifies the TCP port on which the SHAR will listen.</li>
-<li><span class="fixed">acl</span>: By default, the SHAR will only listen to requests from 127.0.0.1 (localhost).  This should generally not be specified except in test environments.</li>
-</ul></dd>
+        <dd class="value">
+        <p>This element is placed within the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually
+        exclusive with the <a href="#confUnixListener"><span class="fixed">UnixListener</span></a> and
+        <a href="#confListener"><span class="fixed">Listener</span></a> elements. It allows the SHAR to communicate with the
+        web server component using TCP.</p>
+            <ul>
+            <li class="mandatory"><span class="fixed">address</span>: Specifies the IP address of the listener.</li>
+            <li class="mandatory"><span class="fixed">port</span>: Specifies the TCP port on which the SHAR will listen.</li>
+            <li><span class="fixed">acl</span>: By default, the SHAR will only listen to requests from 127.0.0.1 (localhost). 
+            This should generally not be specified except in test environments.</li>
+            </ul>
+        </dd>

 
         <dd class="attribute"><a name="confTrustProvider"><span class="fixed">&lt;TrustProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLTrust&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confTrustProvider"><span class="fixed">&lt;TrustProvider <span class="mandatory">type=&quot;edu.internet2.middleware.shibboleth.common.provider.XMLTrust&quot;</span> uri=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value">This element, when specified within a <a href="#confPolicy"><span class="fixed">Policy</span></a> element, points to trust metadata either inline within the element or in a local XML file. Federations will often publish signed XML files for targets to download periodically. This should be refreshed regularly; see <a href="#4.g.">section 4.g</a> for further details.
-        <p>If an <a href="#confApplication"><span class="fixed">Application</span></a> does not include any <span class="fixed">TrustProvider</span> elements, the default set is used.</p>
+        <dd class="value">
+        <p>This element, when specified within an <a href="#confApplications"><span class="fixed">Applications</span></a>
+        or <a href="#confApplication"><span class="fixed">Application</span></a> element, points to trust metadata either
+        inline within the element or in a local XML file. Federations will often publish signed XML files for targets to download
+        periodically. This should be refreshed regularly; see <a href="#4.g.">section 4.g</a> for further details.</p>
+        <p>The default set of trust providers in the <a href="#confApplications"><span class="fixed">Applications</span></a>
+        element can be replaced within individual <a href="#confApplication"><span class="fixed">Application</span></a> elements.</p>
+        </dd>

 
         <dd class="attribute"><a name="confUnixListener"><span class="fixed">&lt;UnixListener address=&quot;<i>pathname</i>&quot;&gt;</span></dd>
 
         <dd class="attribute"><a name="confUnixListener"><span class="fixed">&lt;UnixListener address=&quot;<i>pathname</i>&quot;&gt;</span></dd>

-        <dd class="value">Use this element to specify a UNIX domain socket located at the <span class="fixed">pathname</span> specified in the <span class="fixed">address</span> attribute at which the SHAR should listen for requests.  This element must be contained by the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with the <a href="#confTCPListener"><span class="fixed">TCPListener</span></a> and <a href="#confListener"><span class="fixed">Listener</span></a> elements.  <span class="fixed">UnixListener</span> cannot be specified for Windows-based installations.</dd>
+        <dd class="value">
+        <p>Use this element to specify a UNIX domain socket located at the <span class="fixed">pathname</span> specified in
+        the <span class="fixed">address</span> attribute at which the SHAR should listen for requests. This element must be
+        contained by the <a href="#confSHAR"><span class="fixed">SHAR</span></a> element and is mutually exclusive with the
+        <a href="#confTCPListener"><span class="fixed">TCPListener</span></a> and
+        <a href="#confListener"><span class="fixed">Listener</span></a> elements.
+        <span class="fixed">UnixListener</span> cannot be specified for Windows-based installations.</p>
+        </dd>

 
 </dl></blockquote>
 <h4><a name="4.b."></a>4.b. Dynamic Error Page Generation</h4>
 <blockquote>
     <p>Shibboleth supports the dynamic generation of information in error pages 
 
 </dl></blockquote>
 <h4><a name="4.b."></a>4.b. Dynamic Error Page Generation</h4>
 <blockquote>
     <p>Shibboleth supports the dynamic generation of information in error pages 

-    referenced by <span class="fixed">shibboleth.xml</span>. The Shib Target 
-    employs a special Markup Language Processor to insert special tags into the 
-    generated HTML. The parser will read the error file looking for any tag that 
+    referenced by the <a href="#confErrors"><span class="fixed">Errors</span></a> element
+    in <span class="fixed">shibboleth.xml</span>. The target implementation
+    employs a simply template language to insert special tags into the 
+    generated HTML. The parser will read the error template looking for any tag that 

     looks like:</p>
     <blockquote>
         <p><span class="fixed">&lt;shibmlp tag-name /&gt;</span> </p>
     </blockquote>
     <p>Shibboleth will replace <span class="fixed">tag-name</span> with the 
     looks like:</p>
     <blockquote>
         <p><span class="fixed">&lt;shibmlp tag-name /&gt;</span> </p>
     </blockquote>
     <p>Shibboleth will replace <span class="fixed">tag-name</span> with the 

-    appropriate markup tag from the table below:</p>
+    appropriate markup tag either from the table below or by looking for a matching XML attribute
+    in the <a href="#confErrors"><span class="fixed">Errors</span></a> element:</p>

     <dl>
     <dl>

-        <dd class="attribute"><span class="fixed">supportContact</span></dd>
-        <dd class="value">The value of the <span class="fixed">supportContact</span> 
-        for this web site.</dd>
-        <dd class="attribute"><span class="fixed">logoLocation</span></dd>
-        <dd class="value">This attribute provides a means to specify a dynamic
-        <span class="fixed">logoLocation</span> in order to fill in the template
-        error page only; if a custom error page is created, then the image may
-        be linked to statically by the page itself.</dd>

         <dd class="attribute"><span class="fixed">requestURL</span></dd>
         <dd class="value">The user&#39;s requested URL.</dd>
         <dd class="attribute"><span class="fixed">errorType</span></dd>
         <dd class="attribute"><span class="fixed">requestURL</span></dd>
         <dd class="value">The user&#39;s requested URL.</dd>
         <dd class="attribute"><span class="fixed">errorType</span></dd>

@@ -1347,13 +1738,25 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
         <dd class="value">The URL of an error handling page for the origin site 
         provided by that site&#39;s metadata.</dd>
     </dl>
         <dd class="value">The URL of an error handling page for the origin site 
         provided by that site&#39;s metadata.</dd>
     </dl>

-    <p>This configuration is only for Apache servers, and is only used by 
-    resources protected by Shibboleth. See <a href="#4.d.">section 4.d.</a></p>
+    <p>To improve the appearance of error messages, a simple, limited form of
+    conditional checking is supported so that the presence of absence of data
+    to substitute into a particular tag-name can trigger the inclusion or
+    exclusion of markup. Conditionals look like:</p>
+    <blockquote>
+        <p><span class="fixed">&lt;shibmlpif tag-name&gt; arbitrary markup &lt;/shibmlpif&gt;</span><br>
+        <span class="fixed">&lt;shibmlpifnot tag-name&gt; arbitrary markup &lt;/shibmlpifnot&gt;</span></p>
+    </blockquote>
+    <p>Respectively, these special tags include or skip the markup between the tags if the
+    specified tag-name has an associated value available to be substituted for it. Note that
+    you cannot nest these conditionals; a <span class="fixed">shibmlpif</span> tag cannot
+    appear inside another <span class="fixed">shibmlpif</span> tag, due to the simplicity
+    of the substitution engine.</p>

     <p>Sample error templates for different kinds of errors are included in the 
     Shibboleth distribution, and can be triggered by anything that will cause 
     <p>Sample error templates for different kinds of errors are included in the 
     Shibboleth distribution, and can be triggered by anything that will cause 

-    Shibboleth to be unable to make an authorization decision, including a bad 
-    sites file, certificate verification failures, or a skewed clock between 
-    sites.</p>
+    Shibboleth to be unable to accept an incoming session, obtain attributes,
+    make an authorization decision, etc., including bad configuration settings,
+    signature verification or certificate validation failures, or a skewed clock
+    between sites.</p>

     <p><b>You should edit these templates, provide or remove style sheets and 
     images, and otherwise customize these templates to suit the user experience 
     you want your users to have when errors occur. The defaults are not likely 
     <p><b>You should edit these templates, provide or remove style sheets and 
     images, and otherwise customize these templates to suit the user experience 
     you want your users to have when errors occur. The defaults are not likely 

@@ -1370,38 +1773,43 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
     accepted by the origin sites that will be queried for attributes.</p>
     <p>On Unix, we require that OpenSSL be installed to use Shibboleth. On 
     Windows, OpenSSL libraries and the command line tool are included in the 
     accepted by the origin sites that will be queried for attributes.</p>
     <p>On Unix, we require that OpenSSL be installed to use Shibboleth. On 
     Windows, OpenSSL libraries and the command line tool are included in the 

-    package and can be used directly, if not otherwise available.</p>
+    package and can be used directly, if not otherwise available. Certain
+    commands require the <span class="fixed">openssl.cnf</span> configuration
+    file, an example of which is included with the Windows installation in
+    <span class="fixed">C:\opt\shibboleth\etc\shibboleth\openssl.cnf</span>.
+    To locate this file for a command that requires it, add the
+    <span class="fixed">-config C:\opt\shibboleth\etc\shibboleth\openssl.cnf</span>
+    parameter to the command.</p>

     <p>The certificate and key file location should be based on whether they 
     <p>The certificate and key file location should be based on whether they 

-    will also be used for Apache. If they will be used as a server certificate 
+    will also be used for Apache. If they will be used as a server key pair 

     as well, they should probably be in the Apache tree in the usual
     <span class="fixed">mod_ssl</span>-defined locations inside the Apache 
     as well, they should probably be in the Apache tree in the usual
     <span class="fixed">mod_ssl</span>-defined locations inside the Apache 

-    configuration folder., and the SHAR can read them from there. If the SHAR is 
+    configuration folder, and the SHAR can read them from there. If the SHAR is 

     not running as <span class="fixed">root</span>, permissions might need to be 
     changed to allow this access. If the certificate and key will only be used 
     for the SHAR, they can be put in the same folder with the
     <span class="fixed">shibboleth.xml</span> file and protected appropriately.</p>
     not running as <span class="fixed">root</span>, permissions might need to be 
     changed to allow this access. If the certificate and key will only be used 
     for the SHAR, they can be put in the same folder with the
     <span class="fixed">shibboleth.xml</span> file and protected appropriately.</p>

-    <p>Other web servers like IIS do not use the raw PEM format that Apache and 
+    <p>Other web servers like IIS do not use the file formats that Apache and 

     Shibboleth can share, and therefore the components must generally use 
     separate copies of the key and certificate if they are to be shared. Most 
     Shibboleth can share, and therefore the components must generally use 
     separate copies of the key and certificate if they are to be shared. Most 

-    other servers can export and/or import keys to and from PEM format or other 
-    formats that OpenSSL can convert. Refer to your server&#39;s documentation or 
-    ask for assistance from others who use it.</p>
+    other servers can export and/or import keys to and from PEM or DER format.
+    Refer to your server&#39;s documentation or ask for assistance from others
+    who use it.</p>

     <p>The SHAR is assigned a key and a certificate using shibboleth.xml&#39;s
     <p>The SHAR is assigned a key and a certificate using shibboleth.xml&#39;s

-    <span class="fixed">certFile</span>, <span class="fixed">keyFile</span> and
-    <span class="fixed">keyPass</span> settings, described in <a href="#4.a.">
-    section 4.a.</a> These files must currently be in PEM format. OpenSSL 
-    commands to generate a new keypair and a certificate request are shown here, 
-    assuming 2048 bit RSA keys are to be used:</p>
+    <a href="#confFileResolver"><span class="fixed">FileResolver</span></a> element
+    described in <a href="#4.a.">section 4.a.</a> Various formats are supported and
+    OpenSSL can generate and convert among them. OpenSSL commands to generate a new
+    keypair and a certificate request are shown here, assuming 2048 bit RSA keys are
+    to be used:</p>

     <blockquote>
     <blockquote>

-        <p><span class="fixed">$ openssl genrsa -des3 -out ssl.key 2048<br>
+        <p><span class="fixed">$ openssl genrsa -out ssl.key 2048<br>

         $ openssl req -new -key ssl.key -out ssl.csr</span> </p>
     </blockquote>
         $ openssl req -new -key ssl.key -out ssl.csr</span> </p>
     </blockquote>

-    <p>The signed certificate file returned by the CA should be usable directly, 
-    or can be converted to PEM format using the <span class="fixed">openssl x509</span> 
-    command.</p>
+    <p>The signed certificate file returned by the CA should be usable directly.</p>

     <p>If the key is to be shared with Apache, the web server&#39;s child processes, 
     <p>If the key is to be shared with Apache, the web server&#39;s child processes, 

-    often running as <span class="fixed">nobody</span>, must be able to read 
-    them while the server is running, which may require permission changes.</p>
+    often running as <span class="fixed">nobody</span> or a similar uid, must be
+    able to read them while the server is running, which may require permission
+    changes.</p>

     <p>This particularly applies when sharing the key and certificate used by 
     mod_ssl, which are only readable by root by default. The password, if any, 
     must be placed in the <span class="fixed">shibboleth.xml</span> file, since 
     <p>This particularly applies when sharing the key and certificate used by 
     mod_ssl, which are only readable by root by default. The password, if any, 
     must be placed in the <span class="fixed">shibboleth.xml</span> file, since 

@@ -1409,74 +1817,95 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
     can. The issues surrounding how to securely obtain a key while running as
     <span class="fixed">nobody</span> may be addressed in a later release. Since 
     the password will be stored in clear text in a frequently examined file, it 
     can. The issues surrounding how to securely obtain a key while running as
     <span class="fixed">nobody</span> may be addressed in a later release. Since 
     the password will be stored in clear text in a frequently examined file, it 

-    is suggested to use a password not used elsewhere.</p>
+    is suggested to use a password not used elsewhere, or preferably not to use
+    a password at all.</p>

 
 </blockquote>
 <h4><a name="4.d."></a>4.d. Protecting Web Pages</h4>
 <blockquote>
     <p>Protection of web pages is primarily achieved through &quot;mapping&quot;
     attributes provided by an AA to a localized vocabulary for authorization
 
 </blockquote>
 <h4><a name="4.d."></a>4.d. Protecting Web Pages</h4>
 <blockquote>
     <p>Protection of web pages is primarily achieved through &quot;mapping&quot;
     attributes provided by an AA to a localized vocabulary for authorization

-    rules. This was formerly accomplished in Apache using  features in the AAP
-    syntax, described in <a href="#4.e.">section 4.e.</a> This applies to both
-    Apache and IIS.</p>
+    rules. This is accomplished using features in the AAP syntax, described in
+    <a href="#4.e.">section 4.e.</a> This applies to both Apache and IIS.</p>

     <p><b><u>IIS</u></b></p>
     <p><b><u>IIS</u></b></p>

-    <p>The IIS RM module supports the mapping of attributes via AAP files, but 
-    it does not support rule-based policies and therefore cannot protect static 
-    content at this time. In addition, all of the configuration settings are 
-    managed globally or per-site and are pulled from the <span class="fixed">
-    shibboleth.xml</span> file, so there are no additional commands to document 
-    at this time.<br>
+    <p>The IIS filter module supports the mapping of attributes into HTTP headers
+    via AAP files, but it does not yet support rule-based access control and
+    therefore cannot protect static content at this time. In addition, all of
+    the configuration settings, such as control over whether to prompt for new
+    sessions automatically, are managed via the
+    <a href="#confRequestMap"><span class="fixed">RequestMap</span></a> element,
+    so there are no additional commands to document at this time.<br>

     </p>
     <p><b><u>Apache</u></b></p>
     </p>
     <p><b><u>Apache</u></b></p>

-    <p>The Apache RM module provided can interpret AAP settings to map
+    <p>The Apache module provided can also interpret AAP settings to map

     attributes to HTTP request headers and to <span class="fixed">Require</span>
     rules, permitting protection of both static and dynamic content. Any of the
     typical ways of protecting content may be used (.htaccess, Directory,
     Location, Files, etc.). They define what content is to be protected and
     static access control rules.</p>
     attributes to HTTP request headers and to <span class="fixed">Require</span>
     rules, permitting protection of both static and dynamic content. Any of the
     typical ways of protecting content may be used (.htaccess, Directory,
     Location, Files, etc.). They define what content is to be protected and
     static access control rules.</p>

-    <p>There are two ways to trigger Shibboleth authentication: specifying an
-    <span class="fixed">AuthType</span> of <span class="fixed">shibboleth</span>
-    to use Shibboleth directly, or using <span
-    class="fixed">ShibBasicHijack</span> to process existing .htaccess files
-    using Shibboleth instead. Support for authorization consists of
-    mod_auth-style require directives, as well as support for mod_auth group
-    files.</p>
-    <p>A complete list of the directives and their values is below:</p>
+    <p>There are two ways to require Shibboleth authentication, but both also require
+    enabling the module to activate by specifying an <span class="fixed">AuthType</span>
+    of <span class="fixed">shibboleth</span> and supplying at least one
+    <span class="fixed">Require</span> rule in <span class="fixed">httpd.conf</span>
+    or <span class="fixed">.htaccess</span> files. The <span class="fixed">Require</span>
+    rule can enforce a specific access control policy based on attributes, can specify
+    <span class="fixed">valid-user</span> to require any authenticated session, or it can
+    support so-called lazy sessions by using the place-holder rule name of
+    <span class="fixed">Shibboleth</span>. In such cases, the module is activated, but
+    in a passive mode that does not automatically force a session, but will process
+    and validate a session if one exists, leaving the authorization decision to the
+    application. Using a static access control rule that will fail in the absence of
+    a session is only sensible if one of the two approaches below that force a session
+    are used.</p>
+    <p>To require a session, either the Apache command, <span class="fixed">ShibRequireSession On</span>,
+    or the <span class="fixed">requireSession</span> boolean XML attribute on the
+    <a href="#confRequestMap><span class="fixed">RequestMap</span></a>,
+    <a href="#confHost><span class="fixed">Host</span></a>, or
+    <a href="#confPath><span class="fixed">Path</span></a> elements in
+    <span class="fixed">shibboleth.xml</span> can be used. Both approaches are equivalent, and
+    using either one to require a session will supersede a false or absent setting of the other type.</p>
+    <p>As an example, the following commands will require Shibboleth authentication for a resource:</p>
+    <blockquote>
+        <span class="fixed">AuthType shibboleth<br>
+        ShibRequireSession On<br>
+        Require valid-user</span>
+    </blockquote>
+    <p>A complete list of Apache directives and their values is below:</p>

     <dl>
     <dl>

+        <dd class="attribute"><span class="fixed">ShibURLScheme &lt;http/https&gt;</span></dd>
+        <dd class="value">Used in advanced virtual hosting environments which need to generate
+        SSL redirects from virtual servers that use only HTTP. Supplements the
+        Apache <span class="fixed">ServerName</span> and <span class="fixed">Port</span>
+        commands with this missing option. Defaults to a null value in which the scheme
+        for redirects is based on the physical connection to the server. This is a server-level
+        command, while the rest of the commands listed are content commands that can appear
+        anywhere.</dd>

         <dd class="attribute"><span class="fixed">AuthType &lt;string&gt;</span></dd>
         <dd class="value">Use <span class="fixed">shibboleth</span> for direct 
         invocation, or <span class="fixed">Basic</span> plus the
         <span class="fixed">ShibBasicHijack</span> option described below.</dd>
         <dd class="attribute"><span class="fixed">AuthType &lt;string&gt;</span></dd>
         <dd class="value">Use <span class="fixed">shibboleth</span> for direct 
         invocation, or <span class="fixed">Basic</span> plus the
         <span class="fixed">ShibBasicHijack</span> option described below.</dd>

-        <dd class="attribute"><span class="fixed">ShibSSLOnly &lt;on/off&gt;</span></dd>
-        <dd class="value">Controls whether Shibboleth will reject non-SSL 
-        requests for resources from clients. Defaults to <span class="fixed">off</span>.</dd>

         <dd class="attribute"><span class="fixed">ShibBasicHijack &lt;on/off&gt;</span></dd>
         <dd class="value">Controls whether Shibboleth should or should not 
         ignore requests with <span class="fixed">AuthType Basic</span>. Defaults 
         to <span class="fixed">off</span>.</dd>
         <dd class="attribute"><span class="fixed">ShibBasicHijack &lt;on/off&gt;</span></dd>
         <dd class="value">Controls whether Shibboleth should or should not 
         ignore requests with <span class="fixed">AuthType Basic</span>. Defaults 
         to <span class="fixed">off</span>.</dd>

+        <dd class="attribute"><span class="fixed">ShibRequireSession &lt;on/off&gt;</span></dd>
+        <dd class="value">Controls whether to require an authenticated session before passing
+        control to the authorization phase or the actual resource. Defaults to
+        <span class="fixed">off</span>.</dd>

         <dd class="attribute"><span class="fixed">ShibExportAssertion &lt;on/off&gt;</span></dd>
         <dd class="value">Controls whether the SAML attribute assertion provided 
         by the AA is exported in a base64-encoded HTTP header,
         <dd class="attribute"><span class="fixed">ShibExportAssertion &lt;on/off&gt;</span></dd>
         <dd class="value">Controls whether the SAML attribute assertion provided 
         by the AA is exported in a base64-encoded HTTP header,

-        <span class="fixed">Shib-Attributes</span>. Defaults to
-        <span class="fixed">off</span>. While this does require parsing the raw 
-        XML, it also permits an application to see attributes that may have been 
-        filtered by an AAP, or to forward the SAML assertion to a third party.</dd>
-        <dd class="attribute"><span class="fixed">ShibAuthLifetime &lt;seconds&gt;</span></dd>
-        <dd class="value">If set, sessions are always terminated after the 
-        specified number of seconds, resulting in a new redirect and request for 
-        authentication, just as if a new request without a session is received. 
-        Defaults to infinite.</dd>
-        <dd class="attribute"><span class="fixed">ShibAuthTimeout &lt;seconds&gt;</span></dd>
-        <dd class="value">If set, sessions are always terminated after the 
-        specified number of seconds of inactivity (defined as no requests 
-        received in that session), resulting in a new redirect and request for 
-        authentication, just as if a new request without a session is received. 
-        Defaults to infinite.</dd>
+        <span class="fixed">HTTP_SHIB_ATTRIBUTES</span>. Defaults to <span class="fixed">off</span>.</dd>
+        <dd class="attribute"><span class="fixed">ShibRequireAll &lt;on/off&gt;</span></dd>
+        <dd class="value">Controls whether all <span class="fixed">Require</span> rules
+        specified must be satisfied before access to the resource is granted. Defaults to
+        <span class="fixed">off</span>, which means any single rule can be satisfied, the
+        usual Apache behavior.</dd>

         <dd class="attribute"><span class="fixed">AuthGroupFile &lt;pathname&gt;</span></dd>
         <dd class="value">Same as mod_auth; collects values found in REMOTE_USER 
         into a named group for access control. An attribute must be mapped to 
         REMOTE_USER for this to work. Note that mod_auth will not support group 
         <dd class="attribute"><span class="fixed">AuthGroupFile &lt;pathname&gt;</span></dd>
         <dd class="value">Same as mod_auth; collects values found in REMOTE_USER 
         into a named group for access control. An attribute must be mapped to 
         REMOTE_USER for this to work. Note that mod_auth will not support group 

-        files when mod_shibrm is loaded, since they share the same command.
+        files when the Shibboleth module is loaded, since they share the same command.

         <p><a href="http://httpd.apache.org/docs/mod/core.html#require">This is 
         implemented</a> by placing a <span class="fixed">.htaccess</span> file 
         that references a group file stored at <span class="fixed">/pathname</span>:</p>
         <p><a href="http://httpd.apache.org/docs/mod/core.html#require">This is 
         implemented</a> by placing a <span class="fixed">.htaccess</span> file 
         that references a group file stored at <span class="fixed">/pathname</span>:</p>

@@ -1490,8 +1919,8 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
         <span class="fixed">workgroup: joe@example.edu, jane@demo.edu, jim@sample.edu</span>
         </dd>
         <dd class="attribute"><span class="fixed">Require &lt;string&gt;</span></dd>
         <span class="fixed">workgroup: joe@example.edu, jane@demo.edu, jim@sample.edu</span>
         </dd>
         <dd class="attribute"><span class="fixed">Require &lt;string&gt;</span></dd>

-        <dd class="value">Enforce authorization using one of the following 
-        methods.<ul type="circle">
+        <dd class="value">Enforce authorization using one of the following methods.
+        <ul type="circle">

             <li><span class="fixed">valid-user</span><blockquote>
                 <p>Any Shibboleth user from a trusted origin site is accepted, 
                 even if no actual attributes are received. This is a very 
             <li><span class="fixed">valid-user</span><blockquote>
                 <p>Any Shibboleth user from a trusted origin site is accepted, 
                 even if no actual attributes are received. This is a very 

@@ -1502,8 +1931,7 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
             <p><span class="fixed">user</span></p>
             <blockquote>
                 <p>A space-delimited list of values, such as from the
             <p><span class="fixed">user</span></p>
             <blockquote>
                 <p>A space-delimited list of values, such as from the

-                <span class="fixed">
-                urn:mace:dir:attribute-def:eduPersonPrincipalName</span> 
+                <span class="fixed">urn:mace:dir:attribute-def:eduPersonPrincipalName</span> 

                 attribute. Actually, any attribute can be mapped to REMOTE_USER, 
                 even if this doesn&#39;t always make sense.</p>
             </blockquote>
                 attribute. Actually, any attribute can be mapped to REMOTE_USER, 
                 even if this doesn&#39;t always make sense.</p>
             </blockquote>

@@ -1514,13 +1942,21 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
                 that a mapping to <span class="fixed">REMOTE_USER</span> exists.</p>
             </blockquote>
             </li>
                 that a mapping to <span class="fixed">REMOTE_USER</span> exists.</p>
             </blockquote>
             </li>

-            <li><span class="fixed">&lt;alias&gt;</span><blockquote>
+            <li><span class="fixed"><i>alias</i></span><blockquote>

                 <p>An arbitrary rule name that matches an Alias defined in an 
                 AAP file. The rule value is a space-delimited list of attribute 
                 values, whose format depends on the attribute in question (e.g. 
                 an affiliation rule might look like:</p>
                 <p>An arbitrary rule name that matches an Alias defined in an 
                 AAP file. The rule value is a space-delimited list of attribute 
                 values, whose format depends on the attribute in question (e.g. 
                 an affiliation rule might look like:</p>

-                <p><span class="fixed">require affiliation staff@osu.edu 
-                faculty@mit.edu</span></p>
+                <p><span class="fixed">require affiliation staff@osu.edu faculty@mit.edu</span></p>
+            </blockquote>
+            </li>
+            <li><span class="fixed">shibboleth</span><blockquote>
+                <p>If a session cookie of the expected name exists, the corresponding
+                session will be validated and any cached attributes exported as otherwise
+                specified. Authorization will be controlled by the resource, unless
+                additional rules are specified. If however a session does not already
+                exist, or if the current session expires or times out, no session will
+                be requested and control will pass to the resource.</p>

             </blockquote>
             </li>
         </ul>
             </blockquote>
             </li>
         </ul>

@@ -1551,16 +1987,18 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
     about its users.</p>
     <p>Attribute acceptance is the process of defining acceptable attributes and 
     filtering attribute values before passing them on to a resource manager, 
     about its users.</p>
     <p>Attribute acceptance is the process of defining acceptable attributes and 
     filtering attribute values before passing them on to a resource manager, 

-    such as the <span class="fixed">mod_shibrm</span> module. Data blocked by 
+    such as the Shibboleth module or a web application. Data blocked by 

     AAP filters will not be passed to the CGI environment or used when enforcing
     AAP filters will not be passed to the CGI environment or used when enforcing

-    <span class="fixed">.htaccess</span> rules. Note that the attribute 
-    assertion exported to the <span class="fixed">Shib-Attributes</span> header 
-    is unfiltered.</p>
+    <span class="fixed">.htaccess</span> rules in Apache. Note that the attribute 
+    assertion exported to the <span class="fixed">HTTP_SHIB_ATTRIBUTES</span> header 
+    is now also filtered. This is a change from previous versions. To compensate,
+    either no AAP can be specified, or a rule can be applied to permit all
+    attributes to pass through while also exporting specific attributes.</p>

     <p>The Shibboleth implementation supports Scoped and Simple attributes and 
     filtering policies for different kinds of attributes, and is potentially 
     extensible to more complex attributes in the future. An attribute is 
     considered Scoped if the XML representation of its values contains a &quot;Scope&quot; 
     <p>The Shibboleth implementation supports Scoped and Simple attributes and 
     filtering policies for different kinds of attributes, and is potentially 
     extensible to more complex attributes in the future. An attribute is 
     considered Scoped if the XML representation of its values contains a &quot;Scope&quot; 

-    attribute. As of 1.1, this is detected at runtime and requires no 
+    attribute. As of 1.1+, this is detected at runtime and requires no 

     configuration in advance.</p>
     <p><b>An essential part of the Shibboleth trust fabric is ensuring that 
     sites only assert attributes for domains for which they are considered 
     configuration in advance.</p>
     <p><b>An essential part of the Shibboleth trust fabric is ensuring that 
     sites only assert attributes for domains for which they are considered 

@@ -1568,7 +2006,7 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
     will be trusted to assert attributes only scoped to <span class="fixed">
     brown.edu</span>. Unless there are very specific circumstances requiring 
     this restriction be removed, it is strongly encouraged that such policies be 
     will be trusted to assert attributes only scoped to <span class="fixed">
     brown.edu</span>. Unless there are very specific circumstances requiring 
     this restriction be removed, it is strongly encouraged that such policies be 

-    in place.</b></p>
+    left in place.</b></p>

     <h4>Scoped:</h4>
     <blockquote>
         <p>Scoped attributes are a special kind of attribute whose values are a 
     <h4>Scoped:</h4>
     <blockquote>
         <p>Scoped attributes are a special kind of attribute whose values are a 

@@ -1579,18 +2017,16 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
         of <span class="fixed">eduPersonAffiliation</span> values, such as
         <span class="fixed">student</span>, <span class="fixed">member</span>, 
         or <span class="fixed">faculty</span>. Scopes are expressed as DNS 
         of <span class="fixed">eduPersonAffiliation</span> values, such as
         <span class="fixed">student</span>, <span class="fixed">member</span>, 
         or <span class="fixed">faculty</span>. Scopes are expressed as DNS 

-        domains and subdomains.</p>
+        domains and subdomains as a convention.</p>

         <p>Any <span class="fixed">scoped</span> attribute can be scoped only to 
         the origin site&#39;s permitted domains. These domains are listed in the 
         <p>Any <span class="fixed">scoped</span> attribute can be scoped only to 
         the origin site&#39;s permitted domains. These domains are listed in the 

-        site metadata that provides policy information to the system. Domains 
-        can be explicit or regular expressions, and can be changed by a target 
-        to meet its needs. Targets can also override the rules specified for the 
-        site in their own AAPs, choosing to accept additional scopes or deny 
-        scopes that would ordinarily be accepted based on metadata provided by a 
-        federation. Thus, attribute acceptance processing for
-        <span class="fixed">scoped</span> attributes is based on site metadata 
-        and target-specified overrides in addition to the mechanism described 
-        below for <span class="fixed">simple</span> attributes.</p>
+        operational metadata that provides policy information to the system and
+        can be overridden or supplemented using the AAP. Domains can be explicit
+        or regular expressions, and can be changed by a target to meet its needs.
+        Thus, attribute acceptance processing for <span class="fixed">scoped</span>
+        attributes is based on site metadata and target-specified overrides in
+        addition to the mechanism described below for <span class="fixed">simple</span>
+        attributes.</p>

         <p>Scope rules specified in an AAP are additive with any domains 
         permitted by site metadata, and the rules are applied by first looking 
         for an applicable denial rule, and then looking at site metadata and any 
         <p>Scope rules specified in an AAP are additive with any domains 
         permitted by site metadata, and the rules are applied by first looking 
         for an applicable denial rule, and then looking at site metadata and any 

@@ -1603,17 +2039,16 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
         permitted. <span class="fixed">eduPersonEntitlement</span>, in which the 
         values are URIs, is one example of a simple attribute.</p>
         <p>Both Simple and Scoped attribute acceptance is controlled with an 
         permitted. <span class="fixed">eduPersonEntitlement</span>, in which the 
         values are URIs, is one example of a simple attribute.</p>
         <p>Both Simple and Scoped attribute acceptance is controlled with an 

-        external policy file written in XML. The schema for the file is 
-        described by the <span class="fixed">shibboleth.xsd</span> schema, and 
-        an example file is included, <span class="fixed">AAP.xml</span>. It is 
-        mandatory to supply such a file, because attributes are recognized based 
-        on their presence in this file, and not by separate configuration 
-        processes. Only by listing an attribute in the file will it be accepted 
-        and processed by the RM.</p>
+        external (or in 1.2, optionally inline) policy file written in XML.
+        The schema for the file is described by the <span class="fixed">shibboleth.xsd</span>
+        schema, and an example file is included, <span class="fixed">AAP.xml</span>.
+        It is now optional to supply such a policy, but in the absence of one, no
+        attributes will be exported into request headers, and the option to export
+        the assertion as a whole must be used instead.</p>

         <p>The policy is a default-deny algorithm that requires permissible 
         <p>The policy is a default-deny algorithm that requires permissible 

-        attributes and values be listed explicitly. That is, an empty file 
-        permits nothing. Each attribute to be supported must be listed in the 
-        file by name in an <span class="fixed">&lt;AttributeRule&gt;</span>. Each such 
+        attributes and values be listed explicitly. That is, an empty (as opposed to no)
+        policy permits nothing. Each attribute to be supported must be listed in the 
+        policy by name in an <span class="fixed">&lt;AttributeRule&gt;</span>. Each such 

         rule is a collection of <span class="fixed">&lt;SiteRule&gt;</span> elements 
         along with an optional <span class="fixed">&lt;AnySite&gt;</span> default 
         rule. In turn each site rule is a set of <span class="fixed">&lt;Value&gt;</span> 
         rule is a collection of <span class="fixed">&lt;SiteRule&gt;</span> elements 
         along with an optional <span class="fixed">&lt;AnySite&gt;</span> default 
         rule. In turn each site rule is a set of <span class="fixed">&lt;Value&gt;</span> 

@@ -1621,14 +2056,23 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
         expressions, or a wildcarded <span class="fixed">&lt;AnyValue&gt;</span> 
         default rule, which is equivalent to a single regular expression rule 
         allowing anything.</p>
         expressions, or a wildcarded <span class="fixed">&lt;AnyValue&gt;</span> 
         default rule, which is equivalent to a single regular expression rule 
         allowing anything.</p>

+        <p>With 1.2, a new <span class="fixed">&lt;AnyAttribute&gt;</span> element
+        can be used before or in place of the <span class="fixed">&lt;AttributeRule&gt;</span>
+        elements to allow all attributes and values to pass muster. The purpose of this
+        is to then supply rules to specify the export of particular attributes, without
+        using those rules to control acceptance.</p>

     </blockquote>
     <p>A syntax summary follows:</p>
     <blockquote>
     </blockquote>
     <p>A syntax summary follows:</p>
     <blockquote>

-        <p><span class="fixed">&lt;AttributeAcceptancePolicy</span></p>
+        <p><span class="fixed">&lt;AttributeAcceptancePolicy&gt;</span></p>

         <blockquote>
             <p>The top level element in the file.</p>
         </blockquote>
         <blockquote>
             <p>The top level element in the file.</p>
         </blockquote>

-        <p><span class="fixed">&lt;AttributeRule<br>
+        <p><span class="fixed">&lt;AnyAttribute&gt;</span></p>
+        <blockquote>
+            <p>Disables acceptance filtering and leaves the assertion intact.</p>
+        </blockquote>
+        <p><span class="fixed">&lt;AttributeRule&gt;<br>

 &nbsp;&nbsp;&nbsp; Name=&quot;urn:mace:dir:attribute-def:eduPersonScopedAffiliation&quot;<br>
 &nbsp;&nbsp;&nbsp; Header=&quot;Shib-EP-Affiliation&quot; Alias=&quot;affiliation&quot;&gt;</span></p>
         <blockquote>
 &nbsp;&nbsp;&nbsp; Name=&quot;urn:mace:dir:attribute-def:eduPersonScopedAffiliation&quot;<br>
 &nbsp;&nbsp;&nbsp; Header=&quot;Shib-EP-Affiliation&quot; Alias=&quot;affiliation&quot;&gt;</span></p>
         <blockquote>

@@ -1648,24 +2092,24 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
                 <tr>
                     <td><span class="fixed">Header</span></td>
                     <td>The HTTP request header to map the attribute&#39;s values 
                 <tr>
                     <td><span class="fixed">Header</span></td>
                     <td>The HTTP request header to map the attribute&#39;s values 

-                    to.</td>
+                    into.</td>

                 </tr>
                 <tr>
                     <td><span class="fixed">Alias</span></td>
                     <td>A short name for the attribute, determines the name of 
                 </tr>
                 <tr>
                     <td><span class="fixed">Alias</span></td>
                     <td>A short name for the attribute, determines the name of 

-                    the Apache <span class="fixed">Requires</span> rule.</td>
+                    the Apache <span class="fixed">Require</span> rule.</td>

                 </tr>
             </table>
         </blockquote>
         <p><span class="fixed">&lt;AnySite&gt;</span></p>
         <blockquote>
             <p>Specifies a rule that always applies to the attribute, regardless 
                 </tr>
             </table>
         </blockquote>
         <p><span class="fixed">&lt;AnySite&gt;</span></p>
         <blockquote>
             <p>Specifies a rule that always applies to the attribute, regardless 

-            of the asserting AA.</p>
+            of the asserting origin site.</p>

         </blockquote>
         </blockquote>

-        <p><span class="fixed">&lt;SiteRule Name=&quot;host.domain.com&quot;&gt;</span></p>
+        <p><span class="fixed">&lt;SiteRule Name=&quot;providerId&quot;&gt;</span></p>

         <blockquote>
         <blockquote>

-            <p>A rule that applies to the origin site AA corresponding to the 
-            hostname.</p>
+            <p>A rule that applies to the origin site corresponding to the supplied
+            identifier</p>

         </blockquote>
         <p><span class="fixed">&lt;Scope Accept=&quot;true|false&quot; Type=&quot;type&quot;&gt;</span></p>
         <blockquote>
         </blockquote>
         <p><span class="fixed">&lt;Scope Accept=&quot;true|false&quot; Type=&quot;type&quot;&gt;</span></p>
         <blockquote>

@@ -1696,16 +2140,16 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
     <span class="fixed">^</span> and <span class="fixed">$</span> to avoid 
     unintentional matches midstring.</p>
 </blockquote>
     <span class="fixed">^</span> and <span class="fixed">$</span> to avoid 
     unintentional matches midstring.</p>
 </blockquote>

-<h4><a name="4.f."></a>4.f. Using Attributes in Applications</h4>
+<h4><a name="4.f."></a>4.f. Using Attributes and Session Data in Applications</h4>

 <blockquote>
     <p>Apart from the simple RM functionality provided, attribute information 
     may be made available directly to applications via the standard practice of 
     creating custom HTTP request headers before passing control to the 
 <blockquote>
     <p>Apart from the simple RM functionality provided, attribute information 
     may be made available directly to applications via the standard practice of 
     creating custom HTTP request headers before passing control to the 

-    application. Applications should make no assumption about the presence of 
+    resource. Web applications should make no assumption about the presence of 

     specific attributes for their use unless they have intimate knowledge of the 
     attribute release policies in place.</p>
     specific attributes for their use unless they have intimate knowledge of the 
     attribute release policies in place.</p>

-    <p>The AAP metadata controls this interface, and maps a Shibboleth attribute 
-    to a header name, such as <span class="fixed">Shib-EP-Affiliation</span>. 
+    <p>The AAP rules control this interface, and map Shibboleth attributes
+    to header names, such as <span class="fixed">Shib-EP-Affiliation</span>. 

     Using that example, any values of the mapped attribute will be placed in 
     that header, delimited by semicolons. An application that uses a CGI-like 
     syntax to access the header will find the values in the <span class="fixed">
     Using that example, any values of the mapped attribute will be placed in 
     that header, delimited by semicolons. An application that uses a CGI-like 
     syntax to access the header will find the values in the <span class="fixed">

@@ -1724,58 +2168,112 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
     mapped to <span class="fixed">REMOTE_USER</span>. Even so, EPPN may not be 
     provided by the AA, and <span class="fixed">REMOTE_USER</span> might still 
     be empty.</p>
     mapped to <span class="fixed">REMOTE_USER</span>. Even so, EPPN may not be 
     provided by the AA, and <span class="fixed">REMOTE_USER</span> might still 
     be empty.</p>

-    <p>The <span class="fixed">Shib-Origin-Site</span> variable will contain the 
-    unique name/identifier of the origin site of the user. Some applications may 
-    use this to lookup additional policy or application data. It normally takes 
-    the form of a URI but could be any string in some deployments.</p>
-    <p>Finally, configuration may instruct the web server to place the entire 
-    XML message containing the SAML attribute information from the AA into a 
-    base64-encoded header called <span class="fixed">Shib-Attributes</span>. 
-    This is a raw interface that provides an application with the entire AA 
-    response, and is not a filtered view based on any attribute acceptance rules 
-    or even based on what attributes are recognized by the target. What was sent 
-    is what you see.</p>
+    <p>In addition to general attribute information, the following special
+    HTTP headers are created for any authenticated request:</p>
+    <dl>
+        <dd class="attribute"><span class="fixed">HTTP_SHIB_ORIGIN_SITE</span></dd>
+        <dd class="value">Contains the unique identifier (providerId) of the
+        origin site of the user. Some applications may use this to lookup
+        additional policy or application data. It normally takes the form of a
+        URI but could be any string in some deployments.</dd>
+        <dd class="attribute"><span class="fixed">HTTP_SHIB-AUTHENTICATION-METHOD</span></dd>
+        <dd class="value">Contains the SAML AuthenticationMethod URI that
+        documents some aspect of the user's authentication to the origin site's
+        web authentication service.</dd>
+        <dd class="attribute"><span class="fixed">HTTP_SHIB_APPLICATION_ID</span></dd>
+        <dd class="value">Contains the XML <span class="fixed">applicationId</span>
+        attribute in <span class="fixed">shibboleth.xml</span> that corresponds to
+        the request based on the <a href="#confRequestMap"><span class="fixed">RequestMap</span></a>
+        and associated elements.</dd>
+        <dd class="attribute"><span class="fixed">HTTP_SHIB_ATTRIBUTES</span></dd>
+        <dd class="value">Contains the assertion in XML containing the
+        SAML attribute information from the AA in base64-encoded format.
+        This is a raw interface that provides an application with the entire 
+        assertion in, but is still a filtered view based on any attribute acceptance
+        rules.</dd>
+    </dl>
+    <p>Finally, special support exists to obtain the value of the SAML
+    <span class="fixed">&lt;NameIdentifier&gt;</span> element, which identifies the
+    subject of the session, the user. Many Shibboleth deployments use opaque handles
+    that have no application value, however newer deployments may choose to support
+    alternative identifiers, including formats defined by SAML. Targets can use
+    these origins and obtain the primary subject name by using a special AAP
+    <span class="fixed">&lt;AttributeRule&gt;</span> with a
+    <span class="fixed">Name</span> corresponding to the SAML
+    <span class="fixed">Format</span> identifier that describes the kind of
+    identifier used to represent the subject. The rule specifies in what header
+    to export the identifier value (such as <span class="fixed">REMOTE_USER</span>),
+    while the <span class="fixed">Format</span> identifier will be placed in the
+     <span class="fixed">HTTP_SHIB_NAMEIDENTIFIER_FORMAT</span> header.
+    </p>

 </blockquote>
 <h4><a name="4.g."></a>4.g. <span class="fixed">siterefresh</span></h4>
 <blockquote>
     <p>Shibboleth provides a simple tool called <span class="fixed">siterefresh</span> 
     in the <span class="fixed">/opt/shibboleth/bin</span> folder of the 
     distribution to maintain metadata files referenced by <span class="fixed">
 </blockquote>
 <h4><a name="4.g."></a>4.g. <span class="fixed">siterefresh</span></h4>
 <blockquote>
     <p>Shibboleth provides a simple tool called <span class="fixed">siterefresh</span> 
     in the <span class="fixed">/opt/shibboleth/bin</span> folder of the 
     distribution to maintain metadata files referenced by <span class="fixed">

-    shibboleth.xml</span>. It will return 0 on success and a negative number on 
+    shibboleth.xml</span>. It will return 0 only on success and a negative number on 

     failure and log errors to <span class="fixed">stderr</span>. If the data in 
     failure and log errors to <span class="fixed">stderr</span>. If the data in 

-    the new metadata file is bad or the signature is invalid, the existing copy 
-    is kept. The SHAR and SHIRE stat all metadata files each time the data is 
-    used, allowing them to detect and utilize updates in real-time operation.</p>
+    the new metadata file is unusable or schema invalid, or the signature is invalid,
+    the existing copy is kept and not overwritten. The SHAR and SHIRE stat all
+    metadata files each time the data is used, allowing them to detect and utilize
+    updates in real-time during system operation.</p>

     <p><span class="fixed">siterefresh</span> takes the following command-line 
     parameters:</p>
     <dl>
     <p><span class="fixed">siterefresh</span> takes the following command-line 
     parameters:</p>
     <dl>

-        <dd class="attribute"><span class="fixed">--url &lt;URL&gt;</span> </dd>
+        <dd class="attribute"><span class="fixed">--url &lt;URL&gt;</span></dd>

         <dd class="value">Specifies the <span class="fixed">URL</span> of the 
         <dd class="value">Specifies the <span class="fixed">URL</span> of the 

-        remote metadata file with which to update the local file.</dd>
-        <dd class="attribute"><span class="fixed">--out &lt;pathname&gt;</span> </dd>
+        remote metadata file with which to update the local file. HTTPS is not
+        supported at this time.</dd>
+        <dd class="attribute"><span class="fixed">--out &lt;pathname&gt;</span></dd>

         <dd class="value">Specifies the local file to which to write the new 
         metadata.</dd>
         <dd class="value">Specifies the local file to which to write the new 
         metadata.</dd>

-        <dd class="attributeopt"><span class="fixed">--cert &lt;pathname&gt;</span>
-        </dd>
-        <dd class="valueopt">Specifies the location of a certificate stored in
+        <dd class="attributeopt"><span class="fixed">--noverify</span></dd>
+        <dd class="value">Explicitly disables the requirement for the file to be signed
+        and allows the certificate parameter to be ommitted. If the file is signed,
+        the signature will be verified using whatever key is supplied inside it,
+        and an invalid signature will still result in an error, but if the file is
+        unsigned or has a valid signature, only a warning will be logged, and the
+        result will be success.</dd>
+        <dd class="attributeopt"><span class="fixed">--cert &lt;pathname&gt;</span></dd>
+        <dd class="value">Specifies the location of a certificate stored in

         <span class="fixed">PEM</span> format used to validate the signature of 
         the metadata file. Since much of Shibboleth&#39;s security flows from 
         metadata files, this option is highly recommended, and the certificate 
         <span class="fixed">PEM</span> format used to validate the signature of 
         the metadata file. Since much of Shibboleth&#39;s security flows from 
         metadata files, this option is highly recommended, and the certificate 

-        used should be verified independently.</dd>
-        <dd class="attributeopt"><span class="fixed">--schema &lt;pathname&gt;</span>
-        </dd>
-        <dd class="valueopt">Optionally defines a base path for schemas to use 
-        when validating the file. Defaults to <span class="fixed">
-        /opt/shibboleth/etc/shibboleth/</span>.</dd>
+        used should be verified independently in some out of band fashion.</dd>
+        <dd class="attributeopt"><span class="fixed">--schema &lt;pathname&gt;</span></dd>
+        <dd class="value">Optionally defines a base path for schemas to use 
+        when validating the file. Defaults to a location based on the installation
+        path on Unix, or <span class="fixed">\opt\shibboleth\etc\shibboleth</span>
+        on Windows.</dd>
+        <dd class="attributeopt"><span class="fixed">--rootns &lt;XML namespace&gt;</span></dd>
+        <dd class="value">Optionally defines the XML namespace of the root element
+        expected in the new file. Normally unused, provided to support alternative
+        metadata formats that may be backported to older releases.</dd>
+        <dd class="attributeopt"><span class="fixed">--rootname &lt;XML element name&gt;</span></dd>
+        <dd class="value">Optionally defines the name of the root element
+        expected in the new file. Normally unused, provided to support alternative
+        metadata formats that may be backported to older releases.</dd>

     </dl>
     </dl>

+    <p>If a zero is returned, the command will copy the retrieved file to the output
+    location. Otherwise one of the following error values will be returned:</p>
+    <table align="center" cellspacing="5">
+        <tr><td>-100</td><td>an invalid combination of parameters was specified</td></tr>
+        <tr><td>-10</td><td>the OpenSAML library failed to initialize</td></tr>
+        <tr><td>-1</td><td>the file's XML digital signature was invalid</td></tr>
+        <tr><td>-2</td><td>a SAML exception was trapped</td></tr>
+        <tr><td>-3</td><td>an XML library exception was trapped</td></tr>
+        <tr><td>-4</td><td>a general XML security library exception was trapped</td></tr>
+        <tr><td>-5</td><td>an XML security library crypto exception was trapped</td></tr>
+        <tr><td>-6</td><td>an unknown exception was trapped</td></tr>
+    </table>

     <p>A complete command issued to <span class="fixed">siterefresh</span> might 
     take the form:</p>
     <blockquote>
     <p>A complete command issued to <span class="fixed">siterefresh</span> might 
     take the form:</p>
     <blockquote>

-        <p><span class="fixed">/opt/shibboleth/bin/siterefresh --out sites.xml 
-        --cert internet2.pem \<br>
-        --url http://wayf.internet2.edu/InQueue/sites.xml </span></p>
+        <p><span class="fixed">/opt/shibboleth/bin/siterefresh --out IQ-sites.xml --cert internet2.pem \<br>
+        --url http://wayf.internet2.edu/InQueue/IQ-sites.xml </span></p>

     </blockquote>
     </blockquote>

-    <p>It is recommended that similar commands be added to a <span class="fixed">
+    <p>It is recommended that such commands be added to a <span class="fixed">

     crontab</span> to keep the site and trust files refreshed. AAP files tend to 
     be site-specific, but could be maintained and distributed centrally. If the 
     command is invoked in a script that writes the file to a new location and 
     crontab</span> to keep the site and trust files refreshed. AAP files tend to 
     be site-specific, but could be maintained and distributed centrally. If the 
     command is invoked in a script that writes the file to a new location and 

@@ -1787,38 +2285,21 @@ checkAddress=&quot;<i>true/false</i>&quot;&gt;</span></dd>
 <blockquote>
     <p>Shibboleth includes a useful plugin that extends the default memory cache 
     for storing session data in the SHAR with a backing cache using an embedded 
 <blockquote>
     <p>Shibboleth includes a useful plugin that extends the default memory cache 
     for storing session data in the SHAR with a backing cache using an embedded 

-    MySQL database. In most distributions, it is enabled by default. The plugin 
-    can be found in the <span class="fixed">/opt/shibboleth/libexec</span> 
-    folder, and is loaded as an extension library using the <span class="fixed">
-    [extensions:saml]</span> section of <span class="fixed">shibboleth.xml</span>. 
-    The following configuration options are available:</p>
-    <dl>
-        <dd class="attributeopt"><span class="fixed">mysql-cache-timeout = 
-        &lt;seconds&gt;&nbsp;&nbsp;&nbsp; (in [shar] section)</span></dd>
-        <dd class="valueopt">Specifies the duration in <span class="fixed">
-        seconds</span> that must elapse between user accesses before that user&#39;s 
-        session is purged from the persistent cache. Defaults to
-        <span class="fixed">28800</span> seconds, or 8 hours. This should 
-        generally be longer than the associated server&#39;s settings for session 
-        lifetime and timeout, and the memory cache&#39;s timeout.</dd>
-        <dd class="attributeopt"><span class="fixed">&lt;MySQL Arguments&gt;&nbsp;&nbsp;&nbsp; 
-        (one per line in [mysql] section)</span></dd>
-        <dd class="valueopt">To pass arguments to the MySQL engine, create 
-        argument lines in the <span class="fixed">[mysql]</span> section in the 
-        form:
-        <blockquote class="fixed">
-            <p>arg1=&lt;argument&gt;<br>
-            arg2=&lt;argument&gt;<br>
-            etc... </p>
-        </blockquote>
-        <p>Important arguments you&#39;ll find by default include: </p>
+    MySQL database. It is now disabled by default. The plugin can be found in the
+    <span class="fixed">/opt/shibboleth/libexec</span> folder, and is loaded as an
+    extension library using the <a href="#confExtensions"><span class="fixed">Extensions</span></a>
+    element of <span class="fixed">shibboleth.xml</span>. The extension and the
+    <a href="#confMySQLSessionCache"><span class="fixed">MySQLSessionCache</span></a>
+    element are commented out by default.</p>
+    <p>Important <a href="#confArgument"><span class="fixed">Argument</span></a>
+    elements you'll find by default include:</p>

         <blockquote class="fixed">
         <blockquote class="fixed">

-            <p>arg1 = --language=/opt/shibboleth/share/english<br>
-            arg2 = --datadir=/opt/shibboleth/data</p>
+            <p>--language=/opt/shibboleth/share/english<br>
+            --datadir=/opt/shibboleth/data</p>

         </blockquote>
         </blockquote>

-        <p>which set the message file path and the location of the cache&#39;s 
+        <p>which set the message file path and the location of the cache's 

         database files respectively. Make sure the data directory exists before 
         database files respectively. Make sure the data directory exists before 

-        starting the SHAR if you change this path.</dd>
+        starting the SHAR if you change this path.

     </dl>
 </blockquote>
 <p><br>
     </dl>
 </blockquote>
 <p><br>

@@ -1842,22 +2323,15 @@ with a thorough description of errors and configurations used.</p>
         <p><span class="fixed"># Configure a test directory<br>
         &lt;Location /secure&gt;<br>
         &nbsp;&nbsp;AuthType shibboleth<br>
         <p><span class="fixed"># Configure a test directory<br>
         &lt;Location /secure&gt;<br>
         &nbsp;&nbsp;AuthType shibboleth<br>

+        &nbsp;&nbsp;ShibRequireSession On<br>

         &nbsp;&nbsp;require valid-user<br>
         &nbsp;&nbsp;require valid-user<br>

-        <br>
-        &nbsp;&nbsp;# Per-directory SHIRE Configuration<br>
-        &nbsp;&nbsp;#ShibBasicHijack On<br>
-        <br>
-        &nbsp;&nbsp;# RM Configuration<br>
-        &nbsp;&nbsp;#AuthGroupFile /foo<br>
-        &nbsp;&nbsp;#ShibRequireSession On<br>
-        &nbsp;&nbsp;#ShibExportAssertion On<br>

         &lt;/Location&gt;<br>
         </span></p>
     </blockquote>
     <p><b>For information regarding specific error messages that may be 
     generated if the target does not work successfully, please refer to section
     <a href="#5.b.">5.b.</a>, or write
         &lt;/Location&gt;<br>
         </span></p>
     </blockquote>
     <p><b>For information regarding specific error messages that may be 
     generated if the target does not work successfully, please refer to section
     <a href="#5.b.">5.b.</a>, or write

-    <a href="mailto:mace-shib-users@internet2.edu">mace-shib-users@internet2.edu</a>.</b></p>
+    <a href="mailto:shibboleth-users@internet2.edu">shibboleth-users@internet2.edu</a>.</b></p>

 </blockquote>
 <h4><a name="5.b."></a>5.b. Common Problems</h4>
 <blockquote>
 </blockquote>
 <h4><a name="5.b."></a>5.b. Common Problems</h4>
 <blockquote>