From a9010fe5555e6086a9d9ae50069579400ef0685e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Wed, 22 Jun 2022 12:44:04 +0200 Subject: [3.2.x] Fixed CVE-2022-34265 -- Protected Trunc(kind)/Extract(lookup_name) against SQL injection. Thanks Takuto Yoshikai (Aeye Security Lab) for the report. --- tests/db_functions/datetime/test_extract_trunc.py | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'tests/db_functions/datetime/test_extract_trunc.py') diff --git a/tests/db_functions/datetime/test_extract_trunc.py b/tests/db_functions/datetime/test_extract_trunc.py index 258600127f..27ed3ae63e 100644 --- a/tests/db_functions/datetime/test_extract_trunc.py +++ b/tests/db_functions/datetime/test_extract_trunc.py @@ -177,6 +177,23 @@ class DateFunctionTests(TestCase): self.assertEqual(qs.count(), 1) self.assertGreaterEqual(str(qs.query).lower().count('extract'), 2) + def test_extract_lookup_name_sql_injection(self): + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) + if settings.USE_TZ: + start_datetime = timezone.make_aware(start_datetime) + end_datetime = timezone.make_aware(end_datetime) + self.create_model(start_datetime, end_datetime) + self.create_model(end_datetime, start_datetime) + + msg = "Invalid lookup_name: " + with self.assertRaisesMessage(ValueError, msg): + DTModel.objects.filter( + start_datetime__year=Extract( + "start_datetime", "day' FROM start_datetime)) OR 1=1;--" + ) + ).exists() + def test_extract_func(self): start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) @@ -620,6 +637,23 @@ class DateFunctionTests(TestCase): ) self.assertEqual(DTModel.objects.filter(start_datetime__second=ExtractSecond('start_datetime')).count(), 2) + def test_trunc_lookup_name_sql_injection(self): + start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) + end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) + if settings.USE_TZ: + start_datetime = timezone.make_aware(start_datetime) + end_datetime = timezone.make_aware(end_datetime) + self.create_model(start_datetime, end_datetime) + self.create_model(end_datetime, start_datetime) + msg = "Invalid kind: " + with self.assertRaisesMessage(ValueError, msg): + DTModel.objects.filter( + start_datetime__date=Trunc( + "start_datetime", + "year', start_datetime)) OR 1=1;--", + ) + ).exists() + def test_trunc_func(self): start_datetime = datetime(2015, 6, 15, 14, 30, 50, 321) end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123) -- cgit v1.3