mirror of
https://github.com/django/django.git
synced 2026-02-09 02:49:25 +08:00
[5.1.x] Refs CVE-2025-64459 -- Avoided propagating invalid arguments to Q on dictionary expansion.
Backport of 3c3f463577 from main.
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -4503,6 +4503,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):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user