1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
Description: Avoid manipulation of session data via the cache
Corrected an issue which could allow attackers to manipulate session data
using the cache.
Origin: upstream, https://code.djangoproject.com/changeset/16765
Bug: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
--- a/django/contrib/sessions/backends/cached_db.py
+++ b/django/contrib/sessions/backends/cached_db.py
@@ -6,6 +6,8 @@ from django.conf import settings
from django.contrib.sessions.backends.db import SessionStore as DBStore
from django.core.cache import cache
+KEY_PREFIX = "django.contrib.sessions.cached_db"
+
class SessionStore(DBStore):
"""
Implements cached, database backed sessions.
@@ -15,10 +17,11 @@ class SessionStore(DBStore):
super(SessionStore, self).__init__(session_key)
def load(self):
- data = cache.get(self.session_key, None)
+ data = cache.get(KEY_PREFIX + self.session_key, None)
if data is None:
data = super(SessionStore, self).load()
- cache.set(self.session_key, data, settings.SESSION_COOKIE_AGE)
+ cache.set(KEY_PREFIX + self.session_key, data,
+ settings.SESSION_COOKIE_AGE)
return data
def exists(self, session_key):
@@ -26,11 +29,12 @@ class SessionStore(DBStore):
def save(self, must_create=False):
super(SessionStore, self).save(must_create)
- cache.set(self.session_key, self._session, settings.SESSION_COOKIE_AGE)
+ cache.set(KEY_PREFIX + self.session_key, self._session,
+ settings.SESSION_COOKIE_AGE)
def delete(self, session_key=None):
super(SessionStore, self).delete(session_key)
- cache.delete(session_key or self.session_key)
+ cache.delete(KEY_PREFIX + (session_key or self.session_key))
def flush(self):
"""
--- a/django/contrib/sessions/backends/cache.py
+++ b/django/contrib/sessions/backends/cache.py
@@ -1,6 +1,8 @@
from django.contrib.sessions.backends.base import SessionBase, CreateError
from django.core.cache import cache
+KEY_PREFIX = "django.contrib.sessions.cache"
+
class SessionStore(SessionBase):
"""
A cache-based session store.
@@ -10,7 +12,7 @@ class SessionStore(SessionBase):
super(SessionStore, self).__init__(session_key)
def load(self):
- session_data = self._cache.get(self.session_key)
+ session_data = self._cache.get(KEY_PREFIX + self.session_key)
if session_data is not None:
return session_data
self.create()
@@ -37,13 +39,13 @@ class SessionStore(SessionBase):
func = self._cache.add
else:
func = self._cache.set
- result = func(self.session_key, self._get_session(no_load=must_create),
+ result = func(KEY_PREFIX + self.session_key, self._get_session(no_load=must_create),
self.get_expiry_age())
if must_create and not result:
raise CreateError
def exists(self, session_key):
- if self._cache.has_key(session_key):
+ if self._cache.has_key(KEY_PREFIX + session_key):
return True
return False
@@ -52,5 +54,5 @@ class SessionStore(SessionBase):
if self._session_key is None:
return
session_key = self._session_key
- self._cache.delete(session_key)
+ self._cache.delete(KEY_PREFIX + session_key)
|
