From 3f0025c18a08535ed39a64c24174f7e2d75b7b9e Mon Sep 17 00:00:00 2001 From: Chris Jerdonek Date: Tue, 17 Aug 2021 16:43:17 -0400 Subject: Refs #32800 -- Avoided use of _does_token_match() in some CSRF tests. --- tests/template_backends/test_dummy.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tests/template_backends') 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 = '' 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): -- cgit v1.3