Skip to content

3 bug fixes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpic merged 3 commits into from
Mar 29, 2013
Merged

3 bug fixes #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7024081
3 bug fixes
Mar 27, 2013
3752648
Styling changes according to PEP8
Mar 28, 2013
3285bc8
Fixed PEP8 problems
Mar 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions session_security/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

from django import http
from django.contrib.auth import logout
from django.core.urlresolvers import reverse

from settings import *

Expand Down Expand Up @@ -48,8 +49,17 @@ def update_last_activity(self, request, now):
last_activity = request.session['_session_security']
server_idle_for = (now - last_activity).seconds

if 'idleFor' in request.GET:
client_idle_for = int(request.GET['idleFor'])
if (request.path == reverse('session_security_ping') and
'idleFor' in request.GET):
# Gracefully ignore non-integer values
try:
client_idle_for = int(request.GET['idleFor'])
except ValueError:
return

# Disallow negative values, causes problems with delta calculation
if client_idle_for < 0:
client_idle_for = 0

if client_idle_for < server_idle_for:
# Client has more recent activity than we have in the session
Expand Down