mirror of
https://github.com/django/django.git
synced 2025-08-04 10:59:45 +00:00
Refs #32800 -- Removed CSRF_COOKIE_MASKED transitional setting per deprecation timeline.
This commit is contained in:
parent
daf88e778b
commit
e01970e9d2
8 changed files with 9 additions and 103 deletions
|
@ -23,8 +23,6 @@ from django.middleware.csrf import (
|
|||
rotate_token,
|
||||
)
|
||||
from django.test import SimpleTestCase, override_settings
|
||||
from django.test.utils import ignore_warnings
|
||||
from django.utils.deprecation import RemovedInDjango50Warning
|
||||
from django.views.decorators.csrf import csrf_exempt, requires_csrf_token
|
||||
|
||||
from .views import (
|
||||
|
@ -1494,31 +1492,3 @@ class CsrfInErrorHandlingViewsTests(CsrfFunctionTestMixin, SimpleTestCase):
|
|||
token2 = response.content.decode("ascii")
|
||||
secret2 = _unmask_cipher_token(token2)
|
||||
self.assertMaskedSecretCorrect(token1, secret2)
|
||||
|
||||
|
||||
@ignore_warnings(category=RemovedInDjango50Warning)
|
||||
class CsrfCookieMaskedTests(CsrfFunctionTestMixin, SimpleTestCase):
|
||||
@override_settings(CSRF_COOKIE_MASKED=True)
|
||||
def test_get_token_csrf_cookie_not_set(self):
|
||||
request = HttpRequest()
|
||||
self.assertNotIn("CSRF_COOKIE", request.META)
|
||||
self.assertNotIn("CSRF_COOKIE_NEEDS_UPDATE", request.META)
|
||||
token = get_token(request)
|
||||
cookie = request.META["CSRF_COOKIE"]
|
||||
self.assertEqual(len(cookie), CSRF_TOKEN_LENGTH)
|
||||
unmasked_cookie = _unmask_cipher_token(cookie)
|
||||
self.assertMaskedSecretCorrect(token, unmasked_cookie)
|
||||
self.assertIs(request.META["CSRF_COOKIE_NEEDS_UPDATE"], True)
|
||||
|
||||
@override_settings(CSRF_COOKIE_MASKED=True)
|
||||
def test_rotate_token(self):
|
||||
request = HttpRequest()
|
||||
request.META["CSRF_COOKIE"] = MASKED_TEST_SECRET1
|
||||
self.assertNotIn("CSRF_COOKIE_NEEDS_UPDATE", request.META)
|
||||
rotate_token(request)
|
||||
# The underlying secret was changed.
|
||||
cookie = request.META["CSRF_COOKIE"]
|
||||
self.assertEqual(len(cookie), CSRF_TOKEN_LENGTH)
|
||||
unmasked_cookie = _unmask_cipher_token(cookie)
|
||||
self.assertNotEqual(unmasked_cookie, TEST_SECRET)
|
||||
self.assertIs(request.META["CSRF_COOKIE_NEEDS_UPDATE"], True)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue