From e4453938d5329daaa0ea682bba55d354759c077e Mon Sep 17 00:00:00 2001 From: Toni Date: Tue, 13 Jul 2021 15:10:18 +0200 Subject: [PATCH] Improved dnscrypt midstream detection. (#1241) * fixed skype false-positive detection of dnscrypt traffic Signed-off-by: Toni Uhlig --- src/lib/protocols/dnscrypt.c | 2 +- src/lib/protocols/skype.c | 9 +++++++++ tests/pcap/dnscrypt_skype_false_positive.pcapng | Bin 0 -> 2720 bytes .../dnscrypt_skype_false_positive.pcapng.out | 7 +++++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tests/pcap/dnscrypt_skype_false_positive.pcapng create mode 100644 tests/result/dnscrypt_skype_false_positive.pcapng.out diff --git a/src/lib/protocols/dnscrypt.c b/src/lib/protocols/dnscrypt.c index 6c89466f1..af147614a 100644 --- a/src/lib/protocols/dnscrypt.c +++ b/src/lib/protocols/dnscrypt.c @@ -38,7 +38,7 @@ void ndpi_search_dnscrypt(struct ndpi_detection_module_struct *ndpi_struct, NDPI_LOG_DBG(ndpi_struct, "search dnscrypt\n"); - if (flow->packet_counter > 2) + if (flow->packet_counter > 3) { NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c index 0c2c0f675..9e17f32a1 100644 --- a/src/lib/protocols/skype.c +++ b/src/lib/protocols/skype.c @@ -35,6 +35,15 @@ static int ndpi_check_skype_udp_again(struct ndpi_detection_module_struct *ndpi_ const uint8_t crc_len = sizeof(flow->l4.udp.skype_crc); const uint8_t crc_offset = id_flags_iv_crc_len - crc_len; + if (flow->packet_counter > 2) + { + /* + * Process only one packet after the initial packet received. + * This is required to prevent fals-positives with other protocols e.g. dnscrypt. + */ + return 0; + } + if ((payload_len >= id_flags_iv_crc_len) && (packet->payload[2] == 0x02 /* Payload flag */ )) { u_int8_t detected = 1; diff --git a/tests/pcap/dnscrypt_skype_false_positive.pcapng b/tests/pcap/dnscrypt_skype_false_positive.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..36b614a734d4c4019d92d85e4337c4b9c4d0ccc4 GIT binary patch literal 2720 zcmbW3c{G&!8^B+(Oe6b*h%Bke)JO^A8Vsh4br4Ys8T*=jjhj(pPoz7FJ4%H+cA^m3 zMkFIk*_Vt=qJ}0rznSCSbG!GP`_Jz==Xt;HbI$Xg^PcB?KIi#@`T4=R005Y3!6Z3Y z=gyz82M_>EJbZ)0WL4oR2)K%dDgbZ+Ai&2Zz|FXR}D;2beA$RW!M_O;Esi(m-Q)wPh*)I(f=x-u!RDscyWp4Ciu2X$+AU`8} zVLT*=_?}|4UKq5wHa)7DLr)#F>Qk)HCLCVdSPU+MCla0BnS5XKvDS;F3dQl?O)4V_ zu4BG6^+eNYrARBrnH(c1w>Ff9=}Q!C6}>MhbHPnJ!Dx`fIj^KYEp`#>N*CI(g(*0j z8hlb2vO4~GyESkRv1oQD;svjKDMD%7ROhO)Xtkh0l9#5lS2QHmRaYQW)ul6$3nS5| z_@exmJgY!vdSdExl7(o7v`@5vxh&yM(>HTvhC?T1p8rq*iqP_1?a;NYxy}umEz*>V zzEte5Bj~Y~X%|sWq`jY|N~c5sTU8NrS0uVHGFN)1MG_o@;zs-g^eegzN`3U*!7V5g z+qa{8gE3Oi`_-ij@vUh?}@ANI@#!XicbK3C+5oh(~8;P;d#cxjg*HcMJ; z$XLN<=~f5cfek7ip3JZvCq#*7f=x5iL3UI!Sv0Gj7 z3hw}f4sz>_!y6m!7fSkF3fWLR`E8;6helfRRD-C={i2FkQIdqrlW=oR2khL3w6zQ3 zwUpZnzVE~xOrI)G`3F5#NPQ36XpV!RIdg+$_1sb!QG@p!WM07KvOcQVe&>#>%?MZ@ z`>43uqmv4I-gqYY{F~jG{p{fqYj*Qq{W1UTVM7K0BnvNt{$CG`DJ2#=uf@e*x<%IX zBu>6PZqp$6P)96dqd32ju{VYxUYykNg)IGHTi$;W?D%Y~ z;uP~K?=jNk!Ijrf4pf((_p?zQldg#(b}kM3r{Cb>D(S-I zpnu4_hmldXcFO~wc>G1qprdmuA03Q2<=$>c)tqWQM3Q%0ayJGWajw)RW>-lcqG-N9 zGBi^vCNk#eW3YxiVy_Y1KoGq|oG+&tnm_-HPpr#C4mzR&D-p8S#%7qhy^Zt=lhDa9 zN~%gaznJUnjJYf`riHixiO(xZ(AUenV`8H{N&0PC*t4@yN!WV5nJ;ccwNmOOX+Gp(9*D^gZB-2r~rCKE=EE@XIB?@O?@M zrHR;O{Tt+JMkC+Zd`$l2&aIp9?gFm?V2N_54O?$4Gp&>fGmClSiLJQzw}eCrB^O%z9I_=aiMMJDQW zpg8<=wSdBjAbL!PcZf~>!eszp|MR~+SWu~c1|f?7#pS4ivA?fLs_nZH&OqOdQrwM_Gg zkgFU%!bX(hDk%NtYLnJAazMGE+gde&2i8+7(YzUhxCH#Ddz5cInuT~Bh&~#4)X7F) zS-!3z+t-0sg&OwD{45>}g3}zB4Y4J1&rT&H4YrDI(UI2HNfsh!?_t$LHiP!_5mW;mYP>MN5x#TUm|Z<+RyE2knG~4!A5!Cl=VIiL`ixV9iQsF zISaBm=|0lYbwF-A1Fv&`gwJ98#_#xwVF?YyMX+;+^$swBpdh^rHO9N(F4qT5UHoBb zQIV&{Z+FZvY^N`W9p$=U*WGzS+ko>DoJmna({P$ zrlc!_PS%4;9{5C}5axE_vgiFNH#Zm`u->Qy?X!{75T&{UM$k(0PnL38mXJZ0%22lw zs)F*~kqVF$bSf4X9_EdT%j literal 0 HcmV?d00001 diff --git a/tests/result/dnscrypt_skype_false_positive.pcapng.out b/tests/result/dnscrypt_skype_false_positive.pcapng.out new file mode 100644 index 000000000..044da2e9e --- /dev/null +++ b/tests/result/dnscrypt_skype_false_positive.pcapng.out @@ -0,0 +1,7 @@ +Guessed flow protos: 0 + +DPI Packets (UDP): 4 (4.00 pkts/flow) + +DNScrypt 6 2380 1 + + 1 UDP 192.168.2.100:46858 <-> 212.47.228.136:443 [proto: 208/DNScrypt][cat: Network/14][3 pkts/1662 bytes <-> 3 pkts/718 bytes][Goodput ratio: 92/82][5137.13 sec][bytes ratio: 0.397 (Upload)][IAT c2s/s2c min/avg/max/stddev: 300005/300005 2568548/2568547 4837091/4837089 2268543/2268542][Pkt Len c2s/s2c min/avg/max/stddev: 554/154 554/239 554/282 0/60][PLAIN TEXT (OYy Tp)][Plen Bins: 0,0,0,16,0,0,0,33,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,0,0,0,0,0,0,0,0,0]