From 0024024897153d23ae446415612b7529ffb67fe2 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Mar 27 2012 10:03:16 +0000
Subject: Parse zone indices in IPv6 addresses in CheckedIPAddress.


If a zone index is present in an IPv6 address, it is ignored.

ticket 2138

---

diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index d3bb38a..69c3289 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 68391c2..650e1ce 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',),