Revision 7dc5bd0c

b/flowspec/views.py
287 287
        username = request.META['HTTP_EPPN']
288 288
        if not username:
289 289
            error_username = True
290
        firstname = request.META['HTTP_SHIB_INETORGPERSON_GIVENNAME']
291
        lastname = request.META['HTTP_SHIB_PERSON_SURNAME']
292
        mail = request.META['HTTP_SHIB_INETORGPERSON_MAIL']
290
        firstname = lookupShibAttr(settings.SHIB_FIRSTNAME, request.META)
291
        lastname = lookupShibAttr(settings.SHIB_LASTNAME, request.META)
292
        mail = lookupShibAttr(settings.SHIB_MAIL, request.META)
293
        entitlement = lookupShibAttr(settings.SHIB_ENTITLEMENT, request.META)
293 294
        organization = request.META['HTTP_SHIB_HOMEORGANIZATION']
294
        entitlement = request.META['HTTP_SHIB_EP_ENTITLEMENT']
295
        
295 296
        if settings.SHIB_AUTH_ENTITLEMENT in entitlement.split(";"):
296 297
            has_entitlement = True
297 298
        if not has_entitlement:
......
341 342
            error = _("Something went wrong during user authentication. Contact your administrator")
342 343
            return render_to_response('error.html', {'error': error,},
343 344
                                  context_instance=RequestContext(request))
344
    except Exception:
345
        error = _("Invalid login procedure")
345
    except Exception as e:
346
        error = _("Invalid login procedure. Error: %s" %e)
346 347
        return render_to_response('error.html', {'error': error,},
347 348
                                  context_instance=RequestContext(request))
348 349
        # Return an 'invalid login' error message.
......
438 439
def send_new_mail(subject, message, from_email, recipient_list, bcc_list):
439 440
    return EmailMessage(subject, message, from_email, recipient_list, bcc_list).send()
440 441

  
442

  
443
def lookupShibAttr(attrmap, requestMeta):
444
    for attr in attrmap:
445
        if attr in requestMeta:
446
            return requestMeta[attr]
447
    return ''
b/settings.py.dist
212 212
PRIMARY_WHOIS = 'whois.grnet.gr'
213 213
ALTERNATE_WHOIS = 'whois.ripe.net'
214 214

  
215
ACCOUNT_ACTIVATION_DAYS = 7
215
ACCOUNT_ACTIVATION_DAYS = 7
216

  
217
#Shibboleth attribute map
218
SHIB_USERNAME = ['HTTP_EPPN']
219
SHIB_MAIL = ['mail', 'HTTP_MAIL', 'HTTP_SHIB_INETORGPERSON_MAIL']
220
SHIB_FIRSTNAME = ['HTTP_SHIB_INETORGPERSON_GIVENNAME']
221
SHIB_LASTNAME = ['HTTP_SHIB_PERSON_SURNAME']
222
SHIB_ENTITLEMENT = ['HTTP_SHIB_EP_ENTITLEMENT']
223

  
b/static/css/base.css
35 35
    margin: 0 0 -1px;
36 36
    padding: 8px 14px;
37 37
}
38
.breadcrumb{
39
	background-color: white;
40
}
38

  
41 39
.ui-widget {
42 40
    font-size: 12px;
43 41
}

Also available in: Unified diff