Changeset 8215 for django/branches/gis/django/contrib/sessions
- Timestamp:
- 08/05/08 12:15:33 (5 months ago)
- Files:
-
- django/branches/gis (modified) (1 prop)
- django/branches/gis/django/contrib/sessions/backends/base.py (modified) (5 diffs)
- django/branches/gis/django/contrib/sessions/backends/cache.py (modified) (1 diff)
- django/branches/gis/django/contrib/sessions/backends/db.py (modified) (1 diff)
- django/branches/gis/django/contrib/sessions/middleware.py (modified) (1 diff)
- django/branches/gis/django/contrib/sessions/models.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/gis
- Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214
django/branches/gis/django/contrib/sessions/backends/base.py
r7768 r8215 1 1 import base64 2 import md53 2 import os 4 3 import random … … 13 12 from django.conf import settings 14 13 from django.core.exceptions import SuspiciousOperation 14 from django.utils.hashcompat import md5_constructor 15 15 16 16 … … 74 74 "Returns the given session dictionary pickled and encoded as a string." 75 75 pickled = pickle.dumps(session_dict, pickle.HIGHEST_PROTOCOL) 76 pickled_md5 = md5 .new(pickled + settings.SECRET_KEY).hexdigest()76 pickled_md5 = md5_constructor(pickled + settings.SECRET_KEY).hexdigest() 77 77 return base64.encodestring(pickled + pickled_md5) 78 78 … … 80 80 encoded_data = base64.decodestring(session_data) 81 81 pickled, tamper_check = encoded_data[:-32], encoded_data[-32:] 82 if md5 .new(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:82 if md5_constructor(pickled + settings.SECRET_KEY).hexdigest() != tamper_check: 83 83 raise SuspiciousOperation("User tampered with session cookie.") 84 84 try: … … 118 118 pid = 1 119 119 while 1: 120 session_key = md5 .new("%s%s%s%s" % (random.randint(0, sys.maxint - 1),121 pid, time.time(), settings.SECRET_KEY)).hexdigest()120 session_key = md5_constructor("%s%s%s%s" % (random.randint(0, sys.maxint - 1), 121 pid, time.time(), settings.SECRET_KEY)).hexdigest() 122 122 if not self.exists(session_key): 123 123 break django/branches/gis/django/contrib/sessions/backends/cache.py
r7768 r8215 1 from django.conf import settings2 1 from django.contrib.sessions.backends.base import SessionBase 3 2 from django.core.cache import cache 4 5 3 6 4 class SessionStore(SessionBase): django/branches/gis/django/contrib/sessions/backends/db.py
r7768 r8215 1 1 import datetime 2 3 from django.conf import settings4 2 from django.contrib.sessions.models import Session 5 3 from django.contrib.sessions.backends.base import SessionBase 6 4 from django.core.exceptions import SuspiciousOperation 7 8 5 9 6 class SessionStore(SessionBase): django/branches/gis/django/contrib/sessions/middleware.py
r7768 r8215 5 5 from django.utils.http import cookie_date 6 6 7 TEST_COOKIE_NAME = 'testcookie'8 TEST_COOKIE_VALUE = 'worked'9 10 11 7 class SessionMiddleware(object): 12 13 8 def process_request(self, request): 14 9 engine = __import__(settings.SESSION_ENGINE, {}, {}, ['']) django/branches/gis/django/contrib/sessions/models.py
r7768 r8215 1 1 import base64 2 import md53 2 import cPickle as pickle 4 3 … … 6 5 from django.utils.translation import ugettext_lazy as _ 7 6 from django.conf import settings 7 from django.utils.hashcompat import md5_constructor 8 8 9 9 … … 14 14 """ 15 15 pickled = pickle.dumps(session_dict) 16 pickled_md5 = md5 .new(pickled + settings.SECRET_KEY).hexdigest()16 pickled_md5 = md5_constructor(pickled + settings.SECRET_KEY).hexdigest() 17 17 return base64.encodestring(pickled + pickled_md5) 18 18 … … 57 57 encoded_data = base64.decodestring(self.session_data) 58 58 pickled, tamper_check = encoded_data[:-32], encoded_data[-32:] 59 if md5 .new(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:59 if md5_constructor(pickled + settings.SECRET_KEY).hexdigest() != tamper_check: 60 60 from django.core.exceptions import SuspiciousOperation 61 61 raise SuspiciousOperation, "User tampered with session cookie."
