Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-36742: Corrects fix to handle decomposition in usernames (#13812)

This commit is contained in:
Steve Dower 2019-06-04 08:55:30 -07:00 committed by Łukasz Langa
parent 800d786370
commit 8d0ef0b5ed
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_urlparse.py
View File

@ -1018,8 +1018,9 @@ class UrlParseTestCase(unittest.TestCase):
urllib.parse.urlsplit('http://\u30d5\u309a\ufe1380') urllib.parse.urlsplit('http://\u30d5\u309a\ufe1380')
for scheme in ["http", "https", "ftp"]: for scheme in ["http", "https", "ftp"]:
for netloc in ["netloc{}false.netloc", "n{}user@netloc"]:
for c in denorm_chars: for c in denorm_chars:
url = "{}://netloc{}false.netloc/path".format(scheme, c) url = "{}://{}/path".format(scheme, netloc.format(c))
with self.subTest(url=url, char='{:04X}'.format(ord(c))): with self.subTest(url=url, char='{:04X}'.format(ord(c))):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
urllib.parse.urlsplit(url) urllib.parse.urlsplit(url)

6
Lib/urllib/parse.py
View File

@ -402,9 +402,9 @@ def _checknetloc(netloc):
# looking for characters like \u2100 that expand to 'a/c' # looking for characters like \u2100 that expand to 'a/c'
# IDNA uses NFKC equivalence, so normalize for this check # IDNA uses NFKC equivalence, so normalize for this check
import unicodedata import unicodedata
n = netloc.rpartition('@')[2] # ignore anything to the left of '@' n = netloc.replace('@', '') # ignore characters already included
n = n.replace(':', '') # ignore characters already included n = n.replace(':', '') # but not the surrounding text
n = n.replace('#', '') # but not the surrounding text n = n.replace('#', '')
n = n.replace('?', '') n = n.replace('?', '')
netloc2 = unicodedata.normalize('NFKC', n) netloc2 = unicodedata.normalize('NFKC', n)
if n == netloc2: if n == netloc2: