From: Evan Broder <broder@mit.edu>
Date: Tue, 24 Jun 2008 02:10:52 +0000 (-0400)
Subject: Restructuring code to correctly return NXDOMAIN on non-A-record requests
X-Git-Tag: sipb-xen-dns/1.02~3
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/commitdiff_plain/0d05c217c428edf1bfc9f7d549c469e35abb6ff2

Restructuring code to correctly return NXDOMAIN on non-A-record requests

svn path=/trunk/packages/sipb-xen-dns/; revision=651
---

diff --git a/code/dnsserver.py b/code/dnsserver.py
index ae46d4c..7678db5 100755
--- a/code/dnsserver.py
+++ b/code/dnsserver.py
@@ -64,29 +64,34 @@ class DatabaseAuthority(common.ResolverBase):
         authority.append(dns.RRHeader(domain, dns.NS, dns.IN,
                                       3600, self.ns, auth=True))
         if cls == dns.IN:
-            if type in (dns.A, dns.ALL_RECORDS):
-                host = name[:-len(domain)-1]
-                if not host:
+            host = name[:-len(domain)-1]
+            if not host:
+                if type in (dns.A, dns.ALL_RECORDS):
                     record = dns.Record_A('18.181.0.62', ttl)
                     results.append(dns.RRHeader(name, dns.A, dns.IN, 
                                                 ttl, record, auth=True))
-                else:
+                elif type == dns.NS:
+                    results.append(dns.RRHeader(domain, dns.NS, dns.IN,
+                                                ttl, self.ns, auth=True))
+                    authority = []
+                elif type == dns.SOA:
+                    results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
+                                                ttl, self.soa, auth=True))
+            else:
+                if host:
                     value = sipb_xen_database.Machine.get_by(name=host)
                     if value is None or not value.nics:
                         return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
                     ip = value.nics[0].ip
                     if ip is None:  #Deactivated?
                         return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
+                if type in (dns.A, dns.ALL_RECORDS):
                     record = dns.Record_A(ip, ttl)
                     results.append(dns.RRHeader(name, dns.A, dns.IN, 
                                                 ttl, record, auth=True))
-            elif type == dns.NS:
-                results.append(dns.RRHeader(domain, dns.NS, dns.IN,
-                                            ttl, self.ns, auth=True))
-                authority = []
-            elif type == dns.SOA:
-                results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
-                                            ttl, self.soa, auth=True))
+                elif type == dns.SOA:
+                    results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
+                                                ttl, self.soa, auth=True))
             if len(results) == 0:
                 authority = []
                 additional = []