Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-31 04:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.12] gh-122792: Make IPv4-mapped IPv6 address properties consistent with IPv4 (GH-122793) (GH-123814)

Browse source 
gh-122792: Make IPv4-mapped IPv6 address properties consistent with IPv4 (GH-122793)

Make IPv4-mapped IPv6 address properties consistent with IPv4.
(cherry picked from commit 76a1c5d183)

Co-authored-by: Seth Michael Larson <seth@python.org>
This commit is contained in:
Miss Islington (bot) 2024-09-07 20:22:54 +02:00 • committed by GitHub
parent ca3ac30d6b
commit e0c69e479c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/ipaddress.py
View file

@ -2001,6 +2001,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
@ -2012,6 +2015,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
@ -2022,6 +2028,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
@ -2078,6 +2087,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
@ -2089,6 +2101,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

24
Lib/test/test_ipaddress.py
View file

@ -2421,6 +2421,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)

3
Misc/NEWS.d/next/Security/2024-08-07-10-42-13.gh-issue-122792.oiTMo9.rst Normal file
View file

@ -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``.