changeset:   101189:1ceb91974dc4
parent:      101187:59638baee25e
parent:      101188:ca882ee68d46
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sat Apr 30 01:30:57 2016 +0000
files:       Lib/urllib/request.py Misc/NEWS
description:
Issue #26864: Merge no_proxy fixes from 3.5


diff -r 59638baee25e -r 1ceb91974dc4 Lib/test/test_urllib.py
--- a/Lib/test/test_urllib.py	Fri Apr 29 19:50:02 2016 +0300
+++ b/Lib/test/test_urllib.py	Sat Apr 30 01:30:57 2016 +0000
@@ -231,6 +231,19 @@
         self.assertTrue(urllib.request.proxy_bypass_environment('anotherdomain.com:8888'))
         self.assertTrue(urllib.request.proxy_bypass_environment('newdomain.com:1234'))
 
+    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')
+        self.assertTrue(bypass('localhost'))
+        self.assertTrue(bypass('LocalHost'))                 # MixedCase
+        self.assertTrue(bypass('LOCALHOST'))                 # UPPERCASE
+        self.assertTrue(bypass('newdomain.com:1234'))
+        self.assertTrue(bypass('anotherdomain.com:8888'))
+        self.assertTrue(bypass('www.newdomain.com:1234'))
+        self.assertFalse(bypass('prelocalhost'))
+        self.assertFalse(bypass('newdomain.com'))            # no port
+        self.assertFalse(bypass('newdomain.com:1235'))       # wrong port
 
 class ProxyTests_withOrderedEnv(unittest.TestCase):
 
diff -r 59638baee25e -r 1ceb91974dc4 Lib/urllib/request.py
--- a/Lib/urllib/request.py	Fri Apr 29 19:50:02 2016 +0300
+++ b/Lib/urllib/request.py	Sat Apr 30 01:30:57 2016 +0000
@@ -2492,8 +2492,12 @@
     # check if the host ends with any of the DNS suffixes
     no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')]
     for name in no_proxy_list:
-        if name and (hostonly.endswith(name) or host.endswith(name)):
-            return 1
+        if name:
+            name = re.escape(name)
+            pattern = r'(.+\.)?%s$' % name
+            if (re.match(pattern, hostonly, re.I)
+                    or re.match(pattern, host, re.I)):
+                return 1
     # otherwise, don't bypass
     return 0
 
diff -r 59638baee25e -r 1ceb91974dc4 Misc/NEWS
--- a/Misc/NEWS	Fri Apr 29 19:50:02 2016 +0300
+++ b/Misc/NEWS	Sat Apr 30 01:30:57 2016 +0000
@@ -256,6 +256,11 @@
 Library
 -------
 
+- Issue #26864: In urllib.request, change the proxy bypass host checking
+  against no_proxy to be case-insensitive, and to not match unrelated host
+  names that happen to have a bypassed hostname as a suffix.  Patch by Xiang
+  Zhang.
+
 - Issue #24902: Print server URL on http.server startup.  Initial patch by
   Felix Kaiser.