Revision 79d8af70 aai/middleware.py
b/aai/middleware.py | ||
---|---|---|
67 | 67 |
user = SynnefoUser.objects.get(auth_token=token) |
68 | 68 |
|
69 | 69 |
except SynnefoUser.DoesNotExist: |
70 |
return HttpResponseRedirect(settings.APP_INSTALL_URL + |
|
71 |
settings.LOGIN_PATH) |
|
70 |
return HttpResponseRedirect(settings.LOGIN_URL) |
|
72 | 71 |
# check user's auth token validity |
73 | 72 |
if (time.time() - |
74 | 73 |
time.mktime(user.auth_token_expires.timetuple())) > 0: |
75 | 74 |
# the user's token has expired, prompt to re-login |
76 |
return HttpResponseRedirect(settings.APP_INSTALL_URL + |
|
77 |
settings.LOGIN_PATH) |
|
75 |
return HttpResponseRedirect(settings.LOGIN_URL) |
|
78 | 76 |
|
79 | 77 |
request.user = user |
80 | 78 |
return |
... | ... | |
90 | 88 |
user = SynnefoUser.objects.get(uniq=request.META[Tokens.SHIB_EPPN]) |
91 | 89 |
return self._redirect_shib_auth_user(user) |
92 | 90 |
else: |
93 |
return HttpResponseRedirect(settings.APP_INSTALL_URL + |
|
94 |
settings.LOGIN_PATH) |
|
91 |
return HttpResponseRedirect(settings.LOGIN_URL) |
|
95 | 92 |
|
96 | 93 |
if settings.TEST and 'TEST-AAI' in request.META: |
97 |
return HttpResponseRedirect(settings.APP_INSTALL_URL + |
|
98 |
settings.LOGIN_PATH) |
|
94 |
return HttpResponseRedirect(settings.LOGIN_URL) |
|
99 | 95 |
|
100 |
if request.path.endswith(settings.LOGIN_PATH):
|
|
96 |
if request.path.endswith(settings.LOGIN_URL):
|
|
101 | 97 |
# avoid redirect loops |
102 | 98 |
return |
103 | 99 |
else: |
104 | 100 |
# no authentication info found in headers, redirect back |
105 |
return HttpResponseRedirect(settings.APP_INSTALL_URL + |
|
106 |
settings.LOGIN_PATH) |
|
101 |
return HttpResponseRedirect(settings.LOGIN_URL) |
|
107 | 102 |
|
108 | 103 |
def process_response(self, request, response): |
109 | 104 |
# Tell proxies and other interested parties that the request varies |
Also available in: Unified diff