diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2020-12-29 12:18:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 12:18:42 (GMT) |
| commit | 030a713183084594659aefd77b76fe30178e23c8 (patch) | |
| tree | f1cbb34ad0b1c8ff42e08252205090865293a4ba | |
| parent | c1af128f5a5893839536453dcc8b2ed7b95b3c3a (diff) | |
| download | cpython-030a713183084594659aefd77b76fe30178e23c8.zip cpython-030a713183084594659aefd77b76fe30178e23c8.tar.gz cpython-030a713183084594659aefd77b76fe30178e23c8.tar.bz2 | |
Allow / character in username,password fields in _PROXY envvars. (#23973)
| -rw-r--r-- | Lib/test/test_urllib2.py | 10 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 12ad6ae..9db23e6 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1851,9 +1851,17 @@ class MiscTests(unittest.TestCase): ('ftp', 'joe', 'password', 'proxy.example.com')), # Test for no trailing '/' case ('http://joe:password@proxy.example.com', - ('http', 'joe', 'password', 'proxy.example.com')) + ('http', 'joe', 'password', 'proxy.example.com')), + # Testcases with '/' character in username, password + ('http://user/name:password@localhost:22', + ('http', 'user/name', 'password', 'localhost:22')), + ('http://username:pass/word@localhost:22', + ('http', 'username', 'pass/word', 'localhost:22')), + ('http://user/name:pass/word@localhost:22', + ('http', 'user/name', 'pass/word', 'localhost:22')), ] + for tc, expected in parse_proxy_test_cases: self.assertEqual(_parse_proxy(tc), expected) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 39974d9..e5febe6 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -773,7 +773,11 @@ def _parse_proxy(proxy): raise ValueError("proxy URL with no authority: %r" % proxy) # We have an authority, so for RFC 3986-compliant URLs (by ss 3. # and 3.3.), path is empty or starts with '/' - end = r_scheme.find("/", 2) + if '@' in r_scheme: + host_separator = r_scheme.find('@') + end = r_scheme.find("/", host_separator) + else: + end = r_scheme.find("/", 2) if end == -1: end = None authority = r_scheme[2:end] diff --git a/Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst b/Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst new file mode 100644 index 0000000..07b15d3 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-12-27-18-47-01.bpo-23328._xqepZ.rst @@ -0,0 +1 @@ +Allow / character in username, password fields on _PROXY envars. |