From 2e7fc82e55d0f6c84745da993864ad81423bc5ea Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Thu, 9 May 2024 15:38:06 +0200 Subject: [PATCH] Protobuf: fix false positives (#2428) --- src/lib/protocols/protobuf.c | 6 ++-- .../cfgs/default/pcap/false_positives.pcapng | Bin 0 -> 15404 bytes .../default/result/false_positives.pcapng.out | 28 ++++++++++++++++++ .../result/fuzz-2006-06-26-2594.pcap.out | 20 ++++++------- 4 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 tests/cfgs/default/pcap/false_positives.pcapng create mode 100644 tests/cfgs/default/result/false_positives.pcapng.out diff --git a/src/lib/protocols/protobuf.c b/src/lib/protocols/protobuf.c index 003cc2fad..9f50e5c31 100644 --- a/src/lib/protocols/protobuf.c +++ b/src/lib/protocols/protobuf.c @@ -201,7 +201,7 @@ static void ndpi_search_protobuf(struct ndpi_detection_module_struct *ndpi_struc if (packet->payload_packet_len < offset + sizeof(uint32_t)) { NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - break; + return; } #ifdef DEBUG_PROTOBUF union { @@ -226,7 +226,9 @@ static void ndpi_search_protobuf(struct ndpi_detection_module_struct *ndpi_struc (unsigned long long int)protobuf_elements, (unsigned long long int)protobuf_len_elements); #endif - if ((protobuf_elements >= PROTOBUF_REQUIRED_ELEMENTS && protobuf_len_elements > 0) + if ((protobuf_elements >= PROTOBUF_REQUIRED_ELEMENTS && protobuf_len_elements > 0 && + /* (On UDP) this packet might be also a RTP/RTCP one. Wait for the next one */ + (flow->packet_counter > 1 || flow->l4_proto == IPPROTO_TCP || flow->l4.udp.rtp_stage == 0)) || (flow->packet_counter >= PROTOBUF_MIN_PACKETS && protobuf_elements >= PROTOBUF_MIN_ELEMENTS)) { #ifdef DEBUG_PROTOBUF diff --git a/tests/cfgs/default/pcap/false_positives.pcapng b/tests/cfgs/default/pcap/false_positives.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..6a89d0aed1d8cb0b013ba7af0348b3b1f24b1b16 GIT binary patch literal 15404 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 bC_+gWp|VwIA>EZiZc4~hc-Qmm#qR$PT{bC^ literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/false_positives.pcapng.out b/tests/cfgs/default/result/false_positives.pcapng.out new file mode 100644 index 000000000..18052fb75 --- /dev/null +++ b/tests/cfgs/default/result/false_positives.pcapng.out @@ -0,0 +1,28 @@ +DPI Packets (UDP): 6 (3.00 pkts/flow) +Confidence DPI : 2 (flows) +Num dissector calls: 311 (155.50 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 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: 2/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) + +RTP 60 13200 2 + +Acceptable 60 13200 2 + + 1 UDP 10.192.92.81:52070 <-> 10.136.43.69:21048 [VLAN: 20][proto: 87/RTP][IP: 0/Unknown][Stream Content: Audio][ClearText][Confidence: DPI][DPI packets: 3][cat: Media/1][15 pkts/3330 bytes <-> 15 pkts/3330 bytes][Goodput ratio: 77/77][0.30 sec][bytes ratio: 0.000 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 19/19 19/19 20/20 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 222/222 222/222 222/222 0/0][PLAIN TEXT (UUUUUUUUUUUUU)][Plen Bins: 0,0,0,0,0,100,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,0,0] + 2 UDP 10.126.70.67:23784 <-> 10.236.7.225:50160 [VLAN: 107][proto: 87/RTP][IP: 0/Unknown][Stream Content: Audio][ClearText][Confidence: DPI][DPI packets: 3][cat: Media/1][18 pkts/3924 bytes <-> 12 pkts/2616 bytes][Goodput ratio: 79/79][0.34 sec][bytes ratio: 0.200 (Upload)][IAT c2s/s2c min/avg/max/stddev: 19/19 20/20 20/20 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 218/218 218/218 218/218 0/0][PLAIN TEXT (UUUUUUUUU)][Plen Bins: 0,0,0,0,0,100,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,0,0] diff --git a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out index c3dd6bf03..ce99151d8 100644 --- a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out +++ b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out @@ -1,17 +1,17 @@ -Guessed flow protos: 27 +Guessed flow protos: 28 DPI Packets (TCP): 48 (2.29 pkts/flow) DPI Packets (UDP): 369 (1.64 pkts/flow) DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 34 (flows) -Confidence Match by port : 27 (flows) -Confidence DPI : 190 (flows) -Num dissector calls: 7480 (29.80 diss/flow) +Confidence Match by port : 28 (flows) +Confidence DPI : 189 (flows) +Num dissector calls: 7510 (29.92 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) -LRU cache bittorrent: 0/189/0 (insert/search/found) +LRU cache bittorrent: 0/192/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/61/0 (insert/search/found) +LRU cache mining: 0/62/0 (insert/search/found) LRU cache msteams: 0/0/0 (insert/search/found) LRU cache stun_zoom: 0/34/0 (insert/search/found) Automa host: 254/0 (search/found) @@ -27,7 +27,7 @@ Patricia protocols: 496/1 (search/found) Patricia protocols IPv6: 0/0 (search/found) Unknown 34 4212 34 -FTP_CONTROL 35 2456 11 +FTP_CONTROL 36 2569 12 DNS 301 26612 159 NetBIOS 102 9445 25 SMBv1 7 1620 3 @@ -35,11 +35,9 @@ DHCP 2 932 1 SMBv23 3 186 1 RTP 5 1070 1 SIP 85 39540 15 -Protobuf 1 113 1 -Safe 1 113 1 Acceptable 498 77785 202 -Unsafe 35 2456 11 +Unsafe 36 2569 12 Dangerous 7 1620 3 Unrated 34 4212 34 @@ -142,7 +140,7 @@ Unrated 34 4212 34 97 UDP 192.168.1.3:53 -> 192.168.1.2:2712 [proto: 5/DNS][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/144 bytes -> 0 pkts/0 bytes][Goodput ratio: 70/0][< 1 sec][Hostname/SNI: sip.cybercity.dk][::][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][PLAIN TEXT (cybercity)][Plen Bins: 0,0,0,100,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,0,0,0,0] 98 TCP 147.234.1.253:21 -> 192.169.1.2:2720 [proto: 1/FTP_CONTROL][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Download/7][1 pkts/130 bytes -> 0 pkts/0 bytes][Goodput ratio: 58/0][< 1 sec][Risk: ** Unsafe Protocol **** Unidirectional Traffic **][Risk Score: 20][Risk Info: No client to server traffic][PLAIN TEXT (331 Anonymous login ok)][Plen Bins: 0,0,100,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,0,0,0,0,0] 99 TCP 192.168.1.2:2718 -> 147.137.21.94:139 [proto: 10/NetBIOS][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 2][cat: System/18][2 pkts/124 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][2.92 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 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,0,0,0,0,0,0,0,0] - 100 TCP 147.234.1.253:21 -> 192.168.1.2:2732 [proto: 353/Protobuf][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/113 bytes -> 0 pkts/0 bytes][Goodput ratio: 52/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][PLAIN TEXT ( Files larger then 250MB will b)][Plen Bins: 0,100,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,0,0,0,0,0,0] + 100 TCP 147.234.1.253:21 -> 192.168.1.2:2732 [proto: 1/FTP_CONTROL][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Download/7][1 pkts/113 bytes -> 0 pkts/0 bytes][Goodput ratio: 52/0][< 1 sec][Risk: ** Unsafe Protocol **** Unidirectional Traffic **][Risk Score: 20][Risk Info: No client to server traffic][PLAIN TEXT ( Files larger then 250MB will b)][Plen Bins: 0,100,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,0,0,0,0,0,0] 101 UDP 192.168.1.1:53 -> 192.168.1.2:2572 [proto: 5/DNS][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/105 bytes -> 0 pkts/0 bytes][Goodput ratio: 59/0][< 1 sec][::][Risk: ** Malformed Packet **** Unidirectional Traffic **][Risk Score: 20][Risk Info: No client to server traffic / Invalid DNS Query Lenght][Plen Bins: 0,100,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,0,0,0,0,0,0] 102 UDP 192.168.1.1:53 -> 192.168.1.2:2723 [proto: 5/DNS][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/105 bytes -> 0 pkts/0 bytes][Goodput ratio: 59/0][< 1 sec][Hostname/SNI: 1.0.0.127.in-adds.arpa][::][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][Plen Bins: 0,100,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,0,0,0,0,0,0] 103 UDP 192.168.1.1:53 -> 192.168.1.2:2745 [proto: 5/DNS][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: Network/14][1 pkts/105 bytes -> 0 pkts/0 bytes][Goodput ratio: 59/0][< 1 sec][Hostname/SNI: 1.0.0.127.in-addr.arpa][::][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][Plen Bins: 0,100,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,0,0,0,0,0,0]