summaryrefslogtreecommitdiff
path: root/tests/template_backends
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2021-08-17 16:43:17 -0400
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-11-16 11:21:30 +0100
commit3f0025c18a08535ed39a64c24174f7e2d75b7b9e (patch)
tree12898ace1abd688fae6885aad3bf22d1c16e8637 /tests/template_backends
parent0820175d812e94850bc97a024c6cd7c29a94a10c (diff)
downloaddjango-3f0025c18a08535ed39a64c24174f7e2d75b7b9e.tar.gz
Refs #32800 -- Avoided use of _does_token_match() in some CSRF tests.
Diffstat (limited to 'tests/template_backends')
-rw-r--r--tests/template_backends/test_dummy.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/template_backends/test_dummy.py b/tests/template_backends/test_dummy.py
index e945c23a78..8c8cef68ce 100644
--- a/tests/template_backends/test_dummy.py
+++ b/tests/template_backends/test_dummy.py
@@ -3,7 +3,7 @@ import re
from django.forms import CharField, Form, Media
from django.http import HttpRequest, HttpResponse
from django.middleware.csrf import (
- CsrfViewMiddleware, _does_token_match as equivalent_tokens, get_token,
+ CSRF_TOKEN_LENGTH, CsrfViewMiddleware, _unmask_cipher_token, get_token,
)
from django.template import TemplateDoesNotExist, TemplateSyntaxError
from django.template.backends.dummy import TemplateStrings
@@ -74,6 +74,12 @@ class TemplateStringsTests(SimpleTestCase):
self.assertHTMLEqual(content, expected)
+ def check_tokens_equivalent(self, token1, token2):
+ self.assertEqual(len(token1), CSRF_TOKEN_LENGTH)
+ self.assertEqual(len(token2), CSRF_TOKEN_LENGTH)
+ token1, token2 = map(_unmask_cipher_token, (token1, token2))
+ self.assertEqual(token1, token2)
+
def test_csrf_token(self):
request = HttpRequest()
CsrfViewMiddleware(lambda req: HttpResponse()).process_view(request, lambda r: None, (), {})
@@ -84,7 +90,7 @@ class TemplateStringsTests(SimpleTestCase):
expected = '<input type="hidden" name="csrfmiddlewaretoken" value="([^"]+)">'
match = re.match(expected, content) or re.match(expected.replace('"', "'"), content)
self.assertTrue(match, "hidden csrftoken field not found in output")
- self.assertTrue(equivalent_tokens(match[1], get_token(request)))
+ self.check_tokens_equivalent(match[1], get_token(request))
def test_no_directory_traversal(self):
with self.assertRaises(TemplateDoesNotExist):