Fixed #2133 -- Invalid session cookie no longer causes fatal error. Thanks, greg-django@abbas.org
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
81c839014d
commit
9d94355885
|
@ -1,5 +1,6 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.sessions.models import Session
|
from django.contrib.sessions.models import Session
|
||||||
|
from django.core.exceptions import SuspiciousOperation
|
||||||
from django.utils.cache import patch_vary_headers
|
from django.utils.cache import patch_vary_headers
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
|
@ -55,7 +56,7 @@ class SessionWrapper(object):
|
||||||
s = Session.objects.get(session_key=self.session_key,
|
s = Session.objects.get(session_key=self.session_key,
|
||||||
expire_date__gt=datetime.datetime.now())
|
expire_date__gt=datetime.datetime.now())
|
||||||
self._session_cache = s.get_decoded()
|
self._session_cache = s.get_decoded()
|
||||||
except Session.DoesNotExist:
|
except (Session.DoesNotExist, SuspiciousOperation):
|
||||||
self._session_cache = {}
|
self._session_cache = {}
|
||||||
# Set the session_key to None to force creation of a new
|
# Set the session_key to None to force creation of a new
|
||||||
# key, for extra security.
|
# key, for extra security.
|
||||||
|
|
Loading…
Reference in New Issue