diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2020-10-19 18:16:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 18:16:21 (GMT) |
| commit | 93a1ccabdede416425473329b8c718d507c55e29 (patch) | |
| tree | daa75975185560298a093d79ac213834881a0064 | |
| parent | 05ee790f4d1cd8725a90b54268fc1dfe5b4d1fa2 (diff) | |
| download | cpython-93a1ccabdede416425473329b8c718d507c55e29.zip cpython-93a1ccabdede416425473329b8c718d507c55e29.tar.gz cpython-93a1ccabdede416425473329b8c718d507c55e29.tar.bz2 | |
bpo-41471: Ignore invalid prefix lengths in system proxy settings on macOS (GH-22762)
| -rw-r--r-- | Lib/test/test_urllib2.py | 12 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/macOS/2020-10-19-12-25-19.bpo-41471.gwA7un.rst | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index f202f97..12ad6ae 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1449,6 +1449,18 @@ class HandlerTests(unittest.TestCase): bypass = {'exclude_simple': True, 'exceptions': []} self.assertTrue(_proxy_bypass_macosx_sysconf('test', bypass)) + # Check that invalid prefix lengths are ignored + bypass = { + 'exclude_simple': False, + 'exceptions': [ '10.0.0.0/40', '172.19.10.0/24' ] + } + host = '172.19.10.5' + self.assertTrue(_proxy_bypass_macosx_sysconf(host, bypass), + 'expected bypass of %s to be True' % host) + host = '10.0.1.5' + self.assertFalse(_proxy_bypass_macosx_sysconf(host, bypass), + 'expected bypass of %s to be False' % host) + def check_basic_auth(self, headers, realm): with self.subTest(realm=realm, headers=headers): opener = OpenerDirector() diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 2a3d715..a8c870b 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2596,6 +2596,11 @@ def _proxy_bypass_macosx_sysconf(host, proxy_settings): mask = 8 * (m.group(1).count('.') + 1) else: mask = int(mask[1:]) + + if mask < 0 or mask > 32: + # System libraries ignore invalid prefix lengths + continue + mask = 32 - mask if (hostIP >> mask) == (base >> mask): diff --git a/Misc/NEWS.d/next/macOS/2020-10-19-12-25-19.bpo-41471.gwA7un.rst b/Misc/NEWS.d/next/macOS/2020-10-19-12-25-19.bpo-41471.gwA7un.rst new file mode 100644 index 0000000..db5dd00 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2020-10-19-12-25-19.bpo-41471.gwA7un.rst @@ -0,0 +1 @@ +Ignore invalid prefix lengths in system proxy excludes. |