From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 20 Jun 2013 11:57:16 +0000 (+0200)
Subject: Fix ipv6 check
X-Git-Tag: userdir-ldap-0.3.85~48
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=0a75ce1efcdade4778c6bd431656f5af4a9a740a

Fix ipv6 check
---

diff --git a/debian/changelog b/debian/changelog
index f676b6a..d15a031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,7 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
     useful for role accounts.
   * ud-generate: Support writing gitolite config for just one user-group.
   * ud-generate: Support MX remapping.
+  * ud-generate: Fix ipv6 check.
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
diff --git a/ud-generate b/ud-generate
index a2b28f9..f80820e 100755
--- a/ud-generate
+++ b/ud-generate
@@ -65,7 +65,6 @@ UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)(,\s*([^ <>@]+@[^ ,<>@]+))*$")
 BSMTPCheck = re.compile(".*mx 0 (master)\.debian\.org\..*",re.DOTALL)
 PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
-IsV6Addr = re.compile("^[a-fA-F0-9:]+$")
 IsDebianHost = re.compile(ConfModule.dns_hostmatch)
 isSSHFP = re.compile("^\s*IN\s+SSHFP")
 DNSZone = ".debian.net"
@@ -819,6 +818,13 @@ def GenDNS(accounts, File):
       raise
    Done(File, F, None)
 
+def is_ipv6_addr(i):
+   try:
+      socket.inet_pton(socket.AF_INET6, i)
+   except socket.error:
+      return False
+   return True
+
 def ExtractDNSInfo(x):
 
    TTLprefix="\t"
@@ -828,7 +834,7 @@ def ExtractDNSInfo(x):
    DNSInfo = []
    if x[1].has_key("ipHostNumber"):
       for I in x[1]["ipHostNumber"]:
-         if IsV6Addr.match(I) != None:
+         if is_ipv6_addr(I):
             DNSInfo.append("%sIN\tAAAA\t%s" % (TTLprefix, I))
          else:
             DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I))
@@ -960,7 +966,7 @@ def HostToIP(Host, mapped=True):
    if Host[1].has_key("ipHostNumber"):
       for addr in Host[1]["ipHostNumber"]:
          IPAdresses.append(addr)
-         if IsV6Addr.match(addr) is None and mapped == "True":
+         if not is_ipv6_addr(addr) and mapped == "True":
             IPAdresses.append("::ffff:"+addr)
 
    return IPAdresses