Revision 6c997921 snf-astakos-app/astakos/im/target/shibboleth.py
b/snf-astakos-app/astakos/im/target/shibboleth.py | ||
---|---|---|
87 | 87 |
tokens = request.META |
88 | 88 |
third_party_key = get_pending_key(request) |
89 | 89 |
|
90 |
try: |
|
91 |
eppn = tokens.get(Tokens.SHIB_EPPN) |
|
92 |
if not eppn: |
|
93 |
raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_EPPN) % { |
|
94 |
'domain': settings.BASEURL, |
|
95 |
'contact_email': settings.DEFAULT_CONTACT_EMAIL |
|
96 |
}) |
|
97 |
if Tokens.SHIB_DISPLAYNAME in tokens: |
|
98 |
realname = tokens[Tokens.SHIB_DISPLAYNAME] |
|
99 |
elif Tokens.SHIB_CN in tokens: |
|
100 |
realname = tokens[Tokens.SHIB_CN] |
|
101 |
elif Tokens.SHIB_NAME in tokens and Tokens.SHIB_SURNAME in tokens: |
|
102 |
realname = tokens[Tokens.SHIB_NAME] + ' ' + tokens[Tokens.SHIB_SURNAME] |
|
103 |
else: |
|
104 |
if settings.SHIBBOLETH_REQUIRE_NAME_INFO: |
|
105 |
raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_NAME)) |
|
106 |
else: |
|
107 |
realname = '' |
|
108 |
|
|
109 |
except KeyError, e: |
|
110 |
# invalid shibboleth headers, redirect to login, display message |
|
111 |
messages.error(request, e.message) |
|
112 |
return HttpResponseRedirect(login_url(request)) |
|
113 |
|
|
114 |
affiliation = tokens.get(Tokens.SHIB_EP_AFFILIATION, '') |
|
115 |
email = tokens.get(Tokens.SHIB_MAIL, '') |
|
90 |
# try: |
|
91 |
# eppn = tokens.get(Tokens.SHIB_EPPN) |
|
92 |
# if not eppn: |
|
93 |
# raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_EPPN) % { |
|
94 |
# 'domain': settings.BASEURL, |
|
95 |
# 'contact_email': settings.DEFAULT_CONTACT_EMAIL |
|
96 |
# }) |
|
97 |
# if Tokens.SHIB_DISPLAYNAME in tokens: |
|
98 |
# realname = tokens[Tokens.SHIB_DISPLAYNAME] |
|
99 |
# elif Tokens.SHIB_CN in tokens: |
|
100 |
# realname = tokens[Tokens.SHIB_CN] |
|
101 |
# elif Tokens.SHIB_NAME in tokens and Tokens.SHIB_SURNAME in tokens: |
|
102 |
# realname = tokens[Tokens.SHIB_NAME] + ' ' + tokens[Tokens.SHIB_SURNAME] |
|
103 |
# else: |
|
104 |
# if settings.SHIBBOLETH_REQUIRE_NAME_INFO: |
|
105 |
# raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_NAME)) |
|
106 |
# else: |
|
107 |
# realname = '' |
|
108 |
# |
|
109 |
# except KeyError, e: |
|
110 |
# # invalid shibboleth headers, redirect to login, display message |
|
111 |
# messages.error(request, e.message) |
|
112 |
# return HttpResponseRedirect(login_url(request)) |
|
113 |
|
|
114 |
# affiliation = tokens.get(Tokens.SHIB_EP_AFFILIATION, '') |
|
115 |
# email = tokens.get(Tokens.SHIB_MAIL, '') |
|
116 |
eppn, email, realname, affiliation = 'spapagian@grnet-hq.admin.grnet.gr', 'spapagian@.grnet.gr', 'sff', None |
|
116 | 117 |
provider_info = {'eppn': eppn, 'email': email, 'name': realname} |
117 | 118 |
userid = eppn |
118 | 119 |
|
Also available in: Unified diff