Skip to content

gh-122792: Make IPv4-mapped IPv6 address properties consistent with IPv4 #122793

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
Sep 7, 2024
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
15 changes: 15 additions & 0 deletions Lib/ipaddress.py
Original file line number Diff line number Diff line change
Expand Up @@ -2043,6 +2043,9 @@ def is_multicast(self):
See RFC 2373 2.7 for details.

"""
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is not None:
return ipv4_mapped.is_multicast
return self in self._constants._multicast_network

@property
Expand All @@ -2054,6 +2057,9 @@ def is_reserved(self):
reserved IPv6 Network ranges.

"""
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is not None:
return ipv4_mapped.is_reserved
return any(self in x for x in self._constants._reserved_networks)

@property
Expand All @@ -2064,6 +2070,9 @@ def is_link_local(self):
A boolean, True if the address is reserved per RFC 4291.

"""
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is not None:
return ipv4_mapped.is_link_local
return self in self._constants._linklocal_network

@property
Expand Down Expand Up @@ -2120,6 +2129,9 @@ def is_global(self):
``is_global`` has value opposite to :attr:`is_private`, except for the ``100.64.0.0/10``
IPv4 range where they are both ``False``.
"""
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is not None:
return ipv4_mapped.is_global
return not self.is_private

@property
Expand All @@ -2131,6 +2143,9 @@ def is_unspecified(self):
RFC 2373 2.5.2.

"""
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is not None:
return ipv4_mapped.is_unspecified
return self._ip == 0

@property
Expand Down
24 changes: 24 additions & 0 deletions Lib/test/test_ipaddress.py
Original file line number Diff line number Diff line change
Expand Up @@ -2440,6 +2440,30 @@ def testIpv4Mapped(self):
self.assertEqual(ipaddress.ip_address('::ffff:c0a8:101').ipv4_mapped,
ipaddress.ip_address('192.168.1.1'))

def testIpv4MappedProperties(self):
# Test that an IPv4 mapped IPv6 address has
# the same properties as an IPv4 address.
for addr4 in (
"178.62.3.251", # global
"169.254.169.254", # link local
"127.0.0.1", # loopback
"224.0.0.1", # multicast
"192.168.0.1", # private
"0.0.0.0", # unspecified
"100.64.0.1", # public and not global
):
with self.subTest(addr4):
ipv4 = ipaddress.IPv4Address(addr4)
ipv6 = ipaddress.IPv6Address(f"::ffff:{addr4}")

self.assertEqual(ipv4.is_global, ipv6.is_global)
self.assertEqual(ipv4.is_private, ipv6.is_private)
self.assertEqual(ipv4.is_reserved, ipv6.is_reserved)
self.assertEqual(ipv4.is_multicast, ipv6.is_multicast)
self.assertEqual(ipv4.is_unspecified, ipv6.is_unspecified)
self.assertEqual(ipv4.is_link_local, ipv6.is_link_local)
self.assertEqual(ipv4.is_loopback, ipv6.is_loopback)

def testIpv4MappedPrivateCheck(self):
self.assertEqual(
True, ipaddress.ip_address('::ffff:192.168.1.1').is_private)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Changed IPv4-mapped ``ipaddress.IPv6Address`` to consistently use the mapped IPv4
address value for deciding properties. Properties which have their behavior fixed
are ``is_multicast``, ``is_reserved``, ``is_link_local``, ``is_global``, and ``is_unspecified``.
Loading