Merge pull request #111 from kjd/issue-108

Raise IDNAError on non-ASCII A-Label (fixes #108)
kjd · Oct 3, 2021 · 4bfc439 · 4bfc439
2 parents d0116b5 + e1023cb
commit 4bfc439
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/idna/core.py b/idna/core.py
@@ -383,8 +383,11 @@ def encode(s, strict=False, uts46=False, std3_rules=False, transitional=False):
 
 def decode(s, strict=False, uts46=False, std3_rules=False):
     # type: (Union[str, bytes, bytearray], bool, bool, bool) -> str
-    if isinstance(s, (bytes, bytearray)):
-        s = s.decode('ascii')
+    try:
+        if isinstance(s, (bytes, bytearray)):
+            s = s.decode('ascii')
+    except UnicodeDecodeError:
+        raise IDNAError('Invalid ASCII in A-label')
     if uts46:
         s = uts46_remap(s, std3_rules, False)
     trailing_dot = False

diff --git a/tests/test_idna.py b/tests/test_idna.py
@@ -259,6 +259,7 @@ def test_decode(self):
         self.assertRaises(idna.IDNAError, idna.decode, 'XN---------90GGLBAGAAC.AA')
         self.assertRaises(idna.IDNAError, idna.decode, 'xn---------90gglbagaac.aa')
         self.assertRaises(idna.IDNAError, idna.decode, 'xn--')
+        self.assertRaises(idna.IDNAError, idna.decode, b'\x8d\xd2')
 
 if __name__ == '__main__':
     unittest.main()