From 5c33fbf19b5bab76aca04432fc7fa6f956ff785f Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Wed, 11 Aug 2021 11:52:24 +0200 Subject: [PATCH] Added extraction of hostname in SMTP Fixed mail incalid subprotocol calculation --- src/lib/ndpi_main.c | 1 - src/lib/protocols/mail_imap.c | 4 ++-- src/lib/protocols/mail_pop.c | 2 ++ src/lib/protocols/mail_smtp.c | 22 ++++++++++++++++++++++ tests/pcap/smtp-starttls.pcap | Bin 0 -> 9003 bytes tests/result/smtp-starttls.pcap.out | 7 +++++++ 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 tests/pcap/smtp-starttls.pcap create mode 100644 tests/result/smtp-starttls.pcap.out diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 464b2b326..493c71aea 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -4406,7 +4406,6 @@ static int ndpi_init_packet_header(struct ndpi_detection_module_struct *ndpi_str */ if(flow->packet.tcp->syn != 0 && flow->packet.tcp->ack == 0 && flow->init_finished != 0 && flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) { - u_int16_t guessed_protocol_id, guessed_host_protocol_id; u_int16_t packet_direction_counter[2]; u_int8_t num_processed_pkts; diff --git a/src/lib/protocols/mail_imap.c b/src/lib/protocols/mail_imap.c index e9a068db3..7fc50c4b7 100644 --- a/src/lib/protocols/mail_imap.c +++ b/src/lib/protocols/mail_imap.c @@ -30,8 +30,8 @@ /* #define IMAP_DEBUG 1*/ -static void ndpi_int_mail_imap_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ +static void ndpi_int_mail_imap_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { + flow->guessed_protocol_id = NDPI_PROTOCOL_UNKNOWN; /* Avoid IMAPS to be used s sub-protocol */ ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_IMAP, NDPI_PROTOCOL_UNKNOWN); } diff --git a/src/lib/protocols/mail_pop.c b/src/lib/protocols/mail_pop.c index 9a893bd0d..feb2757a2 100644 --- a/src/lib/protocols/mail_pop.c +++ b/src/lib/protocols/mail_pop.c @@ -45,6 +45,8 @@ static void ndpi_int_mail_pop_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { + + flow->guessed_protocol_id = NDPI_PROTOCOL_UNKNOWN; /* Avoid POP3S to be used s sub-protocol */ ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_POP, NDPI_PROTOCOL_UNKNOWN); } diff --git a/src/lib/protocols/mail_smtp.c b/src/lib/protocols/mail_smtp.c index 72926402a..359ccbfb5 100644 --- a/src/lib/protocols/mail_smtp.c +++ b/src/lib/protocols/mail_smtp.c @@ -52,6 +52,8 @@ static void ndpi_int_mail_smtp_add_connection(struct ndpi_detection_module_struc #ifdef SMTP_DEBUG printf("**** %s()\n", __FUNCTION__); #endif + + flow->guessed_protocol_id = NDPI_PROTOCOL_MAIL_SMTP; /* Avoid SMTPS to be used s sub-protocol */ ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_SMTP, NDPI_PROTOCOL_UNKNOWN); @@ -83,6 +85,26 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct *ndpi_struct, if(packet->line[a].len >= 3) { if(memcmp(packet->line[a].ptr, "220", 3) == 0) { flow->l4.tcp.smtp_command_bitmask |= SMTP_BIT_220; + + if(flow->host_server_name[0] == '\0') { + if(packet->line[a].len > 4) { + int i, len; + + for(i=5; (iline[a].len-1) && (packet->line[a].ptr[i] != ' '); i++) + ; + + len = i-4; + /* Copy result for nDPI apps */ + len = ndpi_min(len, sizeof(flow->host_server_name)-1); + strncpy((char*)flow->host_server_name, (char*)&packet->line[a].ptr[4], len); + flow->host_server_name[len] = '\0'; + + ndpi_match_hostname_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_SMTP, + (char *)flow->host_server_name, + strlen((const char *)flow->host_server_name)); + + } + } } else if(memcmp(packet->line[a].ptr, "250", 3) == 0) { flow->l4.tcp.smtp_command_bitmask |= SMTP_BIT_250; } else if(memcmp(packet->line[a].ptr, "235", 3) == 0) { diff --git a/tests/pcap/smtp-starttls.pcap b/tests/pcap/smtp-starttls.pcap new file mode 100644 index 0000000000000000000000000000000000000000..493751539a72e8615447ddc430ae5211df5fa724 GIT binary patch literal 9003 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 173.194.68.26:25 [proto: 3.126/SMTP.Google][Encrypted][cat: Web/5][17 pkts/2514 bytes <-> 19 pkts/5889 bytes][Goodput ratio: 55/79][0.48 sec][Host: mx.google.com][bytes ratio: -0.402 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 30/24 156/103 42/26][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 148/310 752/1484 168/444][PLAIN TEXT (x.google.com ESMTP s4)][Plen Bins: 23,18,13,9,4,4,4,0,0,4,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0]