From 8390ae48c88ab1c7d5acbf40c0e60606953817bd Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Thu, 15 Apr 2021 16:53:03 -0700 Subject: [PATCH] fix server entry when IPv6 address is in value (maxsplit on colons) --- jc/parsers/dig.py | 4 ++-- tests/fixtures/osx-10.11.6/dig-aaaa.json | 2 +- tests/fixtures/osx-10.11.6/dig-x.json | 2 +- tests/fixtures/osx-10.11.6/dig.json | 2 +- tests/fixtures/osx-10.14.6/dig-aaaa.json | 2 +- tests/fixtures/osx-10.14.6/dig-x.json | 2 +- tests/fixtures/osx-10.14.6/dig.json | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jc/parsers/dig.py b/jc/parsers/dig.py index 2cc55c2e..67c7fea2 100644 --- a/jc/parsers/dig.py +++ b/jc/parsers/dig.py @@ -396,7 +396,7 @@ import jc.utils class info(): """Provides parser metadata (version, author, etc.)""" - version = '1.7' + version = '1.8' description = '`dig` command parser' author = 'Kelly Brazil' author_email = 'kellyjonbrazil@gmail.com' @@ -678,7 +678,7 @@ def parse(data, raw=False, quiet=False): # footer line 2 if line.startswith(';; SERVER:'): - output_entry.update({'server': line.split(':')[1].lstrip()}) + output_entry.update({'server': line.split(':', maxsplit=1)[1].lstrip()}) continue # footer line 3 diff --git a/tests/fixtures/osx-10.11.6/dig-aaaa.json b/tests/fixtures/osx-10.11.6/dig-aaaa.json index c652d512..676cd4ec 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","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,"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 30225102..4e839bd0 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","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,"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 1d151b57..241009d2 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","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","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,"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}] diff --git a/tests/fixtures/osx-10.14.6/dig-aaaa.json b/tests/fixtures/osx-10.14.6/dig-aaaa.json index 3dc515b3..a16d5b3a 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","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,"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 2d6aedaa..1d625229 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","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,"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 f2414abb..9fe53914 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","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","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,"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}]