Skip to content

gh-134062: Fix hash collisions in IPv4Network and IPv6Network #134063

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.

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 2 commits into from
May 22, 2025
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
2 changes: 1 addition & 1 deletion Lib/ipaddress.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ def __eq__(self, other):
return NotImplemented

def __hash__(self):
return hash(int(self.network_address) ^ int(self.netmask))
return hash((int(self.network_address), int(self.netmask)))

def __contains__(self, other):
# always false if one is v4 and the other is v6.
Expand Down
28 changes: 28 additions & 0 deletions Lib/test/test_ipaddress.py
Original file line number Diff line number Diff line change
Expand Up @@ -2762,6 +2762,34 @@ def testV6HashIsNotConstant(self):
ipv6_address2 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:2")
self.assertNotEqual(ipv6_address1.__hash__(), ipv6_address2.__hash__())

# issue 134062 Hash collisions in IPv4Network and IPv6Network
def testNetworkV4HashCollisions(self):
self.assertNotEqual(
ipaddress.IPv4Network("192.168.1.255/32").__hash__(),
ipaddress.IPv4Network("192.168.1.0/24").__hash__()
)
self.assertNotEqual(
ipaddress.IPv4Network("172.24.255.0/24").__hash__(),
ipaddress.IPv4Network("172.24.0.0/16").__hash__()
)
self.assertNotEqual(
ipaddress.IPv4Network("192.168.1.87/32").__hash__(),
ipaddress.IPv4Network("192.168.1.86/31").__hash__()
)

# issue 134062 Hash collisions in IPv4Network and IPv6Network
def testNetworkV6HashCollisions(self):
self.assertNotEqual(
ipaddress.IPv6Network("fe80::/64").__hash__(),
ipaddress.IPv6Network("fe80::ffff:ffff:ffff:0/112").__hash__()
)
self.assertNotEqual(
ipaddress.IPv4Network("10.0.0.0/8").__hash__(),
ipaddress.IPv6Network(
"ffff:ffff:ffff:ffff:ffff:ffff:aff:0/112"
).__hash__()
)


if __name__ == '__main__':
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:mod:`ipaddress`: fix collisions in :meth:`~object.__hash__` for
:class:`~ipaddress.IPv4Network` and :class:`~ipaddress.IPv6Network`
objects.
Loading