From 017c1a42394501914f850fd54411884545105879 Mon Sep 17 00:00:00 2001 From: Nardi Ivan Date: Tue, 21 Sep 2021 17:56:31 +0200 Subject: [PATCH] FTP: fix support for START-TLS sessions When TLS-over-FTP is used, the credentials are encrypted. So we must not wait for the username and the password commands, otherwise we elaborate a lot of packets for nothing. --- python/ndpi.py | 2 +- python/ndpi_typestruct.py | 10 ++++++++++ src/include/ndpi_typedefs.h | 2 +- src/lib/ndpi_main.c | 3 ++- src/lib/protocols/ftp_control.c | 17 +++++++++-------- tests/pcap/ftp-start-tls.pcap | Bin 0 -> 8350 bytes tests/result/ftp-start-tls.pcap.out | 7 +++++++ 7 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 tests/pcap/ftp-start-tls.pcap create mode 100644 tests/result/ftp-start-tls.pcap.out diff --git a/python/ndpi.py b/python/ndpi.py index a7b568451..3eea870e2 100644 --- a/python/ndpi.py +++ b/python/ndpi.py @@ -1086,7 +1086,7 @@ struct ndpi_flow_struct { } http; struct { - uint8_t auth_found:1, auth_failed:1, _pad:5; + uint8_t auth_found:1, auth_failed:1, auth_tls:1, _pad:5; char username[16], password[16]; } ftp_imap_pop_smtp; diff --git a/python/ndpi_typestruct.py b/python/ndpi_typestruct.py index 9413ca039..a0bdcee84 100644 --- a/python/ndpi_typestruct.py +++ b/python/ndpi_typestruct.py @@ -507,6 +507,15 @@ class Http2(Structure): ("nat_ip", c_char * 24) ] +class FtpImapPopSmtp(Structure): + _fields_ = [ + ("auth_found", c_uint8, 1), + ("auth_failed", c_uint8, 1), + ("auth_tls", c_uint8, 1), + ("_pad", c_uint8, 5), + ("username", c_char * 16), + ("password", c_char * 16) + ] class Bittorrent(Structure): _fields_ = [("hash", c_char * 20)] @@ -529,6 +538,7 @@ class Protos(Union): ("mdns", Mdns), ("ubntac2", Ubntac2), ("http", Http2), + ("ftp_imap_pop_smtp", FtpImapPopSmtp), ("bittorrent", Bittorrent), ("dhcp", Dhcp) ] diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 2347d0429..6181c21e8 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1350,7 +1350,7 @@ struct ndpi_flow_struct { } http; struct { - u_int8_t auth_found:1, auth_failed:1, _pad:5; + u_int8_t auth_found:1, auth_failed:1, auth_tls:1, _pad:5; char username[16], password[16]; } ftp_imap_pop_smtp; diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 4776095ef..cc1db9ccb 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -7242,7 +7242,8 @@ u_int8_t ndpi_extra_dissection_possible(struct ndpi_detection_module_struct *ndp case NDPI_PROTOCOL_MAIL_POP: case NDPI_PROTOCOL_MAIL_IMAP: case NDPI_PROTOCOL_MAIL_SMTP: - if(flow->protos.ftp_imap_pop_smtp.password[0] == '\0') + if(flow->protos.ftp_imap_pop_smtp.password[0] == '\0' && + flow->protos.ftp_imap_pop_smtp.auth_tls == 0) return(1); break; diff --git a/src/lib/protocols/ftp_control.c b/src/lib/protocols/ftp_control.c index 55ea192b0..3635d1118 100644 --- a/src/lib/protocols/ftp_control.c +++ b/src/lib/protocols/ftp_control.c @@ -64,6 +64,11 @@ static int ndpi_ftp_control_check_request(struct ndpi_detection_module_struct *n return 1; } + if(ndpi_match_strprefix(payload, payload_len, "AUTH") || + ndpi_match_strprefix(payload, payload_len, "auth")) { + flow->protos.ftp_imap_pop_smtp.auth_found = 1; + return 1; + } /* ***************************************************** */ if(ndpi_match_strprefix(payload, payload_len, "ABOR")) { @@ -86,9 +91,6 @@ static int ndpi_ftp_control_check_request(struct ndpi_detection_module_struct *n return 1; } - if(ndpi_match_strprefix(payload, payload_len, "AUTH")) { - return 1; - } if(ndpi_match_strprefix(payload, payload_len, "CCC")) { return 1; } @@ -321,10 +323,6 @@ static int ndpi_ftp_control_check_request(struct ndpi_detection_module_struct *n return 1; } - if(ndpi_match_strprefix(payload, payload_len, "auth")) { - return 1; - } - if(ndpi_match_strprefix(payload, payload_len, "ccc")) { return 1; } @@ -564,6 +562,8 @@ static int ndpi_ftp_control_check_response(struct ndpi_flow_struct *flow, case '2': case '3': case '6': + if(flow->protos.ftp_imap_pop_smtp.auth_found == 1) + flow->protos.ftp_imap_pop_smtp.auth_tls = 1; return(1); break; @@ -635,7 +635,8 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str flow->protos.ftp_imap_pop_smtp.username, flow->protos.ftp_imap_pop_smtp.password); #endif - if(flow->protos.ftp_imap_pop_smtp.password[0] == '\0') + if(flow->protos.ftp_imap_pop_smtp.password[0] == '\0' && + flow->protos.ftp_imap_pop_smtp.auth_tls == 0) /* TODO: any values on dissecting TLS handshake? */ flow->ftp_control_stage = 0; else ndpi_int_ftp_control_add_connection(ndpi_struct, flow); diff --git a/tests/pcap/ftp-start-tls.pcap b/tests/pcap/ftp-start-tls.pcap new file mode 100644 index 0000000000000000000000000000000000000000..738ccba4ef206e72d5b9d95756f5d0f750195c27 GIT binary patch literal 8350 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 10.220.50.76:21 [proto: 1/FTP_CONTROL][ClearText][cat: Download/7][16 pkts/1744 bytes <-> 35 pkts/5766 bytes][Goodput ratio: 49/66][0.33 sec][bytes ratio: -0.536 (Download)][IAT c2s/s2c min/avg/max/stddev: 1/0 13/4 34/34 13/8][Pkt Len c2s/s2c min/avg/max/stddev: 60/60 109/165 384/566 80/152][Risk: ** Unsafe Protocol **][Risk Score: 10][PLAIN TEXT (Authorized users only. All acti)][Plen Bins: 22,25,32,0,2,0,5,0,0,0,2,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]