mirror of https://github.com/python/cpython
gh-122792: Make IPv4-mapped IPv6 address properties consistent with IPv4 (GH-122793)
Make IPv4-mapped IPv6 address properties consistent with IPv4.
This commit is contained in:
parent
033510e11d
commit
76a1c5d183
|
@ -2029,6 +2029,9 @@ class IPv6Address(_BaseV6, _BaseAddress):
|
|||
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
|
||||
|
@ -2040,6 +2043,9 @@ class IPv6Address(_BaseV6, _BaseAddress):
|
|||
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
|
||||
|
@ -2050,6 +2056,9 @@ class IPv6Address(_BaseV6, _BaseAddress):
|
|||
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
|
||||
|
@ -2106,6 +2115,9 @@ class IPv6Address(_BaseV6, _BaseAddress):
|
|||
``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
|
||||
|
@ -2117,6 +2129,9 @@ class IPv6Address(_BaseV6, _BaseAddress):
|
|||
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
|
||||
|
|
|
@ -2446,6 +2446,30 @@ class IpaddrUnitTest(unittest.TestCase):
|
|||
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)
|
||||
|
|
|
@ -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…
Reference in New Issue