From d0e7e6955293b656e1a1d7b01aebc1b5beefe711 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 8 Nov 2019 09:23:52 +0000 Subject: [PATCH] Renamed DNSoverHTTPS to handle bot DoH and DoT --- src/include/ndpi_protocol_ids.h | 2 +- src/lib/ndpi_content_match.c.inc | 94 +++++++++++++++---------------- src/lib/ndpi_main.c | 6 +- tests/pcap/dns_doh.pcap | Bin 0 -> 22658 bytes tests/pcap/dns_dot.pcap | Bin 0 -> 6277 bytes tests/result/dns_doh.pcap.out | 8 +++ tests/result/dns_dot.pcap.out | 8 +++ 7 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 tests/pcap/dns_doh.pcap create mode 100644 tests/pcap/dns_dot.pcap create mode 100644 tests/result/dns_doh.pcap.out create mode 100644 tests/result/dns_dot.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index c6d486933..0bbfd662a 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -229,7 +229,7 @@ typedef enum { NDPI_PROTOCOL_KAKAOTALK = 193, /* KakaoTalk Chat (no voice call) */ NDPI_PROTOCOL_KAKAOTALK_VOICE = 194, /* KakaoTalk Voice */ NDPI_PROTOCOL_TWITCH = 195, /* Edoardo Dominici */ - NDPI_PROTOCOL_DNS_OVER_HTTPS = 196, + NDPI_PROTOCOL_DOH_DOT = 196, /* DoH (DNS over HTTPS), DoT (DNS over TLS) */ NDPI_PROTOCOL_WECHAT = 197, NDPI_PROTOCOL_MPEGTS = 198, NDPI_PROTOCOL_SNAPCHAT = 199, diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index a3c19dedc..9fb000173 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -8719,53 +8719,53 @@ static ndpi_protocol_match host_match[] = { /* http://check.googlezip.net/connect [check browser connectivity] */ // { ".googlezip.net", NULL, "\\.googlezip" TLD, "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, - { "dns.google", NULL, "dns\\.google" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - // { "mozilla.cloudflare-dns.com", NULL, "mozilla\\.cloudflare-dns\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, /* Firefox */ - { "cloudflare-dns.com", NULL, "cloudflare-dns\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "commons.host", NULL, "commons\\.host" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.li", NULL, "doh\\.li" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns9.quad9.net", NULL, "dns9\\.quad9\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.opendns.com", NULL, "doh\\.opendns\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.dns.sb", NULL, "doh\\.dns\\.sb" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.netweaver.uk", NULL, "doh\\.netweaver\\.uk" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.dns-over-https.com", NULL, "dns\\.dns-over-https\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "jp.tiarap.org", NULL, "jp\\.tiarap\\.org" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.dnsoverhttps.net", NULL, "dns\\.dnsoverhttps\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.powerdns.org", NULL, "doh\\.powerdns\\.org" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "adblock.mydns.network", NULL, "adblock\\.mydns\\.network" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "jp.tiar.app", NULL, "jp\\.tiar\\.app" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.crypto.sx", NULL, "doh\\.crypto\\.sx" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.quad9.net", NULL, "dns\\.quad9\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.containerpi.com", NULL, "dns\\.containerpi\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "ibksturm.synology.me", NULL, "ibksturm\\.synology\\.me" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.captnemo.in", NULL, "doh\\.captnemo\\.in" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.rubyfish.cn", NULL, "dns\\.rubyfish\\.cn" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.42l.fr", NULL, "doh\\.42l\\.fr" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns-family.adguard.com", NULL, "dns-family\\.adguard\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "appliedprivacy.net", NULL, "appliedprivacy\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.cleanbrowsing.org", NULL, "doh\\.cleanbrowsing\\.org" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns10.quad9.net", NULL, "dns10\\.quad9\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh-ch.blahdns.com", NULL, "doh-ch\\.blahdns\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.seby.io", NULL, "doh\\.seby\\.io" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.adguard.com", NULL, "dns\\.adguard\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "ibuki.cgnat.net", NULL, "ibuki\\.cgnat\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "jcdns.fun", NULL, "jcdns\\.fun" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh-2.seby.io", NULL, "doh-2\\.seby\\.io" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.tiar.app", NULL, "doh\\.tiar\\.app" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.dnswarden.com", NULL, "doh\\.dnswarden\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh-de.blahdns.com", NULL, "doh-de\\.blahdns\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh-jp.blahdns.com", NULL, "doh-jp\\.blahdns\\.com" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.appliedprivacy.net", NULL, "doh\\.appliedprivacy\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.tiarap.org", NULL, "doh\\.tiarap\\.org" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.armadillodns.net", NULL, "doh\\.armadillodns\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns-nyc.aaflalo.me", NULL, "dns-nyc\\.aaflalo\\.me" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.aa.net.uk", NULL, "dns\\.aa\\.net\\.uk" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.aaflalo.me", NULL, "dns\\.aaflalo\\.me" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns11.quad9.net", NULL, "dns11\\.quad9\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "dns.nextdns.io", NULL, "dns\\.nextdns\\.io" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "doh.securedns.eu", NULL, "doh\\.securedns\\.eu" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "rdns.faelix.net", NULL, "rdns\\.faelix\\.net" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, - { "captnemo.in", NULL, "captnemo\\.in" TLD, "DNSoverHTTPS", NDPI_PROTOCOL_DNS_OVER_HTTPS, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.google", NULL, "dns\\.google" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + // { "mozilla.cloudflare-dns.com", NULL, "mozilla\\.cloudflare-dns\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, /* Firefox */ + { "cloudflare-dns.com", NULL, "cloudflare-dns\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "commons.host", NULL, "commons\\.host" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.li", NULL, "doh\\.li" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns9.quad9.net", NULL, "dns9\\.quad9\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.opendns.com", NULL, "doh\\.opendns\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.dns.sb", NULL, "doh\\.dns\\.sb" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.netweaver.uk", NULL, "doh\\.netweaver\\.uk" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.dns-over-https.com", NULL, "dns\\.dns-over-https\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "jp.tiarap.org", NULL, "jp\\.tiarap\\.org" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.dnsoverhttps.net", NULL, "dns\\.dnsoverhttps\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.powerdns.org", NULL, "doh\\.powerdns\\.org" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "adblock.mydns.network", NULL, "adblock\\.mydns\\.network" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "jp.tiar.app", NULL, "jp\\.tiar\\.app" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.crypto.sx", NULL, "doh\\.crypto\\.sx" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.quad9.net", NULL, "dns\\.quad9\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.containerpi.com", NULL, "dns\\.containerpi\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "ibksturm.synology.me", NULL, "ibksturm\\.synology\\.me" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.captnemo.in", NULL, "doh\\.captnemo\\.in" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.rubyfish.cn", NULL, "dns\\.rubyfish\\.cn" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.42l.fr", NULL, "doh\\.42l\\.fr" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns-family.adguard.com", NULL, "dns-family\\.adguard\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "appliedprivacy.net", NULL, "appliedprivacy\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.cleanbrowsing.org", NULL, "doh\\.cleanbrowsing\\.org" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns10.quad9.net", NULL, "dns10\\.quad9\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh-ch.blahdns.com", NULL, "doh-ch\\.blahdns\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.seby.io", NULL, "doh\\.seby\\.io" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.adguard.com", NULL, "dns\\.adguard\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "ibuki.cgnat.net", NULL, "ibuki\\.cgnat\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "jcdns.fun", NULL, "jcdns\\.fun" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh-2.seby.io", NULL, "doh-2\\.seby\\.io" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.tiar.app", NULL, "doh\\.tiar\\.app" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.dnswarden.com", NULL, "doh\\.dnswarden\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh-de.blahdns.com", NULL, "doh-de\\.blahdns\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh-jp.blahdns.com", NULL, "doh-jp\\.blahdns\\.com" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.appliedprivacy.net", NULL, "doh\\.appliedprivacy\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.tiarap.org", NULL, "doh\\.tiarap\\.org" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.armadillodns.net", NULL, "doh\\.armadillodns\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns-nyc.aaflalo.me", NULL, "dns-nyc\\.aaflalo\\.me" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.aa.net.uk", NULL, "dns\\.aa\\.net\\.uk" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.aaflalo.me", NULL, "dns\\.aaflalo\\.me" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns11.quad9.net", NULL, "dns11\\.quad9\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "dns.nextdns.io", NULL, "dns\\.nextdns\\.io" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "doh.securedns.eu", NULL, "doh\\.securedns\\.eu" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "rdns.faelix.net", NULL, "rdns\\.faelix\\.net" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, + { "captnemo.in", NULL, "captnemo\\.in" TLD, "DoH_DoT", NDPI_PROTOCOL_DOH_DOT, NDPI_PROTOCOL_CATEGORY_NETWORK, NDPI_PROTOCOL_ACCEPTABLE }, /* diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index c5059bd06..35ba7087f 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1017,10 +1017,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "Signal", NDPI_PROTOCOL_CATEGORY_CHAT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DNS_OVER_HTTPS, + ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DOH_DOT, 0 /* can_have_a_subprotocol */, no_master, - no_master, "DNSoverHTTPS", NDPI_PROTOCOL_CATEGORY_NETWORK /* dummy */, - ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, + no_master, "DoH_DoT", NDPI_PROTOCOL_CATEGORY_NETWORK /* dummy */, + ndpi_build_default_ports(ports_a, 853, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_LINE, 0 /* can_have_a_subprotocol */, no_master, diff --git a/tests/pcap/dns_doh.pcap b/tests/pcap/dns_doh.pcap new file mode 100644 index 0000000000000000000000000000000000000000..f7dea5b26146b52be180ca14e896b1180538af55 GIT binary patch literal 22658 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 j;Z*teU=V7rzq82 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 104.16.248.249:443 [proto: 91.196/TLS.DoH_DoT][cat: Network/14][86 pkts/8460 bytes <-> 56 pkts/11902 bytes][bytes ratio: -0.169 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 25.6/30.8 535/580 86.2/115.4][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 98.4/212.5 571/1354 68.9/257.4][TLSv1.3][Client: mozilla.cloudflare-dns.com][JA3C: f6ce47303dce394049af395fc6d0bc20][JA3S: eb1d94daa7e0344597e756a1fb6e7054][Cipher: TLS_AES_128_GCM_SHA256] diff --git a/tests/result/dns_dot.pcap.out b/tests/result/dns_dot.pcap.out new file mode 100644 index 000000000..9d7c3781b --- /dev/null +++ b/tests/result/dns_dot.pcap.out @@ -0,0 +1,8 @@ +DoH_DoT 24 5869 1 + +JA3 Host Stats: + IP Address # JA3C + 1 192.168.1.185 1 + + + 1 TCP 192.168.1.185:58290 <-> 8.8.8.8:853 [proto: 91.196/TLS.DoH_DoT][cat: Web/5][14 pkts/1480 bytes <-> 10 pkts/4389 bytes][bytes ratio: -0.496 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 269.6/181.6 1596/1192 531.3/412.6][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 105.7/438.9 264/3135 52.7/903.0][TLSv1.2][JA3C: 4fe4099926d0acdc9b2fe4b02013659f][Server: dns.google][JA3S: 2b341b88c742e940cfb485ce7d93dde7][Organization: Google LLC][Certificate SHA-1: BE:73:46:2A:2E:FB:A9:E9:42:D0:71:10:1B:8C:BF:44:6A:5D:AD:53][Validity: 2017-06-15 00:00:42 - 2021-12-15 00:00:42][Cipher: TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256]