Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[4.1.x] Fixed CVE-2022-34265 -- Protected Trunc(kind)/Extract(lookup_…
…name) against SQL injection.

Thanks Takuto Yoshikai (Aeye Security Lab) for the report.
  • Loading branch information
felixxm committed Jul 4, 2022
1 parent 501a3e6 commit 284b188
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 3 deletions.
3 changes: 3 additions & 0 deletions django/db/backends/base/operations.py
Expand Up @@ -9,6 +9,7 @@
from django.db.backends import utils
from django.utils import timezone
from django.utils.encoding import force_str
from django.utils.regex_helper import _lazy_re_compile


class BaseDatabaseOperations:
Expand Down Expand Up @@ -54,6 +55,8 @@ class BaseDatabaseOperations:
# Prefix for EXPLAIN queries, or None EXPLAIN isn't supported.
explain_prefix = None

extract_trunc_lookup_pattern = _lazy_re_compile(r"[\w\-_()]+")

def __init__(self, connection):
self.connection = connection
self._cache = None
Expand Down
4 changes: 4 additions & 0 deletions django/db/models/functions/datetime.py
Expand Up @@ -51,6 +51,8 @@ def __init__(self, expression, lookup_name=None, tzinfo=None, **extra):
super().__init__(expression, **extra)

def as_sql(self, compiler, connection):
if not connection.ops.extract_trunc_lookup_pattern.fullmatch(self.lookup_name):
raise ValueError("Invalid lookup_name: %s" % self.lookup_name)
sql, params = compiler.compile(self.lhs)
lhs_output_field = self.lhs.output_field
if isinstance(lhs_output_field, DateTimeField):
Expand Down Expand Up @@ -235,6 +237,8 @@ def __init__(
super().__init__(expression, output_field=output_field, **extra)

def as_sql(self, compiler, connection):
if not connection.ops.extract_trunc_lookup_pattern.fullmatch(self.kind):
raise ValueError("Invalid kind: %s" % self.kind)
inner_sql, inner_params = compiler.compile(self.lhs)
tzname = None
if isinstance(self.lhs.output_field, DateTimeField):
Expand Down
11 changes: 11 additions & 0 deletions docs/releases/3.2.14.txt
Expand Up @@ -5,3 +5,14 @@ Django 3.2.14 release notes
*July 4, 2022*

Django 3.2.14 fixes a security issue with severity "high" in 3.2.13.

CVE-2022-34265: Potential SQL injection via ``Trunc(kind)`` and ``Extract(lookup_name)`` arguments
==================================================================================================

:class:`Trunc() <django.db.models.functions.Trunc>` and
:class:`Extract() <django.db.models.functions.Extract>` database functions were
subject to SQL injection if untrusted data was used as a
``kind``/``lookup_name`` value.

Applications that constrain the lookup name and kind choice to a known safe
list are unaffected.
12 changes: 9 additions & 3 deletions docs/releases/4.0.6.txt
Expand Up @@ -6,7 +6,13 @@ Django 4.0.6 release notes

Django 4.0.6 fixes a security issue with severity "high" in 4.0.5.

Bugfixes
========
CVE-2022-34265: Potential SQL injection via ``Trunc(kind)`` and ``Extract(lookup_name)`` arguments
==================================================================================================

* ...
:class:`Trunc() <django.db.models.functions.Trunc>` and
:class:`Extract() <django.db.models.functions.Extract>` database functions were
subject to SQL injection if untrusted data was used as a
``kind``/``lookup_name`` value.

Applications that constrain the lookup name and kind choice to a known safe
list are unaffected.
34 changes: 34 additions & 0 deletions tests/db_functions/datetime/test_extract_trunc.py
Expand Up @@ -235,6 +235,23 @@ def test_extract_year_lessthan_lookup(self):
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)
Expand Down Expand Up @@ -915,6 +932,23 @@ def test_extract_second_func_no_fractional(self):
[obj],
)

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(999, 6, 15, 14, 30, 50, 321)
end_datetime = datetime(2016, 6, 15, 14, 10, 50, 123)
Expand Down

0 comments on commit 284b188

Please sign in to comment.