From: Xiang Zhang <angwerzx@126.com>
Date: Mon, 9 Jan 2017 03:43:24 +0000 (+0800)
Subject: Issue #29142: Fix suffixes in no_proxy handling in urllib.
X-Git-Tag: v2.7.14rc1~306^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98b1c82675a419ddfe9f4673fc4a88feaf8363c9;p=python

Issue #29142: Fix suffixes in no_proxy handling in urllib.

In urllib, 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.
---

diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 7b1ef6a0b8..14de91e13d 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -185,11 +185,12 @@ class ProxyTests(unittest.TestCase):
     def test_proxy_bypass_environment_host_match(self):
         bypass = urllib.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.py b/Lib/urllib.py
index 7f70496b63..c3c8ef4b60 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1427,6 +1427,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)
diff --git a/Misc/NEWS b/Misc/NEWS
index 9598c3ff39..d1f7b5ebbf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,10 @@ Extension Modules
 Library
 -------
 
+- Issue #29142: In urllib, 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 #29094: Offsets in a ZIP file created with extern file object and mode
   "w" now are relative to the start of the file.