2 files changed, 85 insertions, 0 deletions

diff --git a/meta-python/recipes-devtools/python/python3-django/CVE-2024-42005.patch b/meta-python/recipes-devtools/python/python3-django/CVE-2024-42005.patch
new file mode 100644
index 0000000000..e6b58fca79
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django/CVE-2024-42005.patch
@@ -0,0 +1,84 @@
+From f4af67b9b41e0f4c117a8741da3abbd1c869ab28 Mon Sep 17 00:00:00 2001
+From: Simon Charette <charette.s@gmail.com>
+Date: Thu, 25 Jul 2024 18:19:13 +0200
+Subject: [PATCH] Fixed CVE-2024-42005 -- Mitigated QuerySet.values()  SQL
+ injection attacks against JSON fields.
+
+Thanks Eyal (eyalgabay) for the report.
+
+CVE: CVE-2024-42005
+
+Upstream-Status: Backport [https://github.com/django/django/commit/f4af67b9b41e0f4c117a8741da3abbd1c869ab28]
+
+Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
+---
+ django/db/models/sql/query.py             |  2 ++
+ tests/expressions/models.py               |  7 +++++++
+ tests/expressions/test_queryset_values.py | 17 +++++++++++++++--
+ 3 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
+index 1e823cf..9b054bd 100644
+--- a/django/db/models/sql/query.py
++++ b/django/db/models/sql/query.py
+@@ -2019,6 +2019,8 @@ class Query:
+             self.clear_select_fields()
+
+         if fields:
++            for field in fields:
++                self.check_alias(field)
+             field_names = []
+             extra_names = []
+             annotation_names = []
+diff --git a/tests/expressions/models.py b/tests/expressions/models.py
+index 33f7850..fb80938 100644
+--- a/tests/expressions/models.py
++++ b/tests/expressions/models.py
+@@ -97,3 +97,10 @@ class UUID(models.Model):
+
+     def __str__(self):
+         return "%s" % self.uuid
++
++
++class JSONFieldModel(models.Model):
++    data = models.JSONField(null=True)
++
++    class Meta:
++        required_db_features = {"supports_json_field"}
+diff --git a/tests/expressions/test_queryset_values.py b/tests/expressions/test_queryset_values.py
+index 0804531..bd52b8e 100644
+--- a/tests/expressions/test_queryset_values.py
++++ b/tests/expressions/test_queryset_values.py
+@@ -1,8 +1,8 @@
+ from django.db.models.aggregates import Sum
+ from django.db.models.expressions import F
+-from django.test import TestCase
++from django.test import TestCase, skipUnlessDBFeature
+
+-from .models import Company, Employee
++from .models import Company, Employee, JSONFieldModel
+
+
+ class ValuesExpressionsTests(TestCase):
+@@ -36,6 +36,19 @@ class ValuesExpressionsTests(TestCase):
+         with self.assertRaisesMessage(ValueError, msg):
+             Company.objects.values(**{crafted_alias: F("ceo__salary")})
+
++    @skipUnlessDBFeature("supports_json_field")
++    def test_values_expression_alias_sql_injection_json_field(self):
++        crafted_alias = """injected_name" from "expressions_company"; --"""
++        msg = (
++            "Column aliases cannot contain whitespace characters, quotation marks, "
++            "semicolons, or SQL comments."
++        )
++        with self.assertRaisesMessage(ValueError, msg):
++            JSONFieldModel.objects.values(f"data__{crafted_alias}")
++
++        with self.assertRaisesMessage(ValueError, msg):
++            JSONFieldModel.objects.values_list(f"data__{crafted_alias}")
++
+     def test_values_expression_group_by(self):
+         # values() applies annotate() first, so values selected are grouped by
+         # id, not firstname.
+--
+2.40.0
diff --git a/meta-python/recipes-devtools/python/python3-django_2.2.28.bb b/meta-python/recipes-devtools/python/python3-django_2.2.28.bb
index cbd2c69c05..7f5861f5d3 100644
--- a/meta-python/recipes-devtools/python/python3-django_2.2.28.bb
+++ b/meta-python/recipes-devtools/python/python3-django_2.2.28.bb
@@ -11,6 +11,7 @@ SRC_URI += "file://CVE-2023-31047.patch \
             file://CVE-2023-43665.patch \
             file://CVE-2023-46695.patch \
             file://CVE-2024-24680.patch \
+            file://CVE-2024-42005.patch \
            "
 
 SRC_URI[sha256sum] = "0200b657afbf1bc08003845ddda053c7641b9b24951e52acd51f6abda33a7413"