Skip to content

Commit

Permalink
[3.2.x] Fixed CVE-2023-41164 -- Fixed potential DoS in django.utils.e…
Browse files Browse the repository at this point in the history
…ncoding.uri_to_iri().

Thanks MProgrammer (https://hackerone.com/mprogrammer) for the report.

Co-authored-by: nessita <124304+nessita@users.noreply.github.com>
  • Loading branch information
felixxm and nessita committed Sep 4, 2023
1 parent 73350a6 commit 6f030b1
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 4 deletions.
6 changes: 4 additions & 2 deletions django/utils/encoding.py
Expand Up @@ -229,16 +229,18 @@ 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()
except UnicodeDecodeError as e:
# 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):
Expand Down
7 changes: 6 additions & 1 deletion docs/releases/3.2.21.txt
Expand Up @@ -6,4 +6,9 @@ Django 3.2.21 release notes

Django 3.2.21 fixes a security issue with severity "moderate" in 3.2.20.

...
CVE-2023-41164: Potential denial of service vulnerability in ``django.utils.encoding.uri_to_iri()``
===================================================================================================

``django.utils.encoding.uri_to_iri()`` was subject to potential denial of
service attack via certain inputs with a very large number of Unicode
characters.
21 changes: 20 additions & 1 deletion tests/utils_tests/test_encoding.py
@@ -1,9 +1,10 @@
import datetime
import inspect
import sys
import unittest
from pathlib import Path
from unittest import mock
from urllib.parse import quote_plus
from urllib.parse import quote, quote_plus

from django.test import SimpleTestCase
from django.utils.encoding import (
Expand Down Expand Up @@ -101,6 +102,24 @@ def test_repercent_broken_unicode_recursion_error(self):
except RecursionError:
self.fail('Unexpected RecursionError raised.')

def test_repercent_broken_unicode_small_fragments(self):
data = b"test\xfctest\xfctest\xfc"
decoded_paths = []

def mock_quote(*args, **kwargs):
# The second frame is the call to repercent_broken_unicode().
decoded_paths.append(inspect.currentframe().f_back.f_locals["path"])
return quote(*args, **kwargs)

with mock.patch("django.utils.encoding.quote", mock_quote):
self.assertEqual(repercent_broken_unicode(data), b"test%FCtest%FCtest%FC")

# decode() is called on smaller fragment of the path each time.
self.assertEqual(
decoded_paths,
[b"test\xfctest\xfctest\xfc", b"test\xfctest\xfc", b"test\xfc"],
)


class TestRFC3987IEncodingUtils(unittest.TestCase):

Expand Down

0 comments on commit 6f030b1

Please sign in to comment.