From 06a63dcbaad807f50b28b8012f518b2243639470 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:34:39 +0200 Subject: [PATCH] MySql: improve detection (#1928) Add support for flows with "caching_sha2_password" authentication plugin. See #1924 --- src/lib/protocols/mysql.c | 4 +++- tests/pcap/mysql-8.pcap | Bin 455 -> 7656 bytes tests/result/mysql-8.pcap.out | 15 ++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/lib/protocols/mysql.c b/src/lib/protocols/mysql.c index 58e3c8f51..1a0402ca1 100644 --- a/src/lib/protocols/mysql.c +++ b/src/lib/protocols/mysql.c @@ -65,7 +65,9 @@ static void ndpi_search_mysql_tcp(struct ndpi_detection_module_struct *ndpi_stru } #else if(strncmp((const char*)&packet->payload[packet->payload_packet_len-22], - "mysql_", 6) == 0) { + "mysql_", 6) == 0 || + strncmp((const char*)&packet->payload[packet->payload_packet_len-22], + "caching_", 8) == 0) { NDPI_LOG_INFO(ndpi_struct, "found MySQL\n"); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MYSQL, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); return; diff --git a/tests/pcap/mysql-8.pcap b/tests/pcap/mysql-8.pcap index 7cd92c7e04da583d87ede6cb27d76f5c8d3e499a..d20e621eb487942cdb15cfaaa740eaa825162745 100644 GIT binary patch literal 7656 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 Y7J^q_iM+A_UZJBcALI9-%6`lY9 diff --git a/tests/result/mysql-8.pcap.out b/tests/result/mysql-8.pcap.out index df7e5a4cb..73b45dadc 100644 --- a/tests/result/mysql-8.pcap.out +++ b/tests/result/mysql-8.pcap.out @@ -1,8 +1,8 @@ Guessed flow protos: 0 -DPI Packets (TCP): 4 (4.00 pkts/flow) -Confidence DPI : 1 (flows) -Num dissector calls: 1 (1.00 diss/flow) +DPI Packets (TCP): 8 (4.00 pkts/flow) +Confidence DPI : 2 (flows) +Num dissector calls: 2 (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) @@ -16,10 +16,11 @@ 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: 4/0 (search/found) Patricia risk: 0/0 (search/found) -Patricia protocols: 2/0 (search/found) +Patricia protocols: 4/0 (search/found) -MySQL 4 367 1 +MySQL 35 6224 2 - 1 TCP 192.168.1.105:8738 <-> 10.42.18.198:3306 [proto: 20/MySQL][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: Database/11][2 pkts/140 bytes <-> 2 pkts/227 bytes][Goodput ratio: 0/38][0.00 sec][PLAIN TEXT (DDDDDD)][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] + 1 TCP 192.168.20.80:47044 <-> 192.168.20.108:3306 [proto: 20/MySQL][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: Database/11][15 pkts/1806 bytes <-> 16 pkts/4051 bytes][Goodput ratio: 45/74][2.86 sec][bytes ratio: -0.383 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 260/238 2778/2821 797/779][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 120/253 359/2251 88/522][PLAIN TEXT (8.0.32)][Plen Bins: 7,28,21,7,0,0,0,21,0,7,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,7] + 2 TCP 192.168.1.105:8738 <-> 10.42.18.198:3306 [proto: 20/MySQL][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: Database/11][2 pkts/140 bytes <-> 2 pkts/227 bytes][Goodput ratio: 0/38][0.00 sec][PLAIN TEXT (DDDDDD)][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]