diff options
| -rw-r--r-- | ipapython/ipautil.py | 15 | ||||
| -rw-r--r-- | tests/test_ipapython/test_ipautil.py | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index d3bb38ab8..69c328934 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -97,7 +97,20 @@ class CheckedIPAddress(netaddr.IPAddress): pass else: try: - addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags) + try: + addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags) + except netaddr.AddrFormatError: + # netaddr.IPAddress doesn't handle zone indices in textual + # IPv6 addresses. Try removing zone index and parse the + # address again. + if not isinstance(addr, basestring): + raise + addr, sep, foo = addr.partition('%') + if sep != '%': + raise + addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags) + if addr.version != 6: + raise except ValueError: net = netaddr.IPNetwork(addr, flags=self.netaddr_ip_flags) if not parse_netmask: diff --git a/tests/test_ipapython/test_ipautil.py b/tests/test_ipapython/test_ipautil.py index 68391c2e1..650e1ce95 100644 --- a/tests/test_ipapython/test_ipautil.py +++ b/tests/test_ipapython/test_ipautil.py @@ -39,6 +39,8 @@ def test_ip_address(): addrs = [ ('10.11.12.13', (10, 11, 12, 13), 8), ('10.11.12.13/14', (10, 11, 12, 13), 14), + ('10.11.12.13%zoneid',), + ('10.11.12.13%zoneid/14',), ('10.11.12.1337',), ('10.11.12.13/33',), ('127.0.0.1',), @@ -50,6 +52,8 @@ def test_ip_address(): ('2001::1', (0x2001, 0, 0, 0, 0, 0, 0, 1), 64), ('2001::1/72', (0x2001, 0, 0, 0, 0, 0, 0, 1), 72), + ('2001::1%zoneid', (0x2001, 0, 0, 0, 0, 0, 0, 1), 64), + ('2001::1%zoneid/72',), ('2001::1beef',), ('2001::1/129',), ('::1',), |