Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Lib/test/test_urllib2.py
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,18 @@ def test_osx_proxy_bypass(self):
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()
Expand Down
5 changes: 5 additions & 0 deletions Lib/urllib/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -2596,6 +2596,11 @@ def ip2num(ipAddr):
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):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ignore invalid prefix lengths in system proxy excludes.