From b6eef17e54999586b6aef8f545c87de4d3ec0ab3 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Sat, 30 May 2020 19:33:13 +0200 Subject: [PATCH] Added check to avoid producing alerts for known protocol on unknown port when using TLS --- src/lib/ndpi_main.c | 33 ++++++++++++++++++++++++++++++--- tests/pcap/imaps.pcap | Bin 0 -> 5540 bytes tests/result/imaps.pcap.out | 8 ++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 tests/pcap/imaps.pcap create mode 100644 tests/result/imaps.pcap.out diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index a062cdc8c..65600b74f 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -4356,9 +4356,34 @@ static void ndpi_reset_packet_line_info(struct ndpi_packet_struct *packet) { /* ********************************************************************************* */ +static int ndpi_check_protocol_port_mismatch_exceptions(struct ndpi_detection_module_struct *ndpi_str, + struct ndpi_flow_struct *flow, + ndpi_default_ports_tree_node_t *expected_proto, + ndpi_protocol *returned_proto) { + /* + For TLS (and other protocols) it is not simple to guess the exact protocol so before + triggering an alert we need to make sure what we have exhausted all the possible + options available + */ + + if(returned_proto->master_protocol == NDPI_PROTOCOL_TLS) { + switch(expected_proto->proto->protoId) { + case NDPI_PROTOCOL_MAIL_IMAPS: + case NDPI_PROTOCOL_MAIL_POPS: + case NDPI_PROTOCOL_MAIL_SMTPS: + return(1); /* This is a reasonable exception */ + break; + } + } + + return(0); +} + +/* ********************************************************************************* */ + static void ndpi_reconcile_protocols(struct ndpi_detection_module_struct *ndpi_str, - struct ndpi_flow_struct *flow, - ndpi_protocol *ret) { + struct ndpi_flow_struct *flow, + ndpi_protocol *ret) { /* Skype for a host doing MS Teams means MS Teams (MS Teams uses Skype as transport protocol for voice/video) @@ -4661,7 +4686,9 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct && (found->proto->protoId != NDPI_PROTOCOL_UNKNOWN) && (found->proto->protoId != ret.master_protocol)) { // printf("******** %u / %u\n", found->proto->protoId, ret.master_protocol); - NDPI_SET_BIT(flow->risk, NDPI_KNOWN_PROTOCOL_ON_NON_STANDARD_PORT); + + if(!ndpi_check_protocol_port_mismatch_exceptions(ndpi_str, flow, found, &ret)) + NDPI_SET_BIT(flow->risk, NDPI_KNOWN_PROTOCOL_ON_NON_STANDARD_PORT); } else if(default_ports && (default_ports[0] != 0)) { u_int8_t found = 0, i; diff --git a/tests/pcap/imaps.pcap b/tests/pcap/imaps.pcap new file mode 100644 index 0000000000000000000000000000000000000000..c038b57e2a94c061dde0969bfa965557ba1e60f3 GIT binary patch literal 5540 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 literal 0 HcmV?d00001 diff --git a/tests/result/imaps.pcap.out b/tests/result/imaps.pcap.out new file mode 100644 index 000000000..85fa9f3ec --- /dev/null +++ b/tests/result/imaps.pcap.out @@ -0,0 +1,8 @@ +ntop 20 5196 1 + +JA3 Host Stats: + IP Address # JA3C + 1 192.168.1.8 1 + + + 1 TCP 192.168.1.8:50506 <-> 167.99.215.164:993 [proto: 91.26/TLS.ntop][cat: Network/14][10 pkts/1220 bytes <-> 10 pkts/3976 bytes][Goodput ratio: 45/83][0.33 sec][bytes ratio: -0.530 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 33/22 77/43 26/19][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 122/398 293/1506 78/557][TLSv1.2][Client: mail.ntop.org][JA3C: 4923a265be4d81c68ecda45bb89cdf6a][ServerNames: mail.ntop.org][JA3S: b653c251b0ee54c3088fe7bb997cf59d][Issuer: C=US, O=Let's Encrypt, CN=Let's Encrypt Authority X3][Subject: CN=mail.ntop.org][Certificate SHA-1: F1:9A:35:30:96:57:5E:56:81:28:2C:D9:45:A5:83:21:9E:E8:C5:DF][Validity: 2020-04-18 00:15:22 - 2020-07-17 00:15:22][Cipher: TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384]