Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-98433: Fix quadratic time idna decoding. #99092

Merged
merged 8 commits into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Lib/encodings/idna.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def nameprep(label):

# Check bidi
RandAL = [stringprep.in_table_d1(x) for x in label]
any_in_table_d2 = any(stringprep.in_table_d2(x) for x in label)
for c in RandAL:
if c:
# There is a RandAL char in the string. Must perform further
Expand All @@ -47,7 +48,7 @@ def nameprep(label):
# This is table C.8, which was already checked
# 2) If a string contains any RandALCat character, the string
# MUST NOT contain any LCat character.
if any(stringprep.in_table_d2(x) for x in label):
if any_in_table_d2:
raise UnicodeError("Violation of BIDI requirement 2")

# 3) If a string contains any RandALCat character, a
Expand Down Expand Up @@ -112,6 +113,11 @@ def ToUnicode(label):
pure_ascii = True
except UnicodeError:
pure_ascii = False
if len(label) > 300:
gpshead marked this conversation as resolved.
Show resolved Hide resolved
# Per DNS, > 63. This leaves room for nameprep() to remove various
# characters while still preventing us from wasting CPU on decoding a
# big thing that'll just hit the actual <= 63 length limit in Step 6.
raise UnicodeError("label way too long")
if not pure_ascii:
# Step 2: Perform nameprep
label = nameprep(label)
Expand Down
5 changes: 5 additions & 0 deletions Lib/test/test_codecs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1552,6 +1552,11 @@ def test_builtin_encode(self):
self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org")
self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.")

def test_builtin_decode_length_limit(self):
with self.assertRaises(UnicodeError) as ctx:
gpshead marked this conversation as resolved.
Show resolved Hide resolved
(b"xn--016c"+b"a"*500).decode("idna")
self.assertIn("label way too long", str(ctx.exception))

def test_stream(self):
r = codecs.getreader("idna")(io.BytesIO(b"abc"))
r.read(3)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The IDNA codec decoder used on DNS hostnames no longer involves a quadratic
algorithm. This prevents a potential CPU denial of service if an out-of-spec
excessive length hostname involving bidirectional characters is decoded.