mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
[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.
This commit is contained in:
@@ -9,6 +9,7 @@ from django.db import NotSupportedError, transaction
|
||||
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:
|
||||
@@ -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
|
||||
|
||||
@@ -51,6 +51,8 @@ class Extract(TimezoneMixin, Transform):
|
||||
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):
|
||||
@@ -235,6 +237,8 @@ class TruncBase(TimezoneMixin, Transform):
|
||||
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):
|
||||
|
||||
Reference in New Issue
Block a user