diff options
| author | Xiang Zhang <angwerzx@126.com> | 2017-01-09 11:52:10 +0800 |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2017-01-09 11:52:10 +0800 |
| commit | 04c15d5bdc1960be67b4d93f846141e6451a0c6c (patch) | |
| tree | 1ad0b60d4e329cb0b1822ae1215075d1830604bc | |
| parent | 9d60b94427f42b3f543e398205113a1b18b43598 (diff) | |
| parent | c44d58a77a123873b093c4690056ef4d20e873f3 (diff) | |
| download | cpython-git-04c15d5bdc1960be67b4d93f846141e6451a0c6c.tar.gz | |
Issue #29142: Merge 3.6.
| -rw-r--r-- | Lib/test/test_urllib.py | 3 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 43ea6b8b57..5084486e5a 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -247,11 +247,12 @@ class ProxyTests(unittest.TestCase): def test_proxy_bypass_environment_host_match(self): bypass = urllib.request.proxy_bypass_environment self.env.set('NO_PROXY', - 'localhost, anotherdomain.com, newdomain.com:1234') + 'localhost, anotherdomain.com, newdomain.com:1234, .d.o.t') self.assertTrue(bypass('localhost')) self.assertTrue(bypass('LocalHost')) # MixedCase self.assertTrue(bypass('LOCALHOST')) # UPPERCASE self.assertTrue(bypass('newdomain.com:1234')) + self.assertTrue(bypass('foo.d.o.t')) # issue 29142 self.assertTrue(bypass('anotherdomain.com:8888')) self.assertTrue(bypass('www.newdomain.com:1234')) self.assertFalse(bypass('prelocalhost')) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 793ea7fbbd..0a9fdf92bf 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2513,6 +2513,7 @@ def proxy_bypass_environment(host, proxies=None): no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')] for name in no_proxy_list: if name: + name = name.lstrip('.') # ignore leading dots name = re.escape(name) pattern = r'(.+\.)?%s$' % name if (re.match(pattern, hostonly, re.I) @@ -212,6 +212,10 @@ Core and Builtins Library ------- +- Issue #29142: In urllib.request, suffixes in no_proxy environment variable with + leading dots could match related hostnames again (e.g. .b.c matches a.b.c). + Patch by Milan Oberkirch. + - Issue #28961: Fix unittest.mock._Call helper: don't ignore the name parameter anymore. Patch written by Jiajun Huang. |