From c1e794366f303495ceb9de4403648a7ae81f84c9 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Tue, 5 Oct 2021 09:35:04 +0200 Subject: [PATCH] WHOIS: enhance detection, avoiding false positives (#1320) We are interested only in the domain name required, not in the long reply. --- src/lib/protocols/whoisdas.c | 27 ++++++++++++--------------- tests/pcap/whois.pcapng | Bin 0 -> 7348 bytes tests/result/whois.pcapng.out | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 tests/pcap/whois.pcapng create mode 100644 tests/result/whois.pcapng.out diff --git a/src/lib/protocols/whoisdas.c b/src/lib/protocols/whoisdas.c index 530b7418b..ed30de9e2 100644 --- a/src/lib/protocols/whoisdas.c +++ b/src/lib/protocols/whoisdas.c @@ -33,24 +33,21 @@ void ndpi_search_whois_das(struct ndpi_detection_module_struct *ndpi_struct, str if(packet->tcp != NULL) { u_int16_t sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest); - if(((sport == 43) || (dport == 43)) || ((sport == 4343) || (dport == 4343))) { + if((((sport == 43) || (dport == 43)) || ((sport == 4343) || (dport == 4343))) && + packet->payload_packet_len > 2 && + packet->payload[packet->payload_packet_len - 2] == '\r' && + packet->payload[packet->payload_packet_len - 1] == '\n') { + + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHOIS_DAS, NDPI_PROTOCOL_UNKNOWN); - if(packet->payload_packet_len > 0) { - - u_int max_len = sizeof(flow->host_server_name) - 1; - u_int i, j; + if((dport == 43) || (dport == 4343)) { /* Request */ + u_int hostname_len = ndpi_min(sizeof(flow->host_server_name) - 1, (long unsigned int)packet->payload_packet_len - 2); /* Skip \r\n */ - for(i=strlen((const char *)flow->host_server_name), j=0; (ipayload_packet_len); i++, j++) { - if((packet->payload[j] == '\n') || (packet->payload[j] == '\r')) break; - flow->host_server_name[i] = packet->payload[j]; - } - - flow->host_server_name[i] = '\0'; - - NDPI_LOG_INFO(ndpi_struct, "[WHOIS/DAS] %s\n", flow->host_server_name); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHOIS_DAS, NDPI_PROTOCOL_UNKNOWN); - return; + memcpy(flow->host_server_name, &packet->payload[0], hostname_len); + flow->host_server_name[hostname_len] = '\0'; + NDPI_LOG_INFO(ndpi_struct, "[WHOIS/DAS] %s\n", flow->host_server_name); } + return; } } diff --git a/tests/pcap/whois.pcapng b/tests/pcap/whois.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..81305af1096213ea6288e54b9deb3b5791275d37 GIT binary patch literal 7348 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 literal 0 HcmV?d00001 diff --git a/tests/result/whois.pcapng.out b/tests/result/whois.pcapng.out new file mode 100644 index 000000000..8504e89ee --- /dev/null +++ b/tests/result/whois.pcapng.out @@ -0,0 +1,15 @@ +Guessed flow protos: 1 + +DPI Packets (TCP): 16 (5.33 pkts/flow) + +TLS 7 2046 1 +Whois-DAS 16 4294 2 + +JA3 Host Stats: + IP Address # JA3C + 1 10.17.34.139 1 + + + 1 TCP 192.30.45.30:43 -> 10.160.63.128:53217 [VLAN: 1908][proto: 170/Whois-DAS][ClearText][cat: Network/14][5 pkts/3410 bytes -> 0 pkts/0 bytes][Goodput ratio: 91/0][0.33 sec][PLAIN TEXT ( Domain Name)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,0,0,0,0,0,0,0,0] + 2 TCP 10.17.34.139:64016 <-> 10.17.51.8:4343 [VLAN: 1603][proto: 91/TLS][Encrypted][cat: Web/5][4 pkts/628 bytes <-> 3 pkts/1418 bytes][Goodput ratio: 54/86][0.24 sec][ALPN: h2;http/1.1][bytes ratio: -0.386 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/229 74/229 222/229 105/0][Pkt Len c2s/s2c min/avg/max/stddev: 86/70 157/473 228/1278 71/569][Risk: ** Known protocol on non standard port **** SNI TLS extension was missing **][Risk Score: 60][TLSv1.2][JA3C: 5f48063f9f3a827056ccdabadcc3886a][JA3S: 649d6810e8392f63dc311eecb6b7098b][Issuer: CN=10.17.51.7][Subject: CN=10.17.51.7, CN=10.17.51.7][Certificate SHA-1: DD:4E:28:9B:08:C1:D5:63:D1:B6:FC:DD:FD:91:A9:D4:E3:A8:7F:D5][Firefox][Validity: 2017-11-14 08:00:00 - 2022-11-13 08:00:00][Cipher: TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384][Plen Bins: 0,0,0,0,0,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0] + 3 TCP 10.0.2.15:44188 <-> 192.0.47.59:43 [proto: 170/Whois-DAS][ClearText][cat: Network/14][6 pkts/357 bytes <-> 5 pkts/527 bytes][Goodput ratio: 4/44][0.30 sec][Host: example.com][bytes ratio: -0.192 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/119 60/60 120/119 50/60][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 60/105 74/287 8/91][PLAIN TEXT (example.com)][Plen Bins: 50,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]