summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2023-08-22 08:53:03 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-09-04 11:58:37 +0200
commit3f41d6d62929dfe53eda8109b3b836f26645bdce (patch)
treea221032a51e25559ef8266a861fc8a8447078a78 /django/utils
parent048d75aeb1e2b1c08b1b9ec359397f00aec1b57d (diff)
Fixed CVE-2023-41164 -- Fixed potential DoS in django.utils.encoding.uri_to_iri().
Thanks MProgrammer (https://hackerone.com/mprogrammer) for the report. Co-authored-by: nessita <124304+nessita@users.noreply.github.com>
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/encoding.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 5b618e74a3..5986993759 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -220,6 +220,7 @@ def repercent_broken_unicode(path):
repercent-encode any octet produced that is not part of a strictly legal
UTF-8 octet sequence.
"""
+ changed_parts = []
while True:
try:
path.decode()
@@ -227,9 +228,10 @@ def repercent_broken_unicode(path):
# CVE-2019-14235: A recursion shouldn't be used since the exception
# handling uses massive amounts of memory
repercent = quote(path[e.start : e.end], safe=b"/#%[]=:;$&()+,!?*@'~")
- path = path[: e.start] + repercent.encode() + path[e.end :]
+ changed_parts.append(path[: e.start] + repercent.encode())
+ path = path[e.end :]
else:
- return path
+ return b"".join(changed_parts) + path
def filepath_to_uri(path):