X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/blobdiff_plain/6d00cda627efb7b95b26df3dad629524d416e34a..bc2b9c977be0dfaffbe83dc226a710453733a2b3:/invirt-dns?ds=inline

diff --git a/invirt-dns b/invirt-dns
index 4193be1..4049257 100755
--- a/invirt-dns
+++ b/invirt-dns
@@ -92,11 +92,17 @@ class DatabaseAuthority(common.ResolverBase):
                     results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
                                                 ttl, self.soa, auth=True))
             else: # Request for a subdomain.
-                value = invirt.database.Machine.query().filter_by(name=host).first()
-                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?
+                value = invirt.database.NIC.query.filter_by(hostname=host).first()
+                if value:
+                    ip = value.ip
+                else:
+                    value = invirt.database.Machine.query().filter_by(name=host).first()
+                    if value:
+                        ip = value.nics[0].ip
+                    else:
+                        return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
+                
+                if ip is None:
                     return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
 
                 if type in (dns.A, dns.ALL_RECORDS):
@@ -121,9 +127,18 @@ class QuotingBindAuthority(authority.BindAuthority):
     This will catch double quotes as marking the start or end of a
     quoted phrase, unless the double quote is escaped by a backslash
     """
-    # Grab everything up to the first whitespace character or
-    # quotation mark not proceeded by a backslash
-    whitespace_re = re.compile(r'(.*?)([\t\n\x0b\x0c\r ]+|(?<!\\)")')
+    # Match either a quoted or unquoted string literal followed by
+    # whitespace or the end of line.  This yields two groups, one of
+    # which has a match, and the other of which is None, depending on
+    # whether the string literal was quoted or unquoted; this is what
+    # necessitates the subsequent filtering out of groups that are
+    # None.
+    string_pat = \
+            re.compile(r'"((?:[^"\\]|\\.)*)"|((?:[^\\\s]|\\.)+)(?:\s+|\s*$)')
+
+    # For interpreting escapes.
+    escape_pat = re.compile(r'\\(.)')
+
     def collapseContinuations(self, lines):
         L = []
         state = 0
@@ -142,41 +157,13 @@ class QuotingBindAuthority(authority.BindAuthority):
                     L[-1] += ' ' + line
         lines = L
         L = []
+
         for line in lines:
             in_quote = False
             split_line = []
-            while len(line) > 0:
-                match = self.whitespace_re.match(line)
-                if match is None:
-                    # If there's no match, that means that there's no
-                    # whitespace in the rest of the line, so it should
-                    # be treated as a single entity, quoted or not
-                    #
-                    # This also means that a closing quote isn't
-                    # strictly necessary if the line ends the quote
-                    substr = line
-                    end = ''
-                else:
-                    substr, end = match.groups()
-                
-                if in_quote:
-                    # If we're in the middle of the quote, the string
-                    # we just grabbed belongs at the end of the
-                    # previous string
-                    #
-                    # Including the whitespace! Unless it's not
-                    # whitespace and is actually a closequote instead
-                    split_line[-1] += substr + (end if end != '"' else '')
-                else:
-                    # If we're not in the middle of a quote, than this
-                    # is the next new string
-                    split_line.append(substr)
-                
-                if end == '"':
-                    in_quote = not in_quote
-                
-                # Then strip off what we just processed
-                line = line[len(substr + end):]
+            for m in self.string_pat.finditer(line):
+                [x] = [x for x in m.groups() if x is not None]
+                split_line.append(self.escape_pat.sub(r'\1', x))
             L.append(split_line)
         return filter(None, L)