Revision 837d85bb snf-django-lib/snf_django/lib/astakos.py
| b/snf-django-lib/snf_django/lib/astakos.py | ||
|---|---|---|
| 38 | 38 |
AstakosClientException) |
| 39 | 39 |
|
| 40 | 40 |
|
| 41 |
def user_for_token(token, astakos_auth_url, usage=False, logger=None):
|
|
| 41 |
def user_for_token(token, astakos_auth_url, logger=None): |
|
| 42 | 42 |
if token is None: |
| 43 | 43 |
return None |
| 44 | 44 |
client = AstakosClient(token, astakos_auth_url, |
| 45 | 45 |
retry=2, use_pool=True, logger=logger) |
| 46 | 46 |
try: |
| 47 |
return client.get_user_info(usage=True)
|
|
| 47 |
return client.get_user_info() |
|
| 48 | 48 |
except Unauthorized: |
| 49 | 49 |
return None |
| 50 | 50 |
|
| 51 | 51 |
|
| 52 |
def get_user(request, astakos_auth_url, fallback_token=None, |
|
| 53 |
usage=False, logger=None): |
|
| 52 |
def get_user(request, astakos_auth_url, fallback_token=None, logger=None): |
|
| 54 | 53 |
request.user = None |
| 55 | 54 |
request.user_uniq = None |
| 56 | 55 |
|
| 57 | 56 |
# Try to find token in a parameter or in a request header. |
| 58 | 57 |
user = user_for_token( |
| 59 |
request.GET.get('X-Auth-Token'), astakos_auth_url,
|
|
| 60 |
usage, logger) |
|
| 58 |
request.GET.get('X-Auth-Token'), astakos_auth_url, logger)
|
|
| 61 | 59 |
if not user: |
| 62 | 60 |
user = user_for_token( |
| 63 |
request.META.get('HTTP_X_AUTH_TOKEN'), astakos_auth_url,
|
|
| 64 |
usage, logger) |
|
| 61 |
request.META.get('HTTP_X_AUTH_TOKEN'), astakos_auth_url, logger)
|
|
| 65 | 62 |
if not user: |
| 66 | 63 |
user = user_for_token( |
| 67 |
fallback_token, astakos_auth_url, usage, logger)
|
|
| 64 |
fallback_token, astakos_auth_url, logger) |
|
| 68 | 65 |
if not user: |
| 69 | 66 |
return None |
| 70 | 67 |
|
Also available in: Unified diff