mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-19 07:46:27 +00:00
838ca22808
FilteredRelation was subject to SQL injection in column aliases, using a
suitably crafted dictionary, with dictionary expansion, as the **kwargs
passed QuerySet.annotate() or QuerySet.alias().
Reference:
https://nvd.nist.gov/vuln/detail/CVE-2025-57833
Upstream-patch:
31334e6965
Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
89 lines
3.3 KiB
Diff
89 lines
3.3 KiB
Diff
From 61b7449dc4ed51ce1fecd7b5a22b52fbc961c5bf Mon Sep 17 00:00:00 2001
|
|
From: Jake Howard <git@theorangeone.net>
|
|
Date: Wed, 13 Aug 2025 14:13:42 +0200
|
|
Subject: [PATCH 1/2] [4.2.x] Fixed CVE-2025-57833 -- Protected
|
|
FilteredRelation against SQL injection in column aliases.
|
|
|
|
Thanks Eyal Gabay (EyalSec) for the report.
|
|
|
|
Backport of 51711717098d3f469f795dfa6bc3758b24f69ef7 from main.
|
|
|
|
CVE: CVE-2025-57833
|
|
|
|
Upstream-Status: Backport [https://github.com/django/django/commit/31334e6965ad136a5e369993b01721499c5d1a92]
|
|
|
|
Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
|
|
---
|
|
django/db/models/sql/query.py | 1 +
|
|
tests/annotations/tests.py | 24 ++++++++++++++++++++++++
|
|
2 files changed, 25 insertions(+)
|
|
|
|
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
|
|
index fe6baca607a9..6a86a184d8b4 100644
|
|
--- a/django/db/models/sql/query.py
|
|
+++ b/django/db/models/sql/query.py
|
|
@@ -1663,6 +1663,7 @@ class Query(BaseExpression):
|
|
return target_clause, needed_inner
|
|
|
|
def add_filtered_relation(self, filtered_relation, alias):
|
|
+ self.check_alias(alias)
|
|
filtered_relation.alias = alias
|
|
relation_lookup_parts, relation_field_parts, _ = self.solve_lookup_type(
|
|
filtered_relation.relation_name
|
|
diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py
|
|
index f1260b41926b..01fa6958db7b 100644
|
|
--- a/tests/annotations/tests.py
|
|
+++ b/tests/annotations/tests.py
|
|
@@ -12,6 +12,7 @@ from django.db.models import (
|
|
Exists,
|
|
ExpressionWrapper,
|
|
F,
|
|
+ FilteredRelation,
|
|
FloatField,
|
|
Func,
|
|
IntegerField,
|
|
@@ -1132,6 +1133,15 @@ class NonAggregateAnnotationTestCase(TestCase):
|
|
with self.assertRaisesMessage(ValueError, msg):
|
|
Book.objects.annotate(**{crafted_alias: Value(1)})
|
|
|
|
+ def test_alias_filtered_relation_sql_injection(self):
|
|
+ crafted_alias = """injected_name" from "annotations_book"; --"""
|
|
+ msg = (
|
|
+ "Column aliases cannot contain whitespace characters, quotation marks, "
|
|
+ "semicolons, or SQL comments."
|
|
+ )
|
|
+ with self.assertRaisesMessage(ValueError, msg):
|
|
+ Book.objects.annotate(**{crafted_alias: FilteredRelation("author")})
|
|
+
|
|
def test_alias_forbidden_chars(self):
|
|
tests = [
|
|
'al"ias',
|
|
@@ -1157,6 +1167,11 @@ class NonAggregateAnnotationTestCase(TestCase):
|
|
with self.assertRaisesMessage(ValueError, msg):
|
|
Book.objects.annotate(**{crafted_alias: Value(1)})
|
|
|
|
+ with self.assertRaisesMessage(ValueError, msg):
|
|
+ Book.objects.annotate(
|
|
+ **{crafted_alias: FilteredRelation("authors")}
|
|
+ )
|
|
+
|
|
|
|
class AliasTests(TestCase):
|
|
@classmethod
|
|
@@ -1429,3 +1444,12 @@ class AliasTests(TestCase):
|
|
)
|
|
with self.assertRaisesMessage(ValueError, msg):
|
|
Book.objects.alias(**{crafted_alias: Value(1)})
|
|
+
|
|
+ def test_alias_filtered_relation_sql_injection(self):
|
|
+ crafted_alias = """injected_name" from "annotations_book"; --"""
|
|
+ msg = (
|
|
+ "Column aliases cannot contain whitespace characters, quotation marks, "
|
|
+ "semicolons, or SQL comments."
|
|
+ )
|
|
+ with self.assertRaisesMessage(ValueError, msg):
|
|
+ Book.objects.alias(**{crafted_alias: FilteredRelation("authors")})
|
|
--
|
|
2.34.1
|
|
|