Skip to content

Commit 2fb7595

Browse files
PavelKopeckyPavelKopecky
authored
Merge branch 'master' into api-log-transport
2 parents 1521bb7 + 91e9dfe commit 2fb7595

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

‎src/command/handlers/dig/classic.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export type DnsParseResponseJson = DnsParseLoopResponseJson & {
2828
rawOutput: string;
2929
};
3030

31-
const QUERY_TIME_REG_EXP = /Query\s+time:\s+(\d+)/g;
32-
const RESOLVER_REG_EXP = /SERVER:.*\((.*?)\)/g;
33-
const STATUS_CODE_NAME_REG_EXP = /status:\s*([A-Z]+)/g;
31+
const QUERY_TIME_REG_EXP = /Query\s+time:\s+(\d+)/;
32+
const RESOLVER_REG_EXP = /SERVER:.*?\((.*?)\)/;
33+
const STATUS_CODE_NAME_REG_EXP = /status:\s*([A-Z]+)/;
3434

3535
export const ClassicDigParser = {
3636
rewrite (rawOutput: string): string {

‎src/command/handlers/dig/shared.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export type DnsParseLoopResponseJson = {
2626

2727
export const isDnsSection = (output: unknown): output is DnsSection => typeof (output as DnsSection) !== 'undefined';
2828

29-
export const SECTION_REG_EXP = /(;; )(\S+)( SECTION:)/g;
29+
export const SECTION_REG_EXP = /(;; )(\S+)( SECTION:)/;
3030
export const NEW_LINE_REG_EXP = /\r?\n/;
3131
export const IP_REG_EXP = ipRegex();
3232

‎test/mocks/ipv6-dns-success-ip.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"rawOutput": "; <<>> DiG 9.18.18-0ubuntu0.22.04.2-Ubuntu <<>> -x 2a00:1450:4026:802::200e @2606:4700:4700::1111 -p 53 -6 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 47787\n;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 1232\n; NSID: 37 39 6d 32 31 37 (\"79m217\")\n;; QUESTION SECTION:\n;e.0.0.2.0.0.0.0.0.0.0.0.0.0.0.0.2.0.8.0.6.2.0.4.0.5.4.1.0.0.a.2.ip6.arpa. IN PTR\n\n;; ANSWER SECTION:\ne.0.0.2.0.0.0.0.0.0.0.0.0.0.0.0.2.0.8.0.6.2.0.4.0.5.4.1.0.0.a.2.ip6.arpa. 85385 IN PTR hem09s02-in-x0e.1e100.net.\n\n;; Query time: 0 msec\n;; SERVER: 2606:4700:4700::1111#53(2606:4700:4700::1111) (UDP)\n;; WHEN: Tue May 14 17:36:02 UTC 2024\n;; MSG SIZE rcvd: 150\n",
14-
"resolver": "UDP",
14+
"resolver": "2606:4700:4700::1111",
1515
"status": "finished",
1616
"statusCode": 0,
1717
"statusCodeName": "NOERROR",

‎test/mocks/ipv6-resolver-dns-success.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"timings": {
1919
"total": 0
2020
},
21-
"resolver": "UDP"
21+
"resolver": "2606:4700:4700::1111"
2222
}
2323
}

‎test/snapshots/command/dns-command.test.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"measurementId": "",
1818
"result": {
1919
"status": "finished",
20+
"rawOutput": "\n; <<>> DiG 9.18.18-0ubuntu0.22.04.2-Ubuntu <<>> -t ANY . @8.8.8.8 -p 53 -4 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 44640\n;; flags: qr rd ra ad; QUERY: 1, ANSWER: 14, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 512\n; NSID: 67 70 64 6e 73 2d 68 65 6d (\"gpdns-hem\")\n;; QUESTION SECTION:\n;.\t\t\t\tIN\tANY\n\n;; ANSWER SECTION:\n.\t\t\t15070\tIN\tNS\ta.root-servers.net.\n.\t\t\t15070\tIN\tNS\tb.root-servers.net.\n.\t\t\t15070\tIN\tNS\tc.root-servers.net.\n.\t\t\t15070\tIN\tNS\td.root-servers.net.\n.\t\t\t15070\tIN\tNS\te.root-servers.net.\n.\t\t\t15070\tIN\tNS\tf.root-servers.net.\n.\t\t\t15070\tIN\tNS\tg.root-servers.net.\n.\t\t\t15070\tIN\tNS\th.root-servers.net.\n.\t\t\t15070\tIN\tNS\ti.root-servers.net.\n.\t\t\t15070\tIN\tNS\tj.root-servers.net.\n.\t\t\t15070\tIN\tNS\tk.root-servers.net.\n.\t\t\t15070\tIN\tNS\tl.root-servers.net.\n.\t\t\t15070\tIN\tNS\tm.root-servers.net.\n.\t\t\t15070\tIN\tRRSIG\tNS 8 0 518400 20240410170000 20240328160000 30903 . XY2pZ3+Yhfv8fWzXr0ed40ZxJnUsniDzwqntUEF0jCTyfbq1lluUcBQrAv2BF/MUNm2WJw5dyz9V1B8SENYM5bcnyj5LfKLqMzF9jLydFSyNTghUmZuRme2cEbbR3vsR3/9bHO9oR1QDh5BRKZLqvzAXGt8rX/U7YJg/gAzst9OCsEDXlfGgn9GcwP5RIgBGj9vCAD3a5+PvRUf/mhHSPDd7p3KONCigm3ye+02Pjd/5gC0eNCOJcMGCzBJ+O+G3tnQ4S6J17Z1nex5adRL21pwUOVjDAGsZME+w3A2/uqhSy1gVj3vda1URGZTffWWqb5910MQqHNpp1x1Ay1BTkA==\n\n;; Query time: 0 msec\n;; SERVER: 8.8.8.8#53(8.8.8.8) (TCP)\n;; WHEN: Fri Mar 29 14:13:13 UTC 2024\n;; MSG SIZE rcvd: 538\n",
2021
"statusCodeName": "NOERROR",
2122
"statusCode": 0,
22-
"rawOutput": "\n; <<>> DiG 9.18.18-0ubuntu0.22.04.2-Ubuntu <<>> -t ANY . @8.8.8.8 -p 53 -4 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 44640\n;; flags: qr rd ra ad; QUERY: 1, ANSWER: 14, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 512\n; NSID: 67 70 64 6e 73 2d 68 65 6d (\"gpdns-hem\")\n;; QUESTION SECTION:\n;.\t\t\t\tIN\tANY\n\n;; ANSWER SECTION:\n.\t\t\t15070\tIN\tNS\ta.root-servers.net.\n.\t\t\t15070\tIN\tNS\tb.root-servers.net.\n.\t\t\t15070\tIN\tNS\tc.root-servers.net.\n.\t\t\t15070\tIN\tNS\td.root-servers.net.\n.\t\t\t15070\tIN\tNS\te.root-servers.net.\n.\t\t\t15070\tIN\tNS\tf.root-servers.net.\n.\t\t\t15070\tIN\tNS\tg.root-servers.net.\n.\t\t\t15070\tIN\tNS\th.root-servers.net.\n.\t\t\t15070\tIN\tNS\ti.root-servers.net.\n.\t\t\t15070\tIN\tNS\tj.root-servers.net.\n.\t\t\t15070\tIN\tNS\tk.root-servers.net.\n.\t\t\t15070\tIN\tNS\tl.root-servers.net.\n.\t\t\t15070\tIN\tNS\tm.root-servers.net.\n.\t\t\t15070\tIN\tRRSIG\tNS 8 0 518400 20240410170000 20240328160000 30903 . XY2pZ3+Yhfv8fWzXr0ed40ZxJnUsniDzwqntUEF0jCTyfbq1lluUcBQrAv2BF/MUNm2WJw5dyz9V1B8SENYM5bcnyj5LfKLqMzF9jLydFSyNTghUmZuRme2cEbbR3vsR3/9bHO9oR1QDh5BRKZLqvzAXGt8rX/U7YJg/gAzst9OCsEDXlfGgn9GcwP5RIgBGj9vCAD3a5+PvRUf/mhHSPDd7p3KONCigm3ye+02Pjd/5gC0eNCOJcMGCzBJ+O+G3tnQ4S6J17Z1nex5adRL21pwUOVjDAGsZME+w3A2/uqhSy1gVj3vda1URGZTffWWqb5910MQqHNpp1x1Ay1BTkA==\n\n;; Query time: 0 msec\n;; SERVER: 8.8.8.8#53(8.8.8.8) (TCP)\n;; WHEN: Fri Mar 29 14:13:13 UTC 2024\n;; MSG SIZE rcvd: 538\n",
2323
"answers": [
2424
{
2525
"name": ".",
@@ -123,7 +123,7 @@
123123
"timings": {
124124
"total": 0
125125
},
126-
"resolver": "TCP"
126+
"resolver": "8.8.8.8"
127127
}
128128
}
129129
],
@@ -204,7 +204,7 @@
204204
"timings": {
205205
"total": 39
206206
},
207-
"resolver": "UDP"
207+
"resolver": "8.8.8.8"
208208
}
209209
}
210210
],
@@ -300,9 +300,9 @@
300300
"measurementId": "",
301301
"result": {
302302
"status": "finished",
303+
"rawOutput": "\n; <<>> DiG 9.18.18-0ubuntu0.22.04.2-Ubuntu <<>> -t ANY com @8.8.8.8 -p 53 -4 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 59746\n;; flags: qr rd ra ad; QUERY: 1, ANSWER: 21, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 512\n; NSID: 67 70 64 6e 73 2d 68 65 6d (\"gpdns-hem\")\n;; QUESTION SECTION:\n;com.\t\t\t\tIN\tANY\n\n;; ANSWER SECTION:\ncom.\t\t\t900\tIN\tSOA\ta.gtld-servers.net. nstld.verisign-grs.com. 1711721573 1800 900 604800 86400\ncom.\t\t\t900\tIN\tRRSIG\tSOA 13 1 900 20240405141253 20240329130253 4534 com. VBJQHfJkV2trLEb9R8FQmORbiXmkTvh8TF1DtRejoVea9D/28IyK3B1S0F/7gw0Lji4e2Knc6XVB9xMzBT1xSQ==\ncom.\t\t\t21600\tIN\tNS\tc.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tf.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tj.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tk.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\th.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tg.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tl.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\ta.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\td.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tm.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\ti.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\te.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tb.gtld-servers.net.\ncom.\t\t\t21600\tIN\tRRSIG\tNS 13 1 172800 20240403042457 20240327031457 4534 com. BTthlIO4wotddrVE6K6IKlLYizK4q2lqjRXEwaBMuGT3ay183goxYEDJgY6fgL0dplgSEeihnqIP4Aihf/7Onw==\ncom.\t\t\t21600\tIN\tDNSKEY\t256 3 13 5i9qjJgyH+9MBz7VO269/srLQB/xRRllyUoVq8oLBZshPe4CGzDSFGnXAM3L/QPzB9ULpJuuy7jcxmBZ5Ebo7A==\ncom.\t\t\t21600\tIN\tDNSKEY\t257 3 13 tx8EZRAd2+K/DJRV0S+hbBzaRPS/G6JVNBitHzqpsGlz8huE61Ms9ANe6NSDLKJtiTBqfTJWDAywEp1FCsEINQ==\ncom.\t\t\t21600\tIN\tRRSIG\tDNSKEY 13 1 86400 20240412140235 20240328135735 19718 com. pdvNVFw7YYg074DdzOpmfqwkcJ6GfsUCXcHWu7SJ1PQ87PsL/Zx1Fvxi9zzIW730C+7+zn1Htaeg/X6c3yJVrg==\ncom.\t\t\t21600\tIN\tNSEC3PARAM 1 0 0 -\ncom.\t\t\t21600\tIN\tRRSIG\tNSEC3PARAM 13 1 86400 20240403042457 20240327031457 4534 com. AWXEeJpPUZ0lUqG+MBmKm6C5aHeJthc55eR5Y5nybJ071AcJj7Kcws/0IwdjckE3mwUoYt4kV4AbN7RJiP2URg==\n\n;; Query time: 119 msec\n;; SERVER: 8.8.8.8#53(8.8.8.8) (TCP)\n;; WHEN: Fri Mar 29 14:13:13 UTC 2024\n;; MSG SIZE rcvd: 897\n",
303304
"statusCodeName": "NOERROR",
304305
"statusCode": 0,
305-
"rawOutput": "\n; <<>> DiG 9.18.18-0ubuntu0.22.04.2-Ubuntu <<>> -t ANY com @8.8.8.8 -p 53 -4 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 59746\n;; flags: qr rd ra ad; QUERY: 1, ANSWER: 21, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 512\n; NSID: 67 70 64 6e 73 2d 68 65 6d (\"gpdns-hem\")\n;; QUESTION SECTION:\n;com.\t\t\t\tIN\tANY\n\n;; ANSWER SECTION:\ncom.\t\t\t900\tIN\tSOA\ta.gtld-servers.net. nstld.verisign-grs.com. 1711721573 1800 900 604800 86400\ncom.\t\t\t900\tIN\tRRSIG\tSOA 13 1 900 20240405141253 20240329130253 4534 com. VBJQHfJkV2trLEb9R8FQmORbiXmkTvh8TF1DtRejoVea9D/28IyK3B1S0F/7gw0Lji4e2Knc6XVB9xMzBT1xSQ==\ncom.\t\t\t21600\tIN\tNS\tc.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tf.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tj.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tk.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\th.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tg.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tl.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\ta.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\td.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tm.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\ti.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\te.gtld-servers.net.\ncom.\t\t\t21600\tIN\tNS\tb.gtld-servers.net.\ncom.\t\t\t21600\tIN\tRRSIG\tNS 13 1 172800 20240403042457 20240327031457 4534 com. BTthlIO4wotddrVE6K6IKlLYizK4q2lqjRXEwaBMuGT3ay183goxYEDJgY6fgL0dplgSEeihnqIP4Aihf/7Onw==\ncom.\t\t\t21600\tIN\tDNSKEY\t256 3 13 5i9qjJgyH+9MBz7VO269/srLQB/xRRllyUoVq8oLBZshPe4CGzDSFGnXAM3L/QPzB9ULpJuuy7jcxmBZ5Ebo7A==\ncom.\t\t\t21600\tIN\tDNSKEY\t257 3 13 tx8EZRAd2+K/DJRV0S+hbBzaRPS/G6JVNBitHzqpsGlz8huE61Ms9ANe6NSDLKJtiTBqfTJWDAywEp1FCsEINQ==\ncom.\t\t\t21600\tIN\tRRSIG\tDNSKEY 13 1 86400 20240412140235 20240328135735 19718 com. pdvNVFw7YYg074DdzOpmfqwkcJ6GfsUCXcHWu7SJ1PQ87PsL/Zx1Fvxi9zzIW730C+7+zn1Htaeg/X6c3yJVrg==\ncom.\t\t\t21600\tIN\tNSEC3PARAM 1 0 0 -\ncom.\t\t\t21600\tIN\tRRSIG\tNSEC3PARAM 13 1 86400 20240403042457 20240327031457 4534 com. AWXEeJpPUZ0lUqG+MBmKm6C5aHeJthc55eR5Y5nybJ071AcJj7Kcws/0IwdjckE3mwUoYt4kV4AbN7RJiP2URg==\n\n;; Query time: 119 msec\n;; SERVER: 8.8.8.8#53(8.8.8.8) (TCP)\n;; WHEN: Fri Mar 29 14:13:13 UTC 2024\n;; MSG SIZE rcvd: 897\n",
306306
"answers": [
307307
{
308308
"name": "com.",
@@ -455,7 +455,7 @@
455455
"timings": {
456456
"total": 119
457457
},
458-
"resolver": "TCP"
458+
"resolver": "8.8.8.8"
459459
}
460460
}
461461
],
@@ -975,9 +975,9 @@
975975
"measurementId": "",
976976
"result": {
977977
"status": "finished",
978+
"rawOutput": "\n; <<>> DiG 9.18.12-0ubuntu0.22.04.3-Ubuntu <<>> -t HTTPS www.jsdelivr.com @8.8.8.8 -p 53 -4 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 56257\n;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 512\n; NSID: 67 70 64 6e 73 2d 61 72 6e (\"gpdns-arn\")\n;; QUESTION SECTION:\n;www.jsdelivr.com.\t\tIN\tHTTPS\n\n;; ANSWER SECTION:\nwww.jsdelivr.com.\t300\tIN\tHTTPS\t1 . alpn=\"h3,h2\" ipv4hint=104.21.23.24,172.67.208.113 ipv6hint=2606:4700:3035::6815:1718,2606:4700:3037::ac43:d071\n\n;; Query time: 27 msec\n;; SERVER: 8.8.8.8#53(8.8.8.8) (UDP)\n;; WHEN: Tue Jan 30 09:18:43 UTC 2024\n;; MSG SIZE rcvd: 131\n",
978979
"statusCodeName": "NOERROR",
979980
"statusCode": 0,
980-
"rawOutput": "\n; <<>> DiG 9.18.12-0ubuntu0.22.04.3-Ubuntu <<>> -t HTTPS www.jsdelivr.com @8.8.8.8 -p 53 -4 +timeout=3 +tries=2 +nocookie +nosplit +nsid\n;; global options: +cmd\n;; Got answer:\n;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 56257\n;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1\n\n;; OPT PSEUDOSECTION:\n; EDNS: version: 0, flags:; udp: 512\n; NSID: 67 70 64 6e 73 2d 61 72 6e (\"gpdns-arn\")\n;; QUESTION SECTION:\n;www.jsdelivr.com.\t\tIN\tHTTPS\n\n;; ANSWER SECTION:\nwww.jsdelivr.com.\t300\tIN\tHTTPS\t1 . alpn=\"h3,h2\" ipv4hint=104.21.23.24,172.67.208.113 ipv6hint=2606:4700:3035::6815:1718,2606:4700:3037::ac43:d071\n\n;; Query time: 27 msec\n;; SERVER: 8.8.8.8#53(8.8.8.8) (UDP)\n;; WHEN: Tue Jan 30 09:18:43 UTC 2024\n;; MSG SIZE rcvd: 131\n",
981981
"answers": [
982982
{
983983
"name": "www.jsdelivr.com.",
@@ -990,7 +990,7 @@
990990
"timings": {
991991
"total": 27
992992
},
993-
"resolver": "UDP"
993+
"resolver": "8.8.8.8"
994994
}
995995
}
996996
]

0 commit comments

Comments
 (0)