bpo-33433 Fix private address checking for IPv4 mapped IPv6. (GH-26172)

For IPv4 mapped IPv6 addresses, defer privacy check to the mapped IPv4 address. Solves bug where public mapped IPv4 addresses are considered private by the IPv6 check.

Automerge-Triggered-By: GH:gpshead
This commit is contained in:
Pete Wicken 2021-05-17 08:52:36 +01:00 committed by GitHub
parent c10392e7dd
commit 83f0f8d62f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions

View File

@ -16,6 +16,7 @@ import functools
IPV4LENGTH = 32 IPV4LENGTH = 32
IPV6LENGTH = 128 IPV6LENGTH = 128
class AddressValueError(ValueError): class AddressValueError(ValueError):
"""A Value Error related to the address.""" """A Value Error related to the address."""
@ -2002,9 +2003,13 @@ class IPv6Address(_BaseV6, _BaseAddress):
Returns: Returns:
A boolean, True if the address is reserved per A boolean, True if the address is reserved per
iana-ipv6-special-registry. iana-ipv6-special-registry, or is ipv4_mapped and is
reserved in the iana-ipv4-special-registry.
""" """
ipv4_mapped = self.ipv4_mapped
if ipv4_mapped is not None:
return ipv4_mapped.is_private
return any(self in net for net in self._constants._private_networks) return any(self in net for net in self._constants._private_networks)
@property @property

View File

@ -2339,6 +2339,12 @@ class IpaddrUnitTest(unittest.TestCase):
self.assertEqual(ipaddress.ip_address('::ffff:c0a8:101').ipv4_mapped, self.assertEqual(ipaddress.ip_address('::ffff:c0a8:101').ipv4_mapped,
ipaddress.ip_address('192.168.1.1')) ipaddress.ip_address('192.168.1.1'))
def testIpv4MappedPrivateCheck(self):
self.assertEqual(
True, ipaddress.ip_address('::ffff:192.168.1.1').is_private)
self.assertEqual(
False, ipaddress.ip_address('::ffff:172.32.0.0').is_private)
def testAddrExclude(self): def testAddrExclude(self):
addr1 = ipaddress.ip_network('10.1.1.0/24') addr1 = ipaddress.ip_network('10.1.1.0/24')
addr2 = ipaddress.ip_network('10.1.1.0/26') addr2 = ipaddress.ip_network('10.1.1.0/26')

View File

@ -0,0 +1 @@
For IPv4 mapped IPv6 addresses (:rfc:`4291` Section 2.5.5.2), the :mod:`ipaddress.IPv6Address.is_private` check is deferred to the mapped IPv4 address. This solves a bug where public mapped IPv4 addresses were considered private by the IPv6 check.