mirror of
https://github.com/django/django.git
synced 2024-12-22 17:16:24 +00:00
Fixed #28066 -- Prevented SessionBase.cycle_key() from discarding data.
This commit is contained in:
parent
c09bf8d767
commit
dda596ca32
@ -295,10 +295,7 @@ class SessionBase:
|
|||||||
"""
|
"""
|
||||||
Create a new session key, while retaining the current session data.
|
Create a new session key, while retaining the current session data.
|
||||||
"""
|
"""
|
||||||
try:
|
data = self._session
|
||||||
data = self._session_cache
|
|
||||||
except AttributeError:
|
|
||||||
data = {}
|
|
||||||
key = self.session_key
|
key = self.session_key
|
||||||
self.create()
|
self.create()
|
||||||
self._session_cache = data
|
self._session_cache = data
|
||||||
|
@ -71,9 +71,8 @@ class SessionStore(SessionBase):
|
|||||||
Instead of generating a random string, generate a secure url-safe
|
Instead of generating a random string, generate a secure url-safe
|
||||||
base64-encoded string of data as our session key.
|
base64-encoded string of data as our session key.
|
||||||
"""
|
"""
|
||||||
session_cache = getattr(self, '_session_cache', {})
|
|
||||||
return signing.dumps(
|
return signing.dumps(
|
||||||
session_cache, compress=True,
|
self._session, compress=True,
|
||||||
salt='django.contrib.sessions.backends.signed_cookies',
|
salt='django.contrib.sessions.backends.signed_cookies',
|
||||||
serializer=self.serializer,
|
serializer=self.serializer,
|
||||||
)
|
)
|
||||||
|
@ -27,3 +27,6 @@ Bugfixes
|
|||||||
|
|
||||||
* Restored ``BoundField``\s without any ``choices`` evaluating to ``True``
|
* Restored ``BoundField``\s without any ``choices`` evaluating to ``True``
|
||||||
(:ticket:`28058`).
|
(:ticket:`28058`).
|
||||||
|
|
||||||
|
* Prevented ``SessionBase.cycle_key()`` from losing session data if
|
||||||
|
``_session_cache`` isn't populated (:ticket:`28066`).
|
||||||
|
@ -178,8 +178,13 @@ class SessionTestsMixin:
|
|||||||
self.assertEqual(list(self.session.items()), prev_data)
|
self.assertEqual(list(self.session.items()), prev_data)
|
||||||
|
|
||||||
def test_cycle_with_no_session_cache(self):
|
def test_cycle_with_no_session_cache(self):
|
||||||
|
self.session['a'], self.session['b'] = 'c', 'd'
|
||||||
|
self.session.save()
|
||||||
|
prev_data = list(self.session.items())
|
||||||
|
self.session = self.backend(self.session.session_key)
|
||||||
self.assertFalse(hasattr(self.session, '_session_cache'))
|
self.assertFalse(hasattr(self.session, '_session_cache'))
|
||||||
self.session.cycle_key()
|
self.session.cycle_key()
|
||||||
|
self.assertEqual(list(self.session.items()), prev_data)
|
||||||
|
|
||||||
def test_save_doesnt_clear_data(self):
|
def test_save_doesnt_clear_data(self):
|
||||||
self.session['a'] = 'b'
|
self.session['a'] = 'b'
|
||||||
|
Loading…
Reference in New Issue
Block a user