diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-01-12 12:47:42 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-01-17 11:49:15 +0100 |
| commit | e01970e9d23a241473671ea26126f8440db4dead (patch) | |
| tree | b3d902755864abb350ff7e3e61c443bf48e15b96 /tests | |
| parent | daf88e778bd39d908dca9efc3571d37adbd2ff4a (diff) | |
Refs #32800 -- Removed CSRF_COOKIE_MASKED transitional setting per deprecation timeline.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/csrf_tests/tests.py | 30 | ||||
| -rw-r--r-- | tests/deprecation/test_csrf_cookie_masked.py | 30 |
2 files changed, 0 insertions, 60 deletions
diff --git a/tests/csrf_tests/tests.py b/tests/csrf_tests/tests.py index 6db67c9190..3abd70ee0d 100644 --- a/tests/csrf_tests/tests.py +++ b/tests/csrf_tests/tests.py @@ -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) diff --git a/tests/deprecation/test_csrf_cookie_masked.py b/tests/deprecation/test_csrf_cookie_masked.py deleted file mode 100644 index d06feb9e47..0000000000 --- a/tests/deprecation/test_csrf_cookie_masked.py +++ /dev/null @@ -1,30 +0,0 @@ -import sys -from types import ModuleType - -from django.conf import CSRF_COOKIE_MASKED_DEPRECATED_MSG, Settings, settings -from django.test import SimpleTestCase -from django.utils.deprecation import RemovedInDjango50Warning - - -class CsrfCookieMaskedDeprecationTests(SimpleTestCase): - msg = CSRF_COOKIE_MASKED_DEPRECATED_MSG - - def test_override_settings_warning(self): - with self.assertRaisesMessage(RemovedInDjango50Warning, self.msg): - with self.settings(CSRF_COOKIE_MASKED=True): - pass - - def test_settings_init_warning(self): - settings_module = ModuleType("fake_settings_module") - settings_module.USE_TZ = False - settings_module.CSRF_COOKIE_MASKED = True - sys.modules["fake_settings_module"] = settings_module - try: - with self.assertRaisesMessage(RemovedInDjango50Warning, self.msg): - Settings("fake_settings_module") - finally: - del sys.modules["fake_settings_module"] - - def test_access(self): - # Warning is not raised on access. - self.assertEqual(settings.CSRF_COOKIE_MASKED, False) |
