for child in root:
if len(child):
+ getstdout = False
for elem in child:
if elem.tag in ["failure", "error"]:
- confdirname = child.get("classname").split('_')[1].split('.')[0]
- confdir = os.path.join("configs", confdirname)
- recursorlog = os.path.join(confdir, "recursor.log")
- if os.path.exists(recursorlog):
- print("==============> %s <==============" % recursorlog)
- with open(recursorlog) as f:
- print(''.join(f.readlines()))
- authdirs = glob.glob(os.path.join(confdir, "auth-*"))
- for authdir in authdirs:
- authlog = os.path.join(authdir, "pdns.log")
+ cls = child.get("classname")
+ name = child.get("name")
+ if '_' not in cls or '.' not in cls:
+ print('Unexpected classname %s; name %s' % (cls, name))
+ getstdout = True
+ continue
+
+ confdirnames = [cls.split('_')[1].split('.')[0], cls.split('.')[1].split('Test')[0]]
+ for confdirname in confdirnames:
+ confdir = os.path.join("configs", confdirname)
+ recursorlog = os.path.join(confdir, "recursor.log")
if os.path.exists(recursorlog):
- print("==============> %s <==============" % authlog)
- with open(authlog) as f:
+ print("==============> %s <==============" % recursorlog)
+ with open(recursorlog) as f:
print(''.join(f.readlines()))
+ authdirs = glob.glob(os.path.join(confdir, "auth-*"))
+ for authdir in authdirs:
+ authlog = os.path.join(authdir, "pdns.log")
+ if os.path.exists(recursorlog):
+ print("==============> %s <==============" % authlog)
+ with open(authlog) as f:
+ print(''.join(f.readlines()))
+ if getstdout and elem.tag == 'system-out':
+ print("==============> STDOUT LOG FROM XML <==============")
+ print(elem.text)
+ print("==============> END STDOUT LOG FROM XML <==============")
+
-import dns
-import dnsmessage_pb2
import os
import socket
import struct
import sys
import threading
-import time
-
import dns
import dnstap_pb2
+from nose import SkipTest
+from recursortests import RecursorTest
FSTRM_CONTROL_ACCEPT = 0x01
FSTRM_CONTROL_START = 0x02
# Python2/3 compatibility hacks
try:
- from queue import Queue
+ from queue import Queue
except ImportError:
- from Queue import Queue
+ from Queue import Queue
try:
- range = xrange
+ range = xrange
except NameError:
- pass
+ pass
-from nose import SkipTest
-from recursortests import RecursorTest
def checkDnstapBase(testinstance, dnstap, protocol, initiator):
testinstance.assertTrue(dnstap)
testinstance.assertEquals(dnstap.message.response_port, 53)
-def checkDnstapQuery(testinstance, dnstap, protocol, query, initiator='127.0.0.1'):
+def checkDnstapQuery(testinstance, dnstap, protocol, initiator='127.0.0.1'):
testinstance.assertEquals(dnstap.message.type, dnstap_pb2.Message.RESOLVER_QUERY)
checkDnstapBase(testinstance, dnstap, protocol, initiator)
# We cannot compare the incoming query with the outgoing one
# The IDs and some other fields will be different
#
- wire_message = dns.message.from_wire(dnstap.message.query_message)
+ #wire_message = dns.message.from_wire(dnstap.message.query_message)
#testinstance.assertEqual(wire_message, query)
return t
-def fstrm_make_control_frame_reply(cft, data):
+def fstrm_make_control_frame_reply(cft):
if cft == FSTRM_CONTROL_READY:
# Reply with ACCEPT frame and content-type
contenttype = b'protobuf:dnstap.Dnstap'
(datalen,) = struct.unpack("!L", data)
data = conn.recv(datalen)
cft = fstrm_get_control_frame_type(data)
- reply = fstrm_make_control_frame_reply(cft, data)
+ reply = fstrm_make_control_frame_reply(cft)
if reply:
conn.send(reply)
return cft
-class DNSTapServerParams:
- def __init__(self, port):
- self.queue = Queue()
- self.port = port
+class DNSTapServerParams(object):
+ def __init__(self, path):
+ self.queue = Queue()
+ self.path = path
-DNSTapServerParameters = DNSTapServerParams(4243)
+DNSTapServerParameters = DNSTapServerParams("/tmp/dnstap.sock")
DNSTapListeners = []
class TestRecursorDNSTap(RecursorTest):
except socket.error as e:
if e.errno == 9:
break
- printf("Unexpected socket error %d", e)
+ sys.stderr.write("Unexpected socket error %s\n" % str(e))
sys.exit(1)
- conn.close()
+ except exception as e:
+ sys.stderr.write("Unexpected socket error %s\n" % str(e))
+ sys.exit(1)
+ conn.close()
@classmethod
def FrameStreamUnixListenerMain(cls, param):
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+ sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
try:
- sock.bind(("127.0.0.1", param.port))
+ try:
+ os.remove(param.path)
+ except:
+ pass
+ sock.bind(param.path)
+ sock.listen(100)
except socket.error as e:
- print("Error binding in the framestream listener: %s" % str(e))
+ sys.stderr.write("Error binding/listening in the framestream listener: %s\n" % str(e))
sys.exit(1)
DNSTapListeners.append(sock)
- sock.listen(100)
while True:
- (conn, _) = sock.accept()
- print("Accepting connection")
- listener = threading.Thread(name='DNSTap Worker', target=cls.FrameStreamUnixListener, args=[conn, param])
- listener.setDaemon(True)
- listener.start()
-
+ try:
+ (conn, addr) = sock.accept()
+ listener = threading.Thread(name='DNSTap Worker', target=cls.FrameStreamUnixListener, args=[conn, param])
+ listener.setDaemon(True)
+ listener.start()
+ except socket.error as e:
+ if e.errno != 9:
+ sys.stderr.write("Socket error on accept: %s\n" % str(e))
+ else:
+ break
sock.close()
@classmethod
def setUpClass(cls):
-
- if os.environ.get("NODNSTAPTESTS") == "1":
- raise SkipTest("Not Yet Supported")
+ if os.environ.get("NODNSTAPTESTS") == "1":
+ raise SkipTest("Not Yet Supported")
cls.setUpSockets()
listener.setDaemon(True)
listener.start()
-
confdir = os.path.join('configs', cls._confdir)
cls.createConfigDir(confdir)
_config_template = """
auth-zones=example=configs/%s/example.zone""" % _confdir
_lua_config_file = """
- dnstapFrameStreamServer({"127.0.0.1:%d"})
- """ % (DNSTapServerParameters.port)
+dnstapFrameStreamServer({"%s"})
+ """ % DNSTapServerParameters.path
def getFirstDnstap(self):
- data = DNSTapServerParameters.queue.get(True, timeout=2.0)
+ try:
+ data = DNSTapServerParameters.queue.get(True, timeout=2.0)
+ except:
+ data = False
self.assertTrue(data)
dnstap = dnstap_pb2.Dnstap()
dnstap.ParseFromString(data)
return dnstap
def testA(self):
-
name = 'www.example.org.'
query = dns.message.make_query(name, 'A', want_dnssec=True)
query.flags |= dns.flags.RD
res = self.sendUDPQuery(query)
-
- # check the DNSTap messages corresponding to the UDP query and answer
+ self.assertNotEquals(res, None)
+
# check the dnstap message corresponding to the UDP query
dnstap = self.getFirstDnstap()
- checkDnstapQuery(self, dnstap, dnstap_pb2.UDP, query, '127.0.0.8')
+ checkDnstapQuery(self, dnstap, dnstap_pb2.UDP, '127.0.0.8')
# We don't expect a response
checkDnstapNoExtra(self, dnstap)
_config_template = """
auth-zones=example=configs/%s/example.zone""" % _confdir
_lua_config_file = """
- dnstapFrameStreamServer({"127.0.0.1:%d"}, {logQueries=false})
- """ % (DNSTapServerParameters.port)
+dnstapFrameStreamServer({"%s"}, {logQueries=false})
+ """ % (DNSTapServerParameters.path)
def testA(self):
name = 'www.example.org.'
query = dns.message.make_query(name, 'A', want_dnssec=True)
query.flags |= dns.flags.RD
res = self.sendUDPQuery(query)
+ self.assertNotEquals(res, None)
# We don't expect anything
self.assertTrue(DNSTapServerParameters.queue.empty())
-
projects / pdns / commitdiff