8000 GH-113171: Fix "private" (non-global) IP address ranges by jstasiak · Pull Request #113179 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-113171: Fix "private" (non-global) IP address ranges #113179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 22, 2024
Merged

GH-113171: Fix "private" (non-global) IP address ranges #113179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b83b987
GH-113171: Fix "private" (really non-global) IP address ranges
jstasiak Dec 15, 2023
2a8d49b
Simplify
jstasiak Jan 9, 2024
7c9235e
Remove an unnecessary import
jstasiak Jan 9, 2024
d87ac9e
Update IP networks too
jstasiak Mar 14, 2024
e2d4582
Merge remote-tracking branch 'origin/main' into fix-ipaddress-private…
jstasiak Mar 18, 2024
f031f6e
Add documentation
jstasiak Mar 18, 2024
d3ee80d
Actually fix the shared address space too
jstasiak Mar 18, 2024
965e3a0
Revert "Actually fix the shared address space too"
jstasiak Mar 22, 2024
5f41fff
Make the news entry nicer
jstasiak Mar 22, 2024
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
Prev Previous commit
Next Next commit
Update IP networks too
  • Loading branch information
@jstasiak
jstasiak committed Mar 14, 2024
commit d87ac9eb379b4ddd20a8696b24d36e3e6c80cb54
6 changes: 5 additions & 1 deletion Lib/ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,11 @@ def is_private(self):
"""
return any(self.network_address in priv_network and
self.broadcast_address in priv_network
for priv_network in self._constants._private_networks)
for priv_network in self._constants._private_networks) and all(
self.network_address not in network and
self.broadcast_address not in network
for network in self._constants._private_networks_exceptions
)

@property
def is_global(self):
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/test_ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2317,6 +2317,7 @@ def testPrivateNetworks(self):
self.assertEqual(True, ipaddress.ip_network("169.254.0.0/16").is_private)
self.assertEqual(True, ipaddress.ip_network("172.16.0.0/12").is_private)
self.assertEqual(True, ipaddress.ip_network("192.0.0.0/29").is_private)
self.assertEqual(False, ipaddress.ip_network("192.0.0.9/32").is_private)
self.assertEqual(True, ipaddress.ip_network("192.0.0.170/31").is_private)
self.assertEqual(True, ipaddress.ip_network("192.0.2.0/24").is_private)
self.assertEqual(True, ipaddress.ip_network("192.168.0.0/16").is_private)
Expand All @@ -2334,6 +2335,7 @@ def testPrivateNetworks(self):
self.assertEqual(True, ipaddress.ip_network("::ffff:0:0/96").is_private)
self.assertEqual(True, ipaddress.ip_network("100::/64").is_private)
self.assertEqual(True, ipaddress.ip_network("2001:2::/48").is_private)
self.assertEqual(False, ipaddress.ip_network("2001:3::/48").is_private)
self.assertEqual(True, ipaddress.ip_network("2001:db8::/32").is_private)
self.assertEqual(True, ipaddress.ip_network("2001:10::/28").is_private)
self.assertEqual(True, ipaddress.ip_network("fc00::/7").is_private)
Expand Down
0