projects / shibboleth / sp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a83e6c4)
Add logout templates, some missing settings.
authorcantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Fri, 13 Jul 2007 19:23:37 +0000 (19:23 +0000)
committercantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Fri, 13 Jul 2007 19:23:37 +0000 (19:23 +0000)
git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2354 cb58f699-b61c-0410-a6fe-9272a202ed29

configs/Makefile.am patch | blob | history
configs/globalLogout.html [new file with mode: 0644] patch | blob
configs/localLogout.html [new file with mode: 0644] patch | blob
configs/sessionError.html patch | blob | history
configs/shibboleth2.xml.in patch | blob | history

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 845b0d5..20e2810 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -35,6 +35,8 @@ CONFIGFILES = \
        sessionError.html \
        metadataError.html \
        bindingTemplate.html \
+       localLogout.html \
+       globalLogout.html \
        sslError.html \
        sp-example.key \
        sp-example.crt
@@ -131,12 +133,4 @@ EXTRA_DIST = \
        apache2.config.in \
        apache22.config.in \
        shibd.in \
-       console.logger \
-       syslog.logger \
-       bindingTemplate.html \
-       accessError.html \
-       sessionError.html \
-       metadataError.html \
-       sslError.html \
-       sp-example.key \
-       sp-example.crt
+       $(CONFIGFILES)
diff --git a/configs/globalLogout.html b/configs/globalLogout.html
new file mode 100644 (file)
index 0000000..9af17f2
--- /dev/null
+++ b/configs/globalLogout.html
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!DOCTYPE html \r
+       PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" \r
+       "DTD/xhtml1-strict.dtd">\r
+       \r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\r
+<head>\r
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\r
+       <link rel="stylesheet" type="text/css" href="<shibmlp styleSheet/>" />\r
+       <title>Global Logout</title>\r
+</head>\r
+\r
+<body>\r
+<div class="head">\r
+<img src="<shibmlp logoLocation/>" alt="Logo" />\r
+<h1>Global Logout</h1>\r
+</div>\r
+\r
+<p><strong>Status of Global Logout:</strong> <shibmlp logoutStatus/></p>\r
+\r
+<shibmlpif statusCode>\r
+       <p>Error from your identity provider:</p>\r
+       <blockquote>\r
+               <strong>Status:</strong> <shibmlp statusCode/><br>\r
+               <shibmlpif statusCode2>\r
+                       <strong>Sub-Status:</strong> <shibmlp statusCode2/><br>\r
+               </shibmlpif>\r
+               <shibmlpif statusMessage>\r
+                       <strong>Message:</strong> <shibmlp statusMessage/><br>\r
+               </shibmlpif>\r
+       </blockquote>\r
+</shibmlpif>\r
+\r
+<p>If the message above indicates success, you have been logged out of all\r
+the applications and systems that support the logout mechanism.</p>\r
+\r
+<p>It is still strongly advised that you close your browser to complete the\r
+logout process.</p>\r
+\r
+</body>\r
+</html>\r
diff --git a/configs/localLogout.html b/configs/localLogout.html
new file mode 100644 (file)
index 0000000..b509647
--- /dev/null
+++ b/configs/localLogout.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!DOCTYPE html \r
+       PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" \r
+       "DTD/xhtml1-strict.dtd">\r
+       \r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\r
+<head>\r
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\r
+       <link rel="stylesheet" type="text/css" href="<shibmlp styleSheet/>" />\r
+       <title>Local Logout</title>\r
+</head>\r
+\r
+<body>\r
+<div class="head">\r
+<img src="<shibmlp logoLocation/>" alt="Logo" />\r
+<h1>Local Logout</h1>\r
+</div>\r
+\r
+<strong>Status of Local Logout:</strong> <shibmlp logoutStatus/>\r
+\r
+You <strong>MUST</strong> close your browser to complete the logout process.\r
+\r
+</body>\r
+</html>\r
diff --git a/configs/sessionError.html b/configs/sessionError.html
index 3124317..5b47e99 100644 (file)
--- a/configs/sessionError.html
+++ b/configs/sessionError.html
@@ -16,7 +16,7 @@
 <h1><shibmlp errorType/></h1>
 </div>
 
-<p>The inter-institutional access system encountered an error at <shibmlp now /></p>
+<p>The system encountered an error at <shibmlp now /></p>
 
 <p>To report this problem, please contact the site administrator at
 <a href="mailto:<shibmlp supportContact/>"><shibmlp supportContact/></a>.
@@ -27,5 +27,18 @@
 
 <p><shibmlp errorText/></p>
 
+<shibmlpif statusCode>
+       <p>Error from identity provider:</p>
+       <blockquote>
+               <strong>Status:</strong> <shibmlp statusCode/><br>
+               <shibmlpif statusCode2>
+                       <strong>Sub-Status:</strong> <shibmlp statusCode2/><br>
+               </shibmlpif>
+               <shibmlpif statusMessage>
+                       <strong>Message:</strong> <shibmlp statusMessage/><br>
+               </shibmlpif>
+       </blockquote>
+</shibmlpif>
+
 </body>
 </html>
diff --git a/configs/shibboleth2.xml.in b/configs/shibboleth2.xml.in
index bce69d1..c684d29 100644 (file)
--- a/configs/shibboleth2.xml.in
+++ b/configs/shibboleth2.xml.in
@@ -89,7 +89,9 @@
        points into to this section.
        -->
        <Applications id="default" policyId="default" entityID="https://sp.example.org/shibboleth"
-               homeURL="https://sp.example.org/index.html">
+               homeURL="https://sp.example.org/index.html" REMOTE_USER="eppn persistent-id"
+               localLogout="@-PKGSYSCONFDIR-@/localLogout.html"
+               globalLogout="@-PKGSYSCONFDIR-@/globalLogout.html">
 
                <!--
                Controls session lifetimes, address checks, cookie handling, and the protocol handlers.
Shibboleth SP