diff --git a/jc/parsers/dig.py b/jc/parsers/dig.py index 217aeb1d..e26a85eb 100644 --- a/jc/parsers/dig.py +++ b/jc/parsers/dig.py @@ -185,7 +185,6 @@ def _process(proc_data): List of Dictionaries. Structured data to conform to the schema. """ - for entry in proc_data: int_list = ['id', 'query_num', 'answer_num', 'authority_num', 'additional_num', 'rcvd'] for key in int_list: @@ -204,6 +203,20 @@ def _process(proc_data): except (ValueError): ax['ttl'] = None + if 'opt_pseudosection' in entry: + if 'edns' in entry['opt_pseudosection']: + if 'version' in entry['opt_pseudosection']['edns']: + try: + entry['opt_pseudosection']['edns']['version'] = int(entry['opt_pseudosection']['edns']['version']) + except (ValueError): + entry['opt_pseudosection']['edns']['version'] = None + + if 'udp' in entry['opt_pseudosection']['edns']: + try: + entry['opt_pseudosection']['edns']['udp'] = int(entry['opt_pseudosection']['edns']['udp']) + except (ValueError): + entry['opt_pseudosection']['edns']['udp'] = None + if 'answer' in entry: for ans in entry['answer']: try: @@ -275,7 +288,25 @@ def _parse_opt_pseudosection(optline): # ;; OPT PSEUDOSECTION: # ; EDNS: version: 0, flags:; udp: 4096 # ; COOKIE: 1cbc06703eaef210 - return {} + if optline.startswith('; EDNS:'): + optline_list = optline.replace(',', ' ').split(';') + optline_first = optline_list[1] + optline_rest = optline_list[2] + _, _, ver, _, *flags = optline_first.split() + udp = optline_rest.split()[-1] + + return { + 'edns': { + 'version': ver, + 'flags': flags, + 'udp': udp + } + } + + elif optline.startswith('; COOKIE:'): + return { + 'cookie': optline.split()[2] + } def _parse_question(question): @@ -393,9 +424,9 @@ def parse(data, raw=False, quiet=False): output_entry.update(_parse_flags_line(line)) continue - # if line.startswith(';; OPT PSEUDOSECTION:'): - # section = 'opt_pseudosection' - # continue + if line.startswith(';; OPT PSEUDOSECTION:'): + section = 'opt_pseudosection' + continue if line.startswith(';; QUESTION SECTION:'): section = 'question' @@ -418,9 +449,11 @@ def parse(data, raw=False, quiet=False): output_entry.update({'axfr': axfr_list}) continue - # if section == 'opt_pseudosection': - # # output_entry.update(_parse_opt_pseudosection(line)) - # continue + if section == 'opt_pseudosection': + if 'opt_pseudosection' not in output_entry: + output_entry['opt_pseudosection'] = {} + output_entry['opt_pseudosection'].update(_parse_opt_pseudosection(line)) + continue if section == 'question': output_entry['question'] = _parse_question(line) @@ -460,6 +493,7 @@ def parse(data, raw=False, quiet=False): if output_entry: raw_output.append(output_entry) + elif line.startswith(';; XFR size:'): section = '' output_entry.update({'size': line.split(':')[1].lstrip()}) diff --git a/tests/fixtures/centos-7.7/dig-aaaa.json b/tests/fixtures/centos-7.7/dig-aaaa.json index 70b7e04c..49ed026a 100644 --- a/tests/fixtures/centos-7.7/dig-aaaa.json +++ b/tests/fixtures/centos-7.7/dig-aaaa.json @@ -1 +1 @@ -[{"id":25779,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":5,"data":"2607:f8b0:4000:808::2004"}],"query_time":28,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:12:53 PDT 2019","rcvd":71,"when_epoch":1572437573,"when_epoch_utc":null}] +[{"id":25779,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":5,"data":"2607:f8b0:4000:808::2004"}],"query_time":28,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:12:53 PDT 2019","rcvd":71,"when_epoch":1572437573,"when_epoch_utc":null}] diff --git a/tests/fixtures/centos-7.7/dig-x.json b/tests/fixtures/centos-7.7/dig-x.json index b71f5dd8..e880568c 100644 --- a/tests/fixtures/centos-7.7/dig-x.json +++ b/tests/fixtures/centos-7.7/dig-x.json @@ -1 +1 @@ -[{"id":36298,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":5,"data":"one.one.one.one."}],"query_time":32,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:13:36 PDT 2019","rcvd":78,"when_epoch":1572437616,"when_epoch_utc":null}] +[{"id":36298,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":5,"data":"one.one.one.one."}],"query_time":32,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:13:36 PDT 2019","rcvd":78,"when_epoch":1572437616,"when_epoch_utc":null}] diff --git a/tests/fixtures/centos-7.7/dig.json b/tests/fixtures/centos-7.7/dig.json index bf25b3c5..bbd52bdf 100644 --- a/tests/fixtures/centos-7.7/dig.json +++ b/tests/fixtures/centos-7.7/dig.json @@ -1 +1 @@ -[{"id":44295,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":2,"authority_num":0,"additional_num":1,"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":5,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":5,"data":"151.101.189.67"}],"query_time":25,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:13:22 PDT 2019","rcvd":95,"when_epoch":1572437602,"when_epoch_utc":null},{"id":34074,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":5,"data":"216.58.194.100"}],"query_time":25,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:13:22 PDT 2019","rcvd":59,"when_epoch":1572437602,"when_epoch_utc":null}] +[{"id":44295,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":2,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":5,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":5,"data":"151.101.189.67"}],"query_time":25,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:13:22 PDT 2019","rcvd":95,"when_epoch":1572437602,"when_epoch_utc":null},{"id":34074,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":5,"data":"216.58.194.100"}],"query_time":25,"server":"192.168.71.2#53(192.168.71.2)","when":"Wed Oct 30 05:13:22 PDT 2019","rcvd":59,"when_epoch":1572437602,"when_epoch_utc":null}] diff --git a/tests/fixtures/generic/dig-answer-spaces.json b/tests/fixtures/generic/dig-answer-spaces.json index 7a22b7e8..dd47bec0 100644 --- a/tests/fixtures/generic/dig-answer-spaces.json +++ b/tests/fixtures/generic/dig-answer-spaces.json @@ -1 +1 @@ -[{"id":26965,"opcode":"QUERY","status":"NXDOMAIN","flags":["qr","rd","ra"],"query_num":1,"answer_num":0,"authority_num":1,"additional_num":1,"question":{"name":"x.y.z.w.bl.spamcop.net.","class":"IN","type":"TXT"},"authority":[{"name":"bl.spamcop.net.","class":"IN","type":"SOA","ttl":0,"data":"bl.spamcop.net."}],"answer":[{"name":"x.y.z.w.bl.spamcop.net.","class":"IN","type":"TXT","ttl":2100,"data":"Blocked - see https://www.spamcop.net/bl.shtml?w.z.y.x"}],"query_time":297,"server":"192.168.1.254#53(192.168.1.254)","when":"Fri Feb 05 06:28:58 PST 2021","rcvd":104,"when_epoch":1612535338,"when_epoch_utc":null}] +[{"id":26965,"opcode":"QUERY","status":"NXDOMAIN","flags":["qr","rd","ra"],"query_num":1,"answer_num":0,"authority_num":1,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"x.y.z.w.bl.spamcop.net.","class":"IN","type":"TXT"},"authority":[{"name":"bl.spamcop.net.","class":"IN","type":"SOA","ttl":0,"data":"bl.spamcop.net."}],"answer":[{"name":"x.y.z.w.bl.spamcop.net.","class":"IN","type":"TXT","ttl":2100,"data":"Blocked - see https://www.spamcop.net/bl.shtml?w.z.y.x"}],"query_time":297,"server":"192.168.1.254#53(192.168.1.254)","when":"Fri Feb 05 06:28:58 PST 2021","rcvd":104,"when_epoch":1612535338,"when_epoch_utc":null}] diff --git a/tests/fixtures/osx-10.11.6/dig-aaaa.json b/tests/fixtures/osx-10.11.6/dig-aaaa.json index 676cd4ec..86ad708e 100644 --- a/tests/fixtures/osx-10.11.6/dig-aaaa.json +++ b/tests/fixtures/osx-10.11.6/dig-aaaa.json @@ -1 +1 @@ -[{"id":41369,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":197,"data":"2607:f8b0:4000:817::2004"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":71,"when_epoch":1576112257,"when_epoch_utc":null}] +[{"id":41369,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":197,"data":"2607:f8b0:4000:817::2004"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":71,"when_epoch":1576112257,"when_epoch_utc":null}] diff --git a/tests/fixtures/osx-10.11.6/dig-x.json b/tests/fixtures/osx-10.11.6/dig-x.json index 4e839bd0..9510b1d3 100644 --- a/tests/fixtures/osx-10.11.6/dig-x.json +++ b/tests/fixtures/osx-10.11.6/dig-x.json @@ -1 +1 @@ -[{"id":15549,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":1800,"data":"one.one.one.one."}],"query_time":34,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":78,"when_epoch":1576112257,"when_epoch_utc":null}] +[{"id":15549,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":1800,"data":"one.one.one.one."}],"query_time":34,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":78,"when_epoch":1576112257,"when_epoch_utc":null}] diff --git a/tests/fixtures/osx-10.11.6/dig.json b/tests/fixtures/osx-10.11.6/dig.json index 241009d2..0a739486 100644 --- a/tests/fixtures/osx-10.11.6/dig.json +++ b/tests/fixtures/osx-10.11.6/dig.json @@ -1 +1 @@ -[{"id":57483,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":5,"authority_num":0,"additional_num":1,"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":199,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.193.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.65.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.1.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.129.67"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":143,"when_epoch":1576112257,"when_epoch_utc":null},{"id":53268,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":194,"data":"172.217.9.164"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":59,"when_epoch":1576112257,"when_epoch_utc":null}] +[{"id":57483,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":5,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":199,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.193.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.65.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.1.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":13,"data":"151.101.129.67"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":143,"when_epoch":1576112257,"when_epoch_utc":null},{"id":53268,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":194,"data":"172.217.9.164"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:57:37 PST 2019","rcvd":59,"when_epoch":1576112257,"when_epoch_utc":null}] diff --git a/tests/fixtures/osx-10.14.6/dig-aaaa.json b/tests/fixtures/osx-10.14.6/dig-aaaa.json index a16d5b3a..702d730a 100644 --- a/tests/fixtures/osx-10.14.6/dig-aaaa.json +++ b/tests/fixtures/osx-10.14.6/dig-aaaa.json @@ -1 +1 @@ -[{"id":61441,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":63,"data":"2607:f8b0:4000:817::2004"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:50 PST 2019","rcvd":71,"when_epoch":1576112090,"when_epoch_utc":null}] +[{"id":61441,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":63,"data":"2607:f8b0:4000:817::2004"}],"query_time":30,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:50 PST 2019","rcvd":71,"when_epoch":1576112090,"when_epoch_utc":null}] diff --git a/tests/fixtures/osx-10.14.6/dig-x.json b/tests/fixtures/osx-10.14.6/dig-x.json index 1d625229..31841ee8 100644 --- a/tests/fixtures/osx-10.14.6/dig-x.json +++ b/tests/fixtures/osx-10.14.6/dig-x.json @@ -1 +1 @@ -[{"id":27071,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":1800,"data":"one.one.one.one."}],"query_time":39,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:51 PST 2019","rcvd":78,"when_epoch":1576112091,"when_epoch_utc":null}] +[{"id":27071,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":1800,"data":"one.one.one.one."}],"query_time":39,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:51 PST 2019","rcvd":78,"when_epoch":1576112091,"when_epoch_utc":null}] diff --git a/tests/fixtures/osx-10.14.6/dig.json b/tests/fixtures/osx-10.14.6/dig.json index 9fe53914..2e27c410 100644 --- a/tests/fixtures/osx-10.14.6/dig.json +++ b/tests/fixtures/osx-10.14.6/dig.json @@ -1 +1 @@ -[{"id":54065,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":5,"authority_num":0,"additional_num":1,"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":72,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.65.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.1.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.193.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.129.67"}],"query_time":41,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:50 PST 2019","rcvd":143,"when_epoch":1576112090,"when_epoch_utc":null},{"id":64484,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":64,"data":"172.217.12.68"}],"query_time":31,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:50 PST 2019","rcvd":59,"when_epoch":1576112090,"when_epoch_utc":null}] +[{"id":54065,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":5,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":72,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.65.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.1.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.193.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":1,"data":"151.101.129.67"}],"query_time":41,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:50 PST 2019","rcvd":143,"when_epoch":1576112090,"when_epoch_utc":null},{"id":64484,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":4096}},"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":64,"data":"172.217.12.68"}],"query_time":31,"server":"2600:1700:bab0:d40::1#53(2600:1700:bab0:d40::1)","when":"Wed Dec 11 16:54:50 PST 2019","rcvd":59,"when_epoch":1576112090,"when_epoch_utc":null}] diff --git a/tests/fixtures/ubuntu-18.04/dig-aaaa.json b/tests/fixtures/ubuntu-18.04/dig-aaaa.json index 1474d3e5..b9aa0dc3 100644 --- a/tests/fixtures/ubuntu-18.04/dig-aaaa.json +++ b/tests/fixtures/ubuntu-18.04/dig-aaaa.json @@ -1 +1 @@ -[{"id":45806,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":5,"data":"2607:f8b0:4000:812::2004"}],"query_time":39,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:04 UTC 2019","rcvd":71,"when_epoch":1572556864,"when_epoch_utc":1572531664}] +[{"id":45806,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":65494}},"question":{"name":"www.google.com.","class":"IN","type":"AAAA"},"answer":[{"name":"www.google.com.","class":"IN","type":"AAAA","ttl":5,"data":"2607:f8b0:4000:812::2004"}],"query_time":39,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:04 UTC 2019","rcvd":71,"when_epoch":1572556864,"when_epoch_utc":1572531664}] diff --git a/tests/fixtures/ubuntu-18.04/dig-x.json b/tests/fixtures/ubuntu-18.04/dig-x.json index d0ee3c31..dad1da6c 100644 --- a/tests/fixtures/ubuntu-18.04/dig-x.json +++ b/tests/fixtures/ubuntu-18.04/dig-x.json @@ -1 +1 @@ -[{"id":28514,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":5,"data":"one.one.one.one."}],"query_time":37,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:05 UTC 2019","rcvd":78,"when_epoch":1572556865,"when_epoch_utc":1572531665}] +[{"id":28514,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":65494}},"question":{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR"},"answer":[{"name":"1.1.1.1.in-addr.arpa.","class":"IN","type":"PTR","ttl":5,"data":"one.one.one.one."}],"query_time":37,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:05 UTC 2019","rcvd":78,"when_epoch":1572556865,"when_epoch_utc":1572531665}] diff --git a/tests/fixtures/ubuntu-18.04/dig.json b/tests/fixtures/ubuntu-18.04/dig.json index 7cef87a3..e2e0a2ce 100644 --- a/tests/fixtures/ubuntu-18.04/dig.json +++ b/tests/fixtures/ubuntu-18.04/dig.json @@ -1 +1 @@ -[{"id":52284,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":5,"authority_num":0,"additional_num":1,"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":5,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.65.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.1.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.193.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.129.67"}],"query_time":31,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:04 UTC 2019","rcvd":143,"when_epoch":1572556864,"when_epoch_utc":1572531664},{"id":47686,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":5,"data":"172.217.1.228"}],"query_time":32,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:04 UTC 2019","rcvd":59,"when_epoch":1572556864,"when_epoch_utc":1572531664}] +[{"id":52284,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":5,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":65494}},"question":{"name":"www.cnn.com.","class":"IN","type":"A"},"answer":[{"name":"www.cnn.com.","class":"IN","type":"CNAME","ttl":5,"data":"turner-tls.map.fastly.net."},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.65.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.1.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.193.67"},{"name":"turner-tls.map.fastly.net.","class":"IN","type":"A","ttl":4,"data":"151.101.129.67"}],"query_time":31,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:04 UTC 2019","rcvd":143,"when_epoch":1572556864,"when_epoch_utc":1572531664},{"id":47686,"opcode":"QUERY","status":"NOERROR","flags":["qr","rd","ra"],"query_num":1,"answer_num":1,"authority_num":0,"additional_num":1,"opt_pseudosection":{"edns":{"version":0,"flags":[],"udp":65494}},"question":{"name":"www.google.com.","class":"IN","type":"A"},"answer":[{"name":"www.google.com.","class":"IN","type":"A","ttl":5,"data":"172.217.1.228"}],"query_time":32,"server":"127.0.0.53#53(127.0.0.53)","when":"Thu Oct 31 14:21:04 UTC 2019","rcvd":59,"when_epoch":1572556864,"when_epoch_utc":1572531664}]