from twisted.names import dns
from twisted.names import common
from twisted.names import authority
+from twisted.names import resolve
from twisted.internet import defer
from twisted.python import failure
if value:
ip = value.ip
else:
- value = invirt.database.Machine.query().filter_by(name=host).first()
+ value = invirt.database.Machine.query.filter_by(name=host).first()
if value:
ip = value.nics[0].ip
else:
deferredResult = defer.succeed(([], nsResults, nsAdditional))
return deferredResult
+class TypeLenientResolverChain(resolve.ResolverChain):
+ """
+ This is a ResolverChain which is more lenient in its handling of
+ queries requesting unimplemented record types.
+ """
+
+ def query(self, query, timeout = None):
+ try:
+ return self.typeToMethod[query.type](str(query.name), timeout)
+ except KeyError, e:
+ # We don't support the requested record type. Twisted would
+ # have us return SERVFAIL. Instead, we'll check whether the
+ # name exists in our zone at all and return NXDOMAIN or an empty
+ # result set with NOERROR as appropriate.
+ deferredResult = self.lookupAllRecords(str(query.name), timeout)
+ if isinstance(deferredResult.result, failure.Failure):
+ return deferredResult
+ return defer.succeed(([], [], []))
+
if '__main__' == __name__:
resolvers = []
try:
resolvers.append(DatabaseAuthority())
verbosity = 0
- f = server.DNSServerFactory(authorities=resolvers, verbose=verbosity)
+ f = server.DNSServerFactory(verbose=verbosity)
+ f.resolver = TypeLenientResolverChain(resolvers)
p = dns.DNSDatagramProtocol(f)
f.noisy = p.noisy = verbosity