Revision c9fdfa27 aai/middleware.py
b/aai/middleware.py | ||
---|---|---|
15 | 15 |
if request.path.startswith('/api/') : |
16 | 16 |
return |
17 | 17 |
|
18 |
if request.path.startswith('/invitations/login') : |
|
19 |
return |
|
20 |
|
|
21 | 18 |
# Special case for testing purposes, delivers the cookie for the |
22 | 19 |
# test user on first access |
23 | 20 |
# TODO: REMOVE THE FOLLOWING BEFORE DEPLOYMENT |
24 | 21 |
if request.GET.get('test') is not None: |
25 |
usr = SynnefoUser.objects.get(auth_token='46e427d657b20defe352804f0eb6f8a2')
|
|
26 |
return self._redirect_shib_auth_user(user = usr)
|
|
22 |
u = SynnefoUser.objects.get(auth_token='46e427d657b20defe352804f0eb6f8a2') |
|
23 |
return self._redirect_shib_auth_user(user = u) |
|
27 | 24 |
|
28 | 25 |
token = None |
29 | 26 |
#Try to find token in a cookie |
... | ... | |
46 | 43 |
|
47 | 44 |
#Check user's auth token |
48 | 45 |
if (time.time() - |
49 |
time.mktime(user.auth_token_created.timetuple()) - |
|
50 |
settings.AUTH_TOKEN_DURATION * 3600) > 0: |
|
46 |
time.mktime(user.auth_token_expires.timetuple())) > 0: |
|
51 | 47 |
#The user's token has expired, re-login |
52 | 48 |
return HttpResponseRedirect(settings.APP_INSTALL_URL + settings.LOGIN_PATH) |
53 | 49 |
|
... | ... | |
95 | 91 |
return response |
96 | 92 |
|
97 | 93 |
def _redirect_shib_auth_user(self, user): |
98 |
expire = user.auth_token_created + datetime.timedelta(hours=settings.AUTH_TOKEN_DURATION) |
|
99 |
expire_fmt = expire.strftime('%a, %d-%b-%Y %H:%M:%S %Z') |
|
94 |
expire_fmt = user.auth_token_expires.strftime('%a, %d-%b-%Y %H:%M:%S %Z') |
|
100 | 95 |
|
101 | 96 |
response = HttpResponse() |
102 | 97 |
|
Also available in: Unified diff