summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorJacob Walls <jacobtylerwalls@gmail.com>2025-09-24 15:54:51 -0400
committerNatalia <124304+nessita@users.noreply.github.com>2025-11-05 09:44:22 -0300
commit72d2c87431f2ae0431d65d0ec792047f078c8241 (patch)
treecbbb193c9b1bc625432ea906c893770b689676c7 /django/db
parent3790593781d26168e7306b5b2f8ea0309de16242 (diff)
[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.
Diffstat (limited to 'django/db')
-rw-r--r--django/db/models/query_utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
index 1bf396723e..3584eea7e6 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,