bpo-41471: Ignore invalid prefix lengths in system proxy settings on macOS (GH-22762)
This commit is contained in:
parent
05ee790f4d
commit
93a1ccabde
|
@ -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()
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Ignore invalid prefix lengths in system proxy excludes.
|
Loading…
Reference in New Issue