From: Quentin Smith Date: Tue, 26 Nov 2019 03:26:58 +0000 (-0500) Subject: Workaround a bug in Twisted's zone file parsing. X-Git-Tag: 0.0.21^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/commitdiff_plain/refs/heads/precise-prod Workaround a bug in Twisted's zone file parsing. --- diff --git a/debian/changelog b/debian/changelog index ed218aa..988f4a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-dns (0.0.21) unstable; urgency=low + + * Workaround a bug in Twisted's zone file parsing. + + -- Quentin Smith Mon, 25 Nov 2019 22:26:48 -0500 + invirt-dns (0.0.20) unstable; urgency=low * Rewrite _lookup to use inlineCallbacks for readability, in the process diff --git a/invirt-dns b/invirt-dns index c9ce43e..188d1ce 100755 --- a/invirt-dns +++ b/invirt-dns @@ -16,6 +16,7 @@ import psycopg2 import sqlalchemy import time import re +import sys class DatabaseAuthority(common.ResolverBase): """An Authority that is loaded from a file.""" @@ -221,7 +222,13 @@ class DelegatingQuotingBindAuthority(authority.BindAuthority): result = yield authority.BindAuthority._lookup(self, name, cls, type, timeout) defer.returnValue(result) - except dns.AuthoritativeDomainError: + except Exception as e: + # XXX: Twisted returns DomainError even if it is + # authoritative for the domain because our SOA record + # incorrectly contains (origin + "." + origin) + if not isinstance(e, (dns.DomainError, dns.AuthoritativeDomainError)): + sys.stderr.write("while looking up '%s', got: %s\n" % (name, e)) + # If we didn't find an exact match for the name we were # seeking, check if it's within a subdomain we're supposed # to delegate to some other DNS server. @@ -234,7 +241,7 @@ class DelegatingQuotingBindAuthority(authority.BindAuthority): result = yield authority.BindAuthority._lookup(self, name, cls, dns.NS, timeout) defer.returnValue(result) - except (dns.DomainError, dns.AuthoritativeDomainError): + except Exception: # Should be one of (dns.DomainError, dns.AuthoritativeDomainError) pass # We didn't find a delegation, so return the original # NXDOMAIN. @@ -267,6 +274,9 @@ if '__main__' == __name__: r = DelegatingQuotingBindAuthority(zone) # This sucks, but if I want a generic zone file, I have to # reload the information by hand + # XXX: This causes our SOA record to contain + # (origin + "." + origin) + # As a result the resolver never believes it is authoritative. r.origin = origin lines = open(zone).readlines() lines = r.collapseContinuations(r.stripComments(lines))