2 files changed, 120 insertions, 0 deletions

diff --git a/meta-python/recipes-devtools/python/python3-django-5.0.14/CVE-2025-64459-1.patch b/meta-python/recipes-devtools/python/python3-django-5.0.14/CVE-2025-64459-1.patch
new file mode 100644
index 0000000000..6c42adfa42
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django-5.0.14/CVE-2025-64459-1.patch
@@ -0,0 +1,57 @@
+From 45f5d17986f70f0aaf4a666b2d71ae6750beeb88 Mon Sep 17 00:00:00 2001
+From: Jacob Walls <jacobtylerwalls@gmail.com>
+Date: Wed, 24 Sep 2025 15:54:51 -0400
+Subject: [PATCH] [5.1.x] Fixed CVE-2025-64459 -- Prevented SQL injections
+ in Q/QuerySet via the _connector kwarg.
+
+Thanks cyberstan for the report, Sarah Boyce, Adam Johnson, Simon
+Charette, and Jake Howard for the reviews.
+
+Backport of c880530ddd4fabd5939bab0e148bebe36699432a from main.
+
+CVE: CVE-2025-64459
+
+Upstream-Status: Backport [https://github.com/django/django/commit/72d2c87431f2ae0431d65d0ec792047f078c8241]
+
+Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
+---
+ django/db/models/query_utils.py | 4 ++++
+ tests/queries/test_q.py         | 5 +++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
+index a04bbad5e7f8..d8610bc54d46 100644
+--- a/django/db/models/query_utils.py
++++ b/django/db/models/query_utils.py
+@@ -47,8 +47,12 @@ class Q(tree.Node):
+     XOR = "XOR"
+     default = AND
+     conditional = True
++    connectors = (None, AND, OR, XOR)
+ 
+     def __init__(self, *args, _connector=None, _negated=False, **kwargs):
++        if _connector not in self.connectors:
++            connector_reprs = ", ".join(f"{conn!r}" for conn in self.connectors[1:])
++            raise ValueError(f"_connector must be one of {connector_reprs}, or None.")
+         super().__init__(
+             children=[*args, *sorted(kwargs.items())],
+             connector=_connector,
+diff --git a/tests/queries/test_q.py b/tests/queries/test_q.py
+index f7192a430a12..b21ec929a2ec 100644
+--- a/tests/queries/test_q.py
++++ b/tests/queries/test_q.py
+@@ -264,6 +264,11 @@ class QTests(SimpleTestCase):
+                     Q(*items, _connector=connector),
+                 )
+ 
++    def test_connector_validation(self):
++        msg = f"_connector must be one of {Q.AND!r}, {Q.OR!r}, {Q.XOR!r}, or None."
++        with self.assertRaisesMessage(ValueError, msg):
++            Q(_connector="evil")
++
+     def test_referenced_base_fields(self):
+         # Make sure Q.referenced_base_fields retrieves all base fields from
+         # both filters and F expressions.
+-- 
+2.34.1
+
diff --git a/meta-python/recipes-devtools/python/python3-django-5.0.14/CVE-2025-64459-2.patch b/meta-python/recipes-devtools/python/python3-django-5.0.14/CVE-2025-64459-2.patch
new file mode 100644
index 0000000000..5a207f8f11
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django-5.0.14/CVE-2025-64459-2.patch
@@ -0,0 +1,63 @@
+From 415912be531179e90e69f0be2e8bca301de53765 Mon Sep 17 00:00:00 2001
+From: Jacob Walls <jacobtylerwalls@gmail.com>
+Date: Wed, 24 Sep 2025 15:56:03 -0400
+Subject: [PATCH] [5.1.x] Refs CVE-2025-64459 -- Avoided propagating
+ invalid arguments to Q on dictionary expansion.
+
+Backport of 3c3f46357718166069948625354b8315a8505262 from main.
+
+CVE: CVE-2025-64459
+
+Upstream-Status: Backport [https://github.com/django/django/commit/4624ed769c0f7caea0d48ac824a75fa6b6f17671]
+
+Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
+---
+ django/db/models/query.py | 5 +++++
+ tests/queries/tests.py    | 8 ++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/django/db/models/query.py b/django/db/models/query.py
+index 153fb1193ebf..3308cd48db00 100644
+--- a/django/db/models/query.py
++++ b/django/db/models/query.py
+@@ -42,6 +42,8 @@ MAX_GET_RESULTS = 21
+ # The maximum number of items to display in a QuerySet.__repr__
+ REPR_OUTPUT_SIZE = 20
+ 
++PROHIBITED_FILTER_KWARGS = frozenset(["_connector", "_negated"])
++
+ 
+ class BaseIterable:
+     def __init__(
+@@ -1495,6 +1497,9 @@ class QuerySet(AltersData):
+         return clone
+ 
+     def _filter_or_exclude_inplace(self, negate, args, kwargs):
++        if invalid_kwargs := PROHIBITED_FILTER_KWARGS.intersection(kwargs):
++            invalid_kwargs_str = ", ".join(f"'{k}'" for k in sorted(invalid_kwargs))
++            raise TypeError(f"The following kwargs are invalid: {invalid_kwargs_str}")
+         if negate:
+             self._query.add_q(~Q(*args, **kwargs))
+         else:
+diff --git a/tests/queries/tests.py b/tests/queries/tests.py
+index 20665ab2cda3..5df231949194 100644
+--- a/tests/queries/tests.py
++++ b/tests/queries/tests.py
+@@ -4481,6 +4481,14 @@ class TestInvalidValuesRelation(SimpleTestCase):
+             Annotation.objects.filter(tag__in=[123, "abc"])
+ 
+ 
++class TestInvalidFilterArguments(TestCase):
++    def test_filter_rejects_invalid_arguments(self):
++        school = School.objects.create()
++        msg = "The following kwargs are invalid: '_connector', '_negated'"
++        with self.assertRaisesMessage(TypeError, msg):
++            School.objects.filter(pk=school.pk, _negated=True, _connector="evil")
++
++
+ class TestTicket24605(TestCase):
+     def test_ticket_24605(self):
+         """
+-- 
+2.34.1
+