From fbae51ae9de3cd4c22664e25ec29d73abe64adfc Mon Sep 17 00:00:00 2001 From: Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> Date: Thu, 23 Nov 2023 11:35:43 +0300 Subject: [PATCH] Get rid of RDP false positives (#2161) * Get rid of false positives in the RDP protocol dissector * Remove kludge for RDP * RDP: improve detection --------- Co-authored-by: 0xA50C1A1 Co-authored-by: Nardi Ivan --- src/lib/protocols/h323.c | 15 -------- src/lib/protocols/rdp.c | 34 +++++++++++++----- tests/cfgs/default/pcap/rdp3.pcap | Bin 0 -> 4655 bytes tests/cfgs/default/pcap/s7comm-plus.pcap | Bin 0 -> 11559 bytes tests/cfgs/default/result/rdp3.pcap.out | 28 +++++++++++++++ .../cfgs/default/result/s7comm-plus.pcap.out | 28 +++++++++++++++ 6 files changed, 81 insertions(+), 24 deletions(-) create mode 100644 tests/cfgs/default/pcap/rdp3.pcap create mode 100644 tests/cfgs/default/pcap/s7comm-plus.pcap create mode 100644 tests/cfgs/default/result/rdp3.pcap.out create mode 100644 tests/cfgs/default/result/s7comm-plus.pcap.out diff --git a/src/lib/protocols/h323.c b/src/lib/protocols/h323.c index d7041dfc0..4cafd4392 100644 --- a/src/lib/protocols/h323.c +++ b/src/lib/protocols/h323.c @@ -54,21 +54,6 @@ static void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, s u_int16_t len = ntohs(t->len); if(packet->payload_packet_len == len) { - /* - We need to check if this packet is in reality - a RDP (Remote Desktop) packet encapsulated on TPTK - */ - - if(packet->payload[4] == (packet->payload_packet_len - sizeof(struct tpkt) - 1)) { - /* ISO 8073/X.224 */ - if((packet->payload[5] == 0xE0 /* CC Connect Request */) - || (packet->payload[5] == 0xD0 /* CC Connect Confirm */)) { - NDPI_LOG_INFO(ndpi_struct, "found RDP\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RDP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); - return; - } - } - flow->h323_valid_packets++; if(flow->h323_valid_packets >= 2) { diff --git a/src/lib/protocols/rdp.c b/src/lib/protocols/rdp.c index 305c1c27f..e95c6e853 100644 --- a/src/lib/protocols/rdp.c +++ b/src/lib/protocols/rdp.c @@ -46,16 +46,32 @@ static void ndpi_search_rdp(struct ndpi_detection_module_struct *ndpi_struct, NDPI_LOG_DBG(ndpi_struct, "search RDP\n"); if (packet->tcp != NULL) { - if (packet->payload_packet_len > 10 - && get_u_int8_t(packet->payload, 0) > 0 - && get_u_int8_t(packet->payload, 0) < 4 && get_u_int16_t(packet->payload, 2) == ntohs(packet->payload_packet_len) - && get_u_int8_t(packet->payload, 4) == packet->payload_packet_len - 5 - && get_u_int8_t(packet->payload, 5) == 0xe0 - && get_u_int16_t(packet->payload, 6) == 0 && get_u_int16_t(packet->payload, 8) == 0 && get_u_int8_t(packet->payload, 10) == 0) { - ndpi_int_rdp_add_connection(ndpi_struct, flow); - return; - } + if(packet->payload_packet_len > 13 && + /* TPKT */ + packet->payload[0] == 0x03 && packet->payload[1] == 0x00 && + ntohs(*(uint16_t *)&packet->payload[2]) == packet->payload_packet_len && + /* COTP */ + packet->payload[4] == packet->payload_packet_len - 5) { + if(current_pkt_from_client_to_server(ndpi_struct, flow)) { + if(packet->payload[5] == 0xE0 && /* COTP CR */ + ((packet->payload[11] == 0x01 && /* RDP Negotiation Request */ + packet->payload[13] == 0x08 /* RDP Length */) || + (packet->payload_packet_len > 17 && + memcmp(&packet->payload[11], "Cookie:", 7) == 0))) /* RDP Cookie */ { + ndpi_int_rdp_add_connection(ndpi_struct, flow); + return; + } + } else { + /* Asymmetric detection via RDP Negotiation Response */ + if(packet->payload[5] == 0xD0 && /* COTP CC */ + packet->payload[11] == 0x02 && /* RDP Negotiation Response */ + packet->payload[13] == 0x08 /* RDP Length */) { + ndpi_int_rdp_add_connection(ndpi_struct, flow); + return; + } + } + } NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } else if(packet->udp != NULL) { u_int16_t s_port = ntohs(packet->udp->source); diff --git a/tests/cfgs/default/pcap/rdp3.pcap b/tests/cfgs/default/pcap/rdp3.pcap new file mode 100644 index 0000000000000000000000000000000000000000..9a1ed4cbf5deb4346ddf3eaf1590bc14cf6e8c5c GIT binary patch literal 4655 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 literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/pcap/s7comm-plus.pcap b/tests/cfgs/default/pcap/s7comm-plus.pcap new file mode 100644 index 0000000000000000000000000000000000000000..8dfb033ce6d5d6261dc41fbfd0b05a060d317c55 GIT binary patch literal 11559 zcmeI2e{fXQ701teZ?l_Cvg``oxN0MdKM0Uy$!;KFH$Z+BN-7IWHeqV3BL$KnQiGF( zAc;vfFAAhq9fwgE+d)kmV&9C~bwNLjBPit(1Ql9Xi-`91v5-^ql+lrMqvR z7iap$*^aw2H@ivTyze>Z`?>GFd-K+-2cHtb1nO&I0zklT-ubAY{(CMvRO4qF@NKjG z$T&@@}h4hh5XhM}z#-C8<{xwq_aO+aG&%U-R4bO+L(s6dV=6DWYt@$soopd z$!N$mK6>JZ>`G%|G}0=-NiTruB*wv5f*ZXd>%Jea+y^4L7!SG`5Bt z+uE8pwcOz?R$fE$3~*+71A#!Pr^FWs49T;=nTh3hH-wke4au{?nGp_F*3}Qmb7H?( zwla+06@W<`k_!QCidT?}@Cqw~;R1KlrdD@2SXEc=uG`$w-h5XhlhM~3li>_+UfZ^= zwfXLLR8h03rTs_EEsd>%XifmkhJn2_U7jy1<L=$f?XHx^v1b+da&uZ)$uR&G&Tg z3ppHccPo{eUKHz{n*omEXBtWK(*fI77OPe_7JA-%kvVZdabl-Wbz2$=&KcX*tTzoy*GaaU%j5H!XDcWuojb~kz|;9TNg9T(;CCsBH{XXWN-)fXSs46SN|Atn%U8%(i)jhaKiMdD2>6;k+^_Cr{4@D$#XGhjU zBH2Qc*H8e9k|4yp>>q7%62a~YHV2JsN?9U^W>E<&u?TM!C zT>+9cH{|+sxcl=-G$~k}k->s|G7OMQtF&b*wvW`vygyua5bkQ`Y(NvuphbB2<7-vEbnq>@4 zo5r;GoSIb;a$V}~-aUyX1>0w2u=#v6`xu%h6OE8nfoQ%=Xx`~m6aG62`{Fb1U2_3L z^CeA|FRNLWuGdA=Vi=kv(agVVrh>%h`Do(09q*b?CU+!))3^h++^CDDC5@)))HpQB z5mRhjH2n_pQ>azV=85OQ6t@1}hs0D3;8VBaz_n2nESKSPst7vfGivNz;=B6)=7 zh8=3c@1w9!_-FJvcNj#nU5?Aq`HMcP|f3DM!GlXV4 ztum6gfvjmXRj0#!^mJ3KAO1yjDH(& zJkbcY!-(cNLbH($oY{+n{d33y58%Ec4ebuC(CuGLS!QdVH6!QLEW7^2Ox2+5EiR=U z+G>oGHHoHRN!pVY*p8zV41UA+9JxEw)S8Rw)+j#x+P_}0HDkZB@HS#`U5W(0noOV^ zAOhE4qh>^HUiXrPcfg3pF&K*uc;nW}Df_oiDTUO8FC({xMDZW0-ywm2%xDYAOGLS)RaE2j{q{ zlC3lLYqG?@22iprn#Qu!9yie%i_XgN)ck)uZX$`NQeWb8xQyg%oIOAt8QZ1Pkv(L{ z8Tf|^I_r$=_;p5l@<%t(o;Eq+Jb!6W#n6;ArriUQUBu(2-nI`W(WGD>85!);$GFE$ zKV@hhO*DdCL^PivG}kt%Xr4u3i}}8eSdfp-GPT4WFhOhNh5c+I|rvM*$u;t!~5ZtJuaF1sgFk b*ik;34>2^4BpSg{knicY5}Iqq)P(;7hl3NE literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/rdp3.pcap.out b/tests/cfgs/default/result/rdp3.pcap.out new file mode 100644 index 000000000..d7f61a572 --- /dev/null +++ b/tests/cfgs/default/result/rdp3.pcap.out @@ -0,0 +1,28 @@ +Guessed flow protos: 0 + +DPI Packets (TCP): 4 (4.00 pkts/flow) +Confidence DPI : 1 (flows) +Num dissector calls: 1 (1.00 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/0/0 (insert/search/found) +LRU cache zoom: 0/0/0 (insert/search/found) +LRU cache stun: 0/0/0 (insert/search/found) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 0/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 2/0 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +RDP 30 4151 1 + + 1 TCP 10.150.9.21:1685 <-> 10.157.4.161:3389 [proto: 88/RDP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: RemoteAccess/12][17 pkts/2567 bytes <-> 13 pkts/1584 bytes][Goodput ratio: 63/54][0.67 sec][bytes ratio: 0.237 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/1 44/54 234/331 66/93][Pkt Len c2s/s2c min/avg/max/stddev: 60/60 151/122 573/440 162/126][Risk: ** Desktop/File Sharing **][Risk Score: 10][Risk Info: Found RDP][PLAIN TEXT (Cookie)][Plen Bins: 59,16,4,0,0,0,0,0,0,0,4,0,12,0,0,0,4,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] diff --git a/tests/cfgs/default/result/s7comm-plus.pcap.out b/tests/cfgs/default/result/s7comm-plus.pcap.out new file mode 100644 index 000000000..4b34c344e --- /dev/null +++ b/tests/cfgs/default/result/s7comm-plus.pcap.out @@ -0,0 +1,28 @@ +Guessed flow protos: 0 + +DPI Packets (TCP): 6 (6.00 pkts/flow) +Confidence DPI : 1 (flows) +Num dissector calls: 1 (1.00 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/0/0 (insert/search/found) +LRU cache zoom: 0/0/0 (insert/search/found) +LRU cache stun: 0/0/0 (insert/search/found) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 0/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 4/0 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +s7comm 79 10271 1 + + 1 TCP 192.168.25.177:53162 <-> 192.168.25.131:102 [proto: 249/s7comm][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 6][cat: Network/14][54 pkts/6194 bytes <-> 25 pkts/4077 bytes][Goodput ratio: 53/65][7.11 sec][bytes ratio: 0.206 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 122/276 995/964 315/396][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 115/163 395/351 76/132][PLAIN TEXT (SIMATIC)][Plen Bins: 42,6,28,3,1,0,3,0,0,12,3,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]