mirror of
https://github.com/django/django.git
synced 2024-12-23 09:36:06 +00:00
[1.8.x] Refs #24836 -- Reverted "Simplified the lazy CSRF token implementation in csrf context processor."
This reverts commit 8099d33b65
as it caused
a regression that cannot be solved without changing force_text() which has
a small risk of introducing regressions. This change will remain in master
along with an update to force_text().
This commit is contained in:
parent
1e3741b8a3
commit
b16f84f15b
@ -11,8 +11,9 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.middleware.csrf import get_token
|
||||
from django.utils import six
|
||||
from django.utils.encoding import smart_text
|
||||
from django.utils.functional import SimpleLazyObject, lazy
|
||||
from django.utils.functional import lazy
|
||||
|
||||
|
||||
def csrf(request):
|
||||
@ -29,8 +30,9 @@ def csrf(request):
|
||||
return 'NOTPROVIDED'
|
||||
else:
|
||||
return smart_text(token)
|
||||
_get_val = lazy(_get_val, six.text_type)
|
||||
|
||||
return {'csrf_token': SimpleLazyObject(_get_val)}
|
||||
return {'csrf_token': _get_val()}
|
||||
|
||||
|
||||
def debug(request):
|
||||
|
@ -19,3 +19,6 @@ Bugfixes
|
||||
``Count()`` (:ticket:`24835`).
|
||||
|
||||
* Corrected ``HStoreField.has_changed()`` (:ticket:`24844`).
|
||||
|
||||
* Reverted an optimization to the CSRF template context processor which caused
|
||||
a regression (:ticket:`24836`).
|
||||
|
15
tests/csrf_tests/test_context_processor.py
Normal file
15
tests/csrf_tests/test_context_processor.py
Normal file
@ -0,0 +1,15 @@
|
||||
import json
|
||||
|
||||
from django.http import HttpRequest
|
||||
from django.template.context_processors import csrf
|
||||
from django.test import SimpleTestCase
|
||||
from django.utils.encoding import force_text
|
||||
|
||||
|
||||
class TestContextProcessor(SimpleTestCase):
|
||||
|
||||
def test_force_text_on_token(self):
|
||||
request = HttpRequest()
|
||||
request.META['CSRF_COOKIE'] = 'test-token'
|
||||
token = csrf(request).get('csrf_token')
|
||||
self.assertEqual(json.dumps(force_text(token)), '"test-token"')
|
Loading…
Reference in New Issue
Block a user