Added an attribute map to settings. Eases the parsing of Headers sent back by Shibboleth

flowspec/views.py

@@ -287,11 +287,12 @@ def user_login(request):
         username = request.META['HTTP_EPPN']
         if not username:
             error_username = True
-        firstname = request.META['HTTP_SHIB_INETORGPERSON_GIVENNAME']
-        lastname = request.META['HTTP_SHIB_PERSON_SURNAME']
-        mail = request.META['HTTP_SHIB_INETORGPERSON_MAIL']
+        firstname = lookupShibAttr(settings.SHIB_FIRSTNAME, request.META)
+        lastname = lookupShibAttr(settings.SHIB_LASTNAME, request.META)
+        mail = lookupShibAttr(settings.SHIB_MAIL, request.META)
+        entitlement = lookupShibAttr(settings.SHIB_ENTITLEMENT, request.META)
         organization = request.META['HTTP_SHIB_HOMEORGANIZATION']
-        entitlement = request.META['HTTP_SHIB_EP_ENTITLEMENT']
+        
         if settings.SHIB_AUTH_ENTITLEMENT in entitlement.split(";"):
             has_entitlement = True
         if not has_entitlement:
@@ -341,8 +342,8 @@ def user_login(request):
             error = _("Something went wrong during user authentication. Contact your administrator")
             return render_to_response('error.html', {'error': error,},
                                   context_instance=RequestContext(request))
-    except Exception:
-        error = _("Invalid login procedure")
+    except Exception as e:
+        error = _("Invalid login procedure. Error: %s" %e)
         return render_to_response('error.html', {'error': error,},
                                   context_instance=RequestContext(request))
         # Return an 'invalid login' error message.
@@ -438,3 +439,9 @@ def get_peer_techc_mails(user):
 def send_new_mail(subject, message, from_email, recipient_list, bcc_list):
     return EmailMessage(subject, message, from_email, recipient_list, bcc_list).send()
 
+
+def lookupShibAttr(attrmap, requestMeta):
+    for attr in attrmap:
+        if attr in requestMeta:
+            return requestMeta[attr]
+    return ''
\ No newline at end of file

settings.py.dist

@@ -212,4 +212,12 @@ CELERYBEAT_SCHEDULE = {
 PRIMARY_WHOIS = 'whois.grnet.gr'
 ALTERNATE_WHOIS = 'whois.ripe.net'
 
-ACCOUNT_ACTIVATION_DAYS = 7
\ No newline at end of file
+ACCOUNT_ACTIVATION_DAYS = 7
+
+#Shibboleth attribute map
+SHIB_USERNAME = ['HTTP_EPPN']
+SHIB_MAIL = ['mail', 'HTTP_MAIL', 'HTTP_SHIB_INETORGPERSON_MAIL']
+SHIB_FIRSTNAME = ['HTTP_SHIB_INETORGPERSON_GIVENNAME']
+SHIB_LASTNAME = ['HTTP_SHIB_PERSON_SURNAME']
+SHIB_ENTITLEMENT = ['HTTP_SHIB_EP_ENTITLEMENT']
+

static/css/base.css

@@ -35,9 +35,7 @@ legend + .control-group {
     margin: 0 0 -1px;
     padding: 8px 14px;
 }
-.breadcrumb{
-	background-color: white;
-}
+
 .ui-widget {
     font-size: 12px;
 }