Skip to content

Commit

Permalink
pythongh-63283: IDNA prefix should be case insensitive (pythonGH-17726)
Browse files Browse the repository at this point in the history
Any capitalization of "xn--" should be acceptable for the ACE prefix
(see https://tools.ietf.org/html/rfc3490#section-5).

Co-authored-by: Pepijn de Vos <pepijndevos@gmail.com>
Co-authored-by: Erlend E. Aasland <erlend@python.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
  • Loading branch information
4 people authored and diegorusso committed Apr 17, 2024
1 parent 552272b commit b5445be
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Lib/encodings/idna.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def ToASCII(label):
raise UnicodeError("label empty or too long")

# Step 5: Check ACE prefix
if label.startswith(sace_prefix):
if label[:4].lower() == sace_prefix:
raise UnicodeError("Label starts with ACE prefix")

# Step 6: Encode with PUNYCODE
Expand Down Expand Up @@ -129,7 +129,7 @@ def ToUnicode(label):
except UnicodeError:
raise UnicodeError("Invalid character in IDN label")
# Step 3: Check for ACE prefix
if not label.startswith(ace_prefix):
if not label[:4].lower() == ace_prefix:
return str(label, "ascii")

# Step 4: Remove ACE prefix
Expand Down Expand Up @@ -202,7 +202,7 @@ def decode(self, input, errors='strict'):
# XXX obviously wrong, see #3232
input = bytes(input)

if ace_prefix not in input:
if ace_prefix not in input.lower():
# Fast path
try:
return input.decode('ascii'), len(input)
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_codecs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1547,6 +1547,13 @@ def test_builtin_decode(self):
self.assertEqual(str(b"python.org.", "idna"), "python.org.")
self.assertEqual(str(b"xn--pythn-mua.org", "idna"), "pyth\xf6n.org")
self.assertEqual(str(b"xn--pythn-mua.org.", "idna"), "pyth\xf6n.org.")
self.assertEqual(str(b"XN--pythn-mua.org.", "idna"), "pyth\xf6n.org.")
self.assertEqual(str(b"xN--pythn-mua.org.", "idna"), "pyth\xf6n.org.")
self.assertEqual(str(b"Xn--pythn-mua.org.", "idna"), "pyth\xf6n.org.")
self.assertEqual(str(b"bugs.xn--pythn-mua.org.", "idna"),
"bugs.pyth\xf6n.org.")
self.assertEqual(str(b"bugs.XN--pythn-mua.org.", "idna"),
"bugs.pyth\xf6n.org.")

def test_builtin_encode(self):
self.assertEqual("python.org".encode("idna"), b"python.org")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
In :mod:`encodings.idna`, any capitalization of the the ACE prefix
(``xn--``) is now acceptable. Patch by Pepijn de Vos and Zackery Spytz.

0 comments on commit b5445be

Please sign in to comment.