X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/blobdiff_plain/6d00cda627efb7b95b26df3dad629524d416e34a..e195a41f5f9f2910f77d82a4507e5494c4033804:/invirt-dns diff --git a/invirt-dns b/invirt-dns index 4193be1..1744ac8 100755 --- a/invirt-dns +++ b/invirt-dns @@ -7,6 +7,7 @@ from twisted.names import authority from twisted.internet import defer from twisted.python import failure +from invirt.common import InvirtConfigError from invirt.config import structs as config import invirt.database import psycopg2 @@ -62,14 +63,17 @@ class DatabaseAuthority(common.ResolverBase): if name in self.domains: domain = name else: - # Look for the longest-matching domain. (This works because domain - # will remain bound after breaking out of the loop.) + # Look for the longest-matching domain. best_domain = '' for domain in self.domains: if name.endswith('.'+domain) and len(domain) > len(best_domain): best_domain = domain if best_domain == '': - return defer.fail(failure.Failure(dns.DomainError(name))) + if name.endswith('.in-addr.arpa'): + # Act authoritative for the IP address for reverse resolution requests + best_domain = name + else: + return defer.fail(failure.Failure(dns.DomainError(name))) domain = best_domain results = [] authority = [] @@ -78,11 +82,27 @@ class DatabaseAuthority(common.ResolverBase): 3600, self.ns, auth=True)) if cls == dns.IN: - host = name[:-len(domain)-1] - if not host: # Request for the domain itself. + 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() + if value and value.hostname: + hostname = value.hostname + if '.' not in hostname: + hostname = hostname + "." + config.dns.domains[0] + record = dns.Record_PTR(hostname, ttl) + results.append(dns.RRHeader(name, dns.PTR, dns.IN, + ttl, record, auth=True)) + else: # IP address doesn't point to an active host + return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name))) + elif type == dns.SOA: + results.append(dns.RRHeader(domain, dns.SOA, dns.IN, + ttl, self.soa, auth=True)) + # FIXME: Should only return success with no records if the name actually exists + elif name == domain or name == '.'+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, + 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, @@ -91,17 +111,24 @@ class DatabaseAuthority(common.ResolverBase): elif type == dns.SOA: 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? + else: + host = name[:-len(domain)-1] + 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): record = dns.Record_A(ip, ttl) - results.append(dns.RRHeader(name, dns.A, dns.IN, + results.append(dns.RRHeader(name, dns.A, dns.IN, ttl, record, auth=True)) elif type == dns.SOA: results.append(dns.RRHeader(domain, dns.SOA, dns.IN, @@ -121,9 +148,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 ]+|(? 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) if '__main__' == __name__: resolvers = [] - for zone in config.dns.zone_files: - for origin in config.dns.domains: - r = QuotingBindAuthority(zone) - # This sucks, but if I want a generic zone file, I have to - # reload the information by hand - r.origin = origin - lines = open(zone).readlines() - lines = r.collapseContinuations(r.stripComments(lines)) - r.parseLines(lines) - - resolvers.append(r) + try: + for zone in config.dns.zone_files: + for origin in config.dns.domains: + r = QuotingBindAuthority(zone) + # This sucks, but if I want a generic zone file, I have to + # reload the information by hand + r.origin = origin + lines = open(zone).readlines() + lines = r.collapseContinuations(r.stripComments(lines)) + r.parseLines(lines) + + resolvers.append(r) + except InvirtConfigError: + # Don't care if zone_files isn't defined + pass resolvers.append(DatabaseAuthority()) verbosity = 0