From: Mitchell E Berger <mitchb@mit.edu>
Date: Tue, 15 May 2018 17:48:29 +0000 (-0400)
Subject: Add ".other" pseudo-subdomain to find IPs under transition.
X-Git-Tag: 0.0.19~2
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/commitdiff_plain/95af4d43b213c0860423cb0b1dc29cedfed04ea5

Add ".other" pseudo-subdomain to find IPs under transition.
---

diff --git a/debian/changelog b/debian/changelog
index b1b93ae..944a09a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dns (0.0.19) precise; urgency=low
+
+  * Add ".other" pseudo-subdomain to find IPs under transition.
+
+ -- Mitchell Berger <mitchb@mit.edu>  Tue, 15 May 2018 13:48:00 -0400
+
 invirt-dns (0.0.18) precise; urgency=low
 
   * Stop replacing the Authority section with the Results section; Twisted
diff --git a/invirt-dns b/invirt-dns
index 272fd6c..7a39f0f 100755
--- a/invirt-dns
+++ b/invirt-dns
@@ -11,6 +11,7 @@ from twisted.python import failure
 from invirt.common import InvirtConfigError
 from invirt.config import structs as config
 import invirt.database
+from invirt.database import NIC
 import psycopg2
 import sqlalchemy
 import time
@@ -94,10 +95,12 @@ class DatabaseAuthority(common.ResolverBase):
         if name.endswith(".in-addr.arpa"):
             if type in (dns.PTR, dns.ALL_RECORDS):
                 ip = '.'.join(reversed(name.split('.')[:-2]))
-                value = invirt.database.NIC.query.filter_by(ip=ip).first()
+                value = invirt.database.NIC.query.filter((NIC.ip == ip) | (NIC.other_ip == ip)).first()
                 if value and value.hostname:
                     hostname = value.hostname
                     if '.' not in hostname:
+                        if ip == value.other_ip:
+                            hostname = hostname + ".other"
                         hostname = hostname + "." + config.dns.domains[0]
                     record = dns.Record_PTR(hostname, ttl)
                     results.append(dns.RRHeader(name, dns.PTR, dns.IN,
@@ -109,7 +112,7 @@ class DatabaseAuthority(common.ResolverBase):
                                             ttl, self.soa, auth=True))
             # FIXME: Should only return success with no records if the name actually exists
 
-        elif name == domain or name == '.'+domain:
+        elif name == domain or name == '.'+domain or name == 'other.'+domain:
             if type in (dns.A, dns.ALL_RECORDS):
                 record = dns.Record_A(config.dns.nameservers[0].ip, ttl)
                 results.append(dns.RRHeader(name, dns.A, dns.IN,
@@ -124,13 +127,23 @@ class DatabaseAuthority(common.ResolverBase):
 
         else:
             host = name[:-len(domain)-1]
+            other = False
+            if host.endswith(".other"):
+                host = host[:-len(".other")]
+                other = True
             value = invirt.database.NIC.query.filter_by(hostname=host).first()
             if value:
-                ip = value.ip
+                if other:
+                    ip = value.other_ip
+                else:
+                    ip = value.ip
             else:
                 value = invirt.database.Machine.query.filter_by(name=host).first()
                 if value:
-                    ip = value.nics[0].ip
+                    if other:
+                        ip = value.nics[0].other_ip
+                    else:
+                        ip = value.nics[0].ip
                 else:
                     return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
             if ip is None: