summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pope <nick@nickpope.me.uk>2023-01-25 12:21:48 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-02-01 09:47:17 +0100
commit4452642f193533e288a52c02efb5bbc766a68f95 (patch)
tree5c24d90c44acb39d231610d3a9421d3ff886fecc
parentb880e20876fec670e11db8b42f754fbbbfd8055c (diff)
downloaddjango-4452642f193533e288a52c02efb5bbc766a68f95.tar.gz
[4.0.x] Fixed CVE-2023-23969 -- Prevented DoS with pathological values for Accept-Language.
The parsed values of Accept-Language headers are cached in order to avoid repetitive parsing. This leads to a potential denial-of-service vector via excessive memory usage if the raw value of Accept-Language headers is very large. Accept-Language headers are now limited to a maximum length in order to avoid this issue.
-rw-r--r--django/utils/translation/trans_real.py31
-rw-r--r--docs/releases/3.2.17.txt10
-rw-r--r--docs/releases/4.0.9.txt10
-rw-r--r--tests/i18n/tests.py13
4 files changed, 61 insertions, 3 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 517118a258..32080c7154 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -30,6 +30,11 @@ _default = None
# magic gettext number to separate context from message
CONTEXT_SEPARATOR = "\x04"
+# Maximum number of characters that will be parsed from the Accept-Language
+# header to prevent possible denial of service or memory exhaustion attacks.
+# About 10x longer than the longest value shown on MDN’s Accept-Language page.
+ACCEPT_LANGUAGE_HEADER_MAX_LENGTH = 500
+
# Format of Accept-Language header values. From RFC 2616, section 14.4 and 3.9
# and RFC 3066, section 2.1
accept_language_re = _lazy_re_compile(
@@ -585,7 +590,7 @@ def get_language_from_request(request, check_path=False):
@functools.lru_cache(maxsize=1000)
-def parse_accept_lang_header(lang_string):
+def _parse_accept_lang_header(lang_string):
"""
Parse the lang_string, which is the body of an HTTP Accept-Language
header, and return a tuple of (lang, q-value), ordered by 'q' values.
@@ -607,3 +612,27 @@ def parse_accept_lang_header(lang_string):
result.append((lang, priority))
result.sort(key=lambda k: k[1], reverse=True)
return tuple(result)
+
+
+def parse_accept_lang_header(lang_string):
+ """
+ Parse the value of the Accept-Language header up to a maximum length.
+
+ The value of the header is truncated to a maximum length to avoid potential
+ denial of service and memory exhaustion attacks. Excessive memory could be
+ used if the raw value is very large as it would be cached due to the use of
+ functools.lru_cache() to avoid repetitive parsing of common header values.
+ """
+ # If the header value doesn't exceed the maximum allowed length, parse it.
+ if len(lang_string) <= ACCEPT_LANGUAGE_HEADER_MAX_LENGTH:
+ return _parse_accept_lang_header(lang_string)
+
+ # If there is at least one comma in the value, parse up to the last comma
+ # before the max length, skipping any truncated parts at the end of the
+ # header value.
+ if (index := lang_string.rfind(",", 0, ACCEPT_LANGUAGE_HEADER_MAX_LENGTH)) > 0:
+ return _parse_accept_lang_header(lang_string[:index])
+
+ # Don't attempt to parse if there is only one language-range value which is
+ # longer than the maximum allowed length and so truncated.
+ return ()
diff --git a/docs/releases/3.2.17.txt b/docs/releases/3.2.17.txt
index 9eba24d72f..fcc097c5cc 100644
--- a/docs/releases/3.2.17.txt
+++ b/docs/releases/3.2.17.txt
@@ -6,4 +6,12 @@ Django 3.2.17 release notes
Django 3.2.17 fixes a security issue with severity "moderate" in 3.2.16.
-...
+CVE-2023-23969: Potential denial-of-service via ``Accept-Language`` headers
+===========================================================================
+
+The parsed values of ``Accept-Language`` headers are cached in order to avoid
+repetitive parsing. This leads to a potential denial-of-service vector via
+excessive memory usage if large header values are sent.
+
+In order to avoid this vulnerability, the ``Accept-Language`` header is now
+parsed up to a maximum length.
diff --git a/docs/releases/4.0.9.txt b/docs/releases/4.0.9.txt
index f05b043c34..d13f3a2cf6 100644
--- a/docs/releases/4.0.9.txt
+++ b/docs/releases/4.0.9.txt
@@ -6,4 +6,12 @@ Django 4.0.9 release notes
Django 4.0.9 fixes a security issue with severity "moderate" in 4.0.8.
-...
+CVE-2023-23969: Potential denial-of-service via ``Accept-Language`` headers
+===========================================================================
+
+The parsed values of ``Accept-Language`` headers are cached in order to avoid
+repetitive parsing. This leads to a potential denial-of-service vector via
+excessive memory usage if large header values are sent.
+
+In order to avoid this vulnerability, the ``Accept-Language`` header is now
+parsed up to a maximum length.
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 90c6eed286..896e8ebd21 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -1728,6 +1728,14 @@ class MiscTests(SimpleTestCase):
("de;q=0.", [("de", 0.0)]),
("en; q=1,", [("en", 1.0)]),
("en; q=1.0, * ; q=0.5", [("en", 1.0), ("*", 0.5)]),
+ (
+ "en" + "-x" * 20,
+ [("en-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1.0)],
+ ),
+ (
+ ", ".join(["en; q=1.0"] * 20),
+ [("en", 1.0)] * 20,
+ ),
# Bad headers
("en-gb;q=1.0000", []),
("en;q=0.1234", []),
@@ -1743,6 +1751,11 @@ class MiscTests(SimpleTestCase):
("12-345", []),
("", []),
("en;q=1e0", []),
+ ("en-au;q=1.0", []),
+ # Invalid as language-range value too long.
+ ("xxxxxxxx" + "-xxxxxxxx" * 500, []),
+ # Header value too long, only parse up to limit.
+ (", ".join(["en; q=1.0"] * 500), [("en", 1.0)] * 45),
]
for value, expected in tests:
with self.subTest(value=value):