Update Shibboleth headers, as reported by NOC.

diff --git a/docs/source/adminguide.rst b/docs/source/adminguide.rst
index cab306f..3553388 100644 (file)
--- a/docs/source/adminguide.rst
+++ b/docs/source/adminguide.rst
@@ -153,13 +153,13 @@ Configure and run apache::
 
 The following tokens should be available at the destination, after passing through the apache module::
 
-  SHIB_EPPN = "eppn" # eduPersonPrincipalName
-  SHIB_NAME = "Shib-InetOrgPerson-givenName"
-  SHIB_SURNAME = "Shib-Person-surname"
-  SHIB_CN = "Shib-Person-commonName"
-  SHIB_DISPLAYNAME = "Shib-InetOrgPerson-displayName"
-  SHIB_EP_AFFILIATION = "Shib-EP-Affiliation"
-  SHIB_SESSION_ID = "Shib-Session-ID"
+  eppn # eduPersonPrincipalName
+  Shib-InetOrgPerson-givenName
+  Shib-Person-surname
+  Shib-Person-commonName
+  Shib-InetOrgPerson-displayName
+  Shib-EP-Affiliation
+  Shib-Session-ID
 
 MySQL Setup
 -----------

diff --git a/pithos/aai/shibboleth.py b/pithos/aai/shibboleth.py
index e9ff835..0b6a477 100644 (file)
--- a/pithos/aai/shibboleth.py
+++ b/pithos/aai/shibboleth.py
@@ -36,13 +36,13 @@ from util import register_user
 
 class Tokens:
     # these are mapped by the Shibboleth SP software
-    SHIB_EPPN = "eppn" # eduPersonPrincipalName
-    SHIB_NAME = "Shib-InetOrgPerson-givenName"
-    SHIB_SURNAME = "Shib-Person-surname"
-    SHIB_CN = "Shib-Person-commonName"
-    SHIB_DISPLAYNAME = "Shib-InetOrgPerson-displayName"
-    SHIB_EP_AFFILIATION = "Shib-EP-Affiliation"
-    SHIB_SESSION_ID = "Shib-Session-ID"
+    SHIB_EPPN = "HTTP_EPPN" # eduPersonPrincipalName
+    SHIB_NAME = "HTTP_SHIB_INETORGPERSON_GIVENNAME"
+    SHIB_SURNAME = "HTTP_SHIB_PERSON_SURNAME"
+    SHIB_CN = "HTTP_SHIB_PERSON_COMMONNAME"
+    SHIB_DISPLAYNAME = "HTTP_SHIB_INETORGPERSON_DISPLAYNAME"
+    SHIB_EP_AFFILIATION = "HTTP_SHIB_EP_AFFILIATION"
+    SHIB_SESSION_ID = "HTTP_SHIB_SESSION_ID"
 
 
 class NoUniqueToken(BaseException):