From d59f0327a592d6cedfdd29eacb5356abdda9388d Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 7 Feb 2022 18:05:23 +0100 Subject: [PATCH] Improved MDNS/LLMNR detection. (#1437) * Checking for port 5353/5355 is not enough. * Added additional multicast address and header checks. Signed-off-by: Toni Uhlig --- src/lib/protocols/dns.c | 33 ++++++++++++++++++++++++++++++ tests/pcap/dnscrypt-v2.pcap | Bin 0 -> 4420 bytes tests/result/dnscrypt-v2.pcap.out | 10 +++++++++ 3 files changed, 43 insertions(+) create mode 100644 tests/pcap/dnscrypt-v2.pcap create mode 100644 tests/result/dnscrypt-v2.pcap.out diff --git a/src/lib/protocols/dns.c b/src/lib/protocols/dns.c index 96b1f5da7..847fc5f24 100644 --- a/src/lib/protocols/dns.c +++ b/src/lib/protocols/dns.c @@ -119,6 +119,26 @@ static u_int16_t checkPort(u_int16_t port) { /* *********************************************** */ +static int isMDNSMulticastAddress(struct ndpi_packet_struct * const packet) +{ + return (packet->iph && ntohl(packet->iph->daddr) == 0xE00000FB /* multicast: 224.0.0.251 */) || + (packet->iphv6 && ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[0]) == 0xFF020000 && + ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[1]) == 0x00000000 && + ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[2]) == 0x00000000 && + ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[3]) == 0x000000FB /* multicast: FF02::FB */); +} + +static int isLLMNRMulticastAddress(struct ndpi_packet_struct *const packet) +{ + return (packet->iph && ntohl(packet->iph->daddr) == 0xE00000FC /* multicast: 224.0.0.252 */) || + (packet->iphv6 && ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[0]) == 0xFF020000 && + ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[1]) == 0x00000000 && + ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[2]) == 0x00000000 && + ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[3]) == 0x00010003 /* multicast: FF02::1:3 */); +} + +/* *********************************************** */ + static u_int16_t checkDNSSubprotocol(u_int16_t sport, u_int16_t dport) { u_int16_t rc = checkPort(sport); @@ -354,6 +374,19 @@ static void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, st s_port = ntohs(packet->udp->source); d_port = ntohs(packet->udp->dest); payload_offset = 0; + + /* For MDNS/LLMNR: If the packet is not a response, dest addr needs to be multicast. */ + if ((d_port == MDNS_PORT && isMDNSMulticastAddress(packet) == 0) || + (d_port == LLMNR_PORT && isLLMNRMulticastAddress(packet) == 0)) + { + if (packet->payload_packet_len > 5 && + ntohs(get_u_int16_t(packet->payload, 2)) != 0 && + ntohs(get_u_int16_t(packet->payload, 4)) != 0) + { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + } } else if(packet->tcp != NULL) /* pkt size > 512 bytes */ { s_port = ntohs(packet->tcp->source); d_port = ntohs(packet->tcp->dest); diff --git a/tests/pcap/dnscrypt-v2.pcap b/tests/pcap/dnscrypt-v2.pcap new file mode 100644 index 0000000000000000000000000000000000000000..676ab73a3370d508e8e3fcd0618bd0f90265e3a5 GIT binary patch literal 4420 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 Qc;@!)d=#~ar0=MI0lHgaaR2}S literal 0 HcmV?d00001 diff --git a/tests/result/dnscrypt-v2.pcap.out b/tests/result/dnscrypt-v2.pcap.out new file mode 100644 index 000000000..5b0cd7915 --- /dev/null +++ b/tests/result/dnscrypt-v2.pcap.out @@ -0,0 +1,10 @@ +Guessed flow protos: 0 + +DPI Packets (UDP): 6 (2.00 pkts/flow) +Confidence DPI : 3 (flows) + +DNScrypt 6 4300 3 + + 1 UDP 127.0.0.1:50893 <-> 127.0.0.2:5353 [proto: 208/DNScrypt][Encrypted][Confidence: DPI][cat: Network/14][1 pkts/1130 bytes <-> 1 pkts/410 bytes][Goodput ratio: 96/90][0.01 sec][Risk: ** Known Protocol on Non Standard Port **][Risk Score: 50][Plen Bins: 0,0,0,0,0,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,50,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 UDP 127.0.0.1:38650 <-> 127.0.0.2:5353 [proto: 208/DNScrypt][Encrypted][Confidence: DPI][cat: Network/14][1 pkts/1130 bytes <-> 1 pkts/282 bytes][Goodput ratio: 96/85][0.01 sec][Risk: ** Known Protocol on Non Standard Port **][Risk Score: 50][Plen Bins: 0,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,50,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 UDP 127.0.0.1:42883 <-> 127.0.0.2:5353 [proto: 208/DNScrypt][Encrypted][Confidence: DPI][cat: Network/14][1 pkts/1130 bytes <-> 1 pkts/218 bytes][Goodput ratio: 96/80][0.01 sec][Risk: ** Known Protocol on Non Standard Port **][Risk Score: 50][Plen Bins: 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,50,0,0,0,0,0,0,0,0,0,0,0,0,0]