From 4148c5e065d32128eea17c0e228e372ad72eef82 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Sun, 3 May 2020 18:20:21 +0200 Subject: [PATCH] Removed now obsolete MSN protocol Added nats.io protocol dissector --- src/include/ndpi_protocol_ids.h | 2 +- src/include/ndpi_protocols.h | 2 +- src/lib/ndpi_content_match.c.inc | 3 +- src/lib/ndpi_main.c | 9 +- src/lib/protocols/msn.c | 526 ------------------------------- src/lib/protocols/nats.c | 83 +++++ tests/pcap/msnms.pcap | Bin 62351 -> 0 bytes tests/pcap/nats.pcap | Bin 0 -> 2916 bytes tests/result/msnms.pcap.out | 8 - tests/result/nats.pcap.out | 4 + 10 files changed, 97 insertions(+), 540 deletions(-) delete mode 100644 src/lib/protocols/msn.c create mode 100644 src/lib/protocols/nats.c delete mode 100644 tests/pcap/msnms.pcap create mode 100644 tests/pcap/nats.pcap delete mode 100644 tests/result/msnms.pcap.out create mode 100644 tests/result/nats.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index e16eeb9ee..b63f1525c 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -97,7 +97,7 @@ typedef enum { NDPI_PROTOCOL_IRC = 65, NDPI_PROTOCOL_AYIYA = 66, NDPI_PROTOCOL_UNENCRYPTED_JABBER = 67, - NDPI_PROTOCOL_MSN = 68, + NDPI_PROTOCOL_NATS = 68, NDPI_PROTOCOL_OSCAR = 69, NDPI_PROTOCOL_YAHOO = 70, NDPI_PROTOCOL_BATTLEFIELD = 71, diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 34dab2d51..29ff27959 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -108,7 +108,7 @@ void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i void init_mgpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_mining_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); -void init_msn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_nats_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_mssql_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_mysql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index 410586fb7..33334471d 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -8891,8 +8891,6 @@ static ndpi_protocol_match host_match[] = { { ".last.fm", NULL, "\\.last\\.fm$", "LastFM", NDPI_PROTOCOL_LASTFM, NDPI_PROTOCOL_CATEGORY_MUSIC, NDPI_PROTOCOL_FUN }, - { "msn.com", NULL, "msn" TLD, "MSN", NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE }, /* News site */ - { "netflix.com", NULL, "netflix" TLD, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_VIDEO, NDPI_PROTOCOL_FUN }, { "nflxext.com", NULL, "nflxext" TLD, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_VIDEO, NDPI_PROTOCOL_FUN }, { "nflximg.com", NULL, "nflximg" TLD, "NetFlix", NDPI_PROTOCOL_NETFLIX, NDPI_PROTOCOL_CATEGORY_VIDEO, NDPI_PROTOCOL_FUN }, @@ -8991,6 +8989,7 @@ static ndpi_protocol_match host_match[] = { { ".deezer.com", NULL, "\\.deezer" TLD, "Deezer", NDPI_PROTOCOL_DEEZER, NDPI_PROTOCOL_CATEGORY_MUSIC, NDPI_PROTOCOL_FUN }, + { "msn.com", NULL, "msn" TLD, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE }, { "i-msdn.sec.s-msft.com", NULL, "i-msdn.sec\\.s-msft" TLD, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, NDPI_PROTOCOL_ACCEPTABLE }, { "i2-msdn.sec.s-msft.com", NULL, "i2-msdn\\.sec\\.s-msft" TLD, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, NDPI_PROTOCOL_ACCEPTABLE }, { ".webtrends.com", NULL, "\\.webtrends" TLD, "Microsoft", NDPI_PROTOCOL_MICROSOFT, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE }, diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 18ab1e46e..d16bd91ea 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -915,6 +915,11 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); + ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_NATS, + 0 /* can_have_a_subprotocol */, no_master, no_master, "Nats", + NDPI_PROTOCOL_CATEGORY_RPC, + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_NTOP, 0 /* can_have_a_subprotocol */, no_master, no_master, "ntop", NDPI_PROTOCOL_CATEGORY_NETWORK, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, @@ -2980,8 +2985,8 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* DIRECTCONNECT */ init_directconnect_dissector(ndpi_str, &a, detection_bitmask); - /* MSN */ - init_msn_dissector(ndpi_str, &a, detection_bitmask); + /* NATS */ + init_nats_dissector(ndpi_str, &a, detection_bitmask); /* YAHOO */ init_yahoo_dissector(ndpi_str, &a, detection_bitmask); diff --git a/src/lib/protocols/msn.c b/src/lib/protocols/msn.c deleted file mode 100644 index 0b262ca0d..000000000 --- a/src/lib/protocols/msn.c +++ /dev/null @@ -1,526 +0,0 @@ -/* - * msn.c - * - * Copyright (C) 2009-2011 by ipoque GmbH - * Copyright (C) 2011-20 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MSN - -#include "ndpi_api.h" - -#define MAX_PACKETS_FOR_MSN 100 - -static void ndpi_int_msn_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MSN, NDPI_PROTOCOL_UNKNOWN); -} - -static u_int8_t ndpi_int_find_xmsn(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &flow->packet; - - if(packet->parsed_lines > 3) { - u_int16_t i; - for(i = 2; i < packet->parsed_lines; i++) { - if(packet->line[i].ptr != NULL && packet->line[i].len > NDPI_STATICSTRING_LEN("X-MSN") && - memcmp(packet->line[i].ptr, "X-MSN", NDPI_STATICSTRING_LEN("X-MSN")) == 0) { - return 1; - } - } - } - return 0; -} - -/* search over TCP */ -static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &flow->packet; - - struct ndpi_id_struct *src = flow->src; - struct ndpi_id_struct *dst = flow->dst; - - u_int16_t plen; - u_int16_t status = 0; - - if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_TLS) { - - NDPI_LOG_DBG2(ndpi_struct, "msn ssl ft test\n"); - - if(flow->packet_counter < 10) { - if(flow->packet_counter == 7 && packet->payload_packet_len > 300) { - if(memcmp(packet->payload + 24, "MSNSLP", 6) == 0 - || (get_u_int32_t(packet->payload, 0) == htonl(0x30000000) - && get_u_int32_t(packet->payload, 4) == 0x00000000)) { - NDPI_LOG_INFO(ndpi_struct, "found MSN File Transfer, ifdef ssl\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - - if(flow->packet_counter >= 5 && flow->packet_counter <= 10 - && (get_u_int32_t(packet->payload, 0) == htonl(0x18000000) - && get_u_int32_t(packet->payload, 4) == 0x00000000)) { - flow->l4.tcp.msn_ssl_ft++; - NDPI_LOG_DBG2(ndpi_struct, - "increased msn ft ssl stage to: %u at packet nr: %u\n", - flow->l4.tcp.msn_ssl_ft, - flow->packet_counter); - if (flow->l4.tcp.msn_ssl_ft == 2) { - NDPI_LOG_INFO(ndpi_struct, - "found MSN File Transfer, ifdef ssl 2.\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - } - - return; - } - } - } - - /* we detect the initial connection only ! */ - /* match: "VER " ..... "CVR" x 0x0d 0x0a - * len should be small, lets say less than 100 bytes - * x is now "0", but can be increased - */ - /* now we have a look at the first packet only. */ - if(flow->packet_counter == 1 - || ((packet->detected_protocol_stack[0] == NDPI_PROTOCOL_TLS) - && flow->packet_counter <= 3) - ) { - - /* this part is working asymmetrically */ - if(packet->payload_packet_len > 32 - && (packet->payload[0] == 0x02 || packet->payload[0] == 0x00) - && (ntohl(get_u_int32_t(packet->payload, 8)) == 0x2112a442 - || ntohl(get_u_int32_t(packet->payload, 4)) == 0x2112a442) - && ((ntohl(get_u_int32_t(packet->payload, 24)) == 0x000f0004 - && ntohl(get_u_int32_t(packet->payload, 28)) == 0x72c64bc6) - || (ntohl(get_u_int32_t(packet->payload, 20)) == 0x000f0004 - && ntohl(get_u_int32_t(packet->payload, 24)) == 0x72c64bc6))) { - NDPI_LOG_INFO(ndpi_struct, - "found MSN in packets that also contain voice.messenger.live.com.\n"); - - /* TODO this is an alternative pattern for video detection */ - /* if (packet->payload_packet_len > 100 && - get_u_int16_t(packet->payload, 86) == htons(0x05dc)) { */ - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - - /* this case works asymmetrically */ - if (packet->payload_packet_len > 10 && packet->payload_packet_len < 100) { - if (get_u_int8_t(packet->payload, packet->payload_packet_len - 2) == 0x0d - && get_u_int8_t(packet->payload, packet->payload_packet_len - 1) == 0x0a) { - /* The MSNP string is used in XBOX clients. */ - if (ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "VER ")) { - - if (memcmp(&packet->payload[packet->payload_packet_len - 6], "CVR", - 3) == 0 || memcmp(&packet->payload[packet->payload_packet_len - 8], "MSNP", 4) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found MSN by pattern VER...CVR/MSNP ODOA\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - if (ndpi_match_strprefix(&packet->payload[4], packet->payload_packet_len-4, "MSNFT")) { - NDPI_LOG_INFO(ndpi_struct, "found MSN FT by pattern VER MSNFT...0d0a\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - } - } - - if( - packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP || - ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "GET ") || - ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "POST ")) { - ndpi_parse_packet_line_info(ndpi_struct, flow); - if (packet->user_agent_line.ptr != NULL && - packet->user_agent_line.len > NDPI_STATICSTRING_LEN("Messenger/") && - memcmp(packet->user_agent_line.ptr, "Messenger/", NDPI_STATICSTRING_LEN("Messenger/")) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found MSN Messenger/\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - - /* not seen this pattern in any trace */ - /* now test for http login, at least 100 a bytes packet */ - if(packet->payload_packet_len > 100) { - if( - packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP || - memcmp(packet->payload, "POST http://", 12) == 0) { - /* scan packet if not already done... */ - ndpi_parse_packet_line_info(ndpi_struct, flow); - - if(packet->content_line.ptr != NULL && - ((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") && - memcmp(packet->content_line.ptr, "application/x-msn-messenger", - NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) || - (packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") && - memcmp(packet->content_line.ptr, "text/x-msnmsgr", - NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) { - NDPI_LOG_INFO(ndpi_struct, "found MSN POST application/x-msn-messenger\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - } - /* now test for http login that uses a gateway, at least 400 a bytes packet */ - /* for this case the asymmetric detection is asym (1) */ - if(packet->payload_packet_len > 400) { - if(( - packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP || - (memcmp(packet->payload, "POST ", 5) == 0))) { - u_int16_t c; - if(memcmp(&packet->payload[5], "http://", 7) == 0) { - /* - * We are searching for a pattern "POST http://gateway.messenger.hotmail.com/gateway/gateway.dll" or - * "POST http:///gateway/gateway.dll" - * POST http:// is 12 byte so we are searching for 13 to 70 byte for this paten. - */ - for(c = 13; c < 50; c++) { - if(memcmp(&packet->payload[c], "/", 1) == 0) { - if(memcmp(&packet->payload[c], "/gateway/gateway.dll", 20) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "found pattern http://.../gateway/gateway.ddl\n"); - status = 1; - break; - } - } - } - } else if((memcmp(&packet->payload[5], "/gateway/gateway.dll", 20) == 0)) { - NDPI_LOG_DBG2(ndpi_struct, "found pattern http://.../gateway/gateway.ddl\n"); - status = 1; - } - } - if(status) { - u_int16_t a; - - ndpi_parse_packet_line_info(ndpi_struct, flow); - - if(packet->content_line.ptr != NULL && ((packet->content_line.len == 23 - && memcmp(packet->content_line.ptr, "text/xml; charset=utf-8", 23) == 0) - || - (packet->content_line.len == 24 - && memcmp(packet->content_line.ptr, "text/html; charset=utf-8", 24) == 0) - || - (packet->content_line.len == 33 - && memcmp(packet->content_line.ptr, "application/x-www-form-urlencoded", 33) == 0))) { - - if ((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0) - || (dst != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)) { - - NDPI_LOG_INFO(ndpi_struct, "found MSN with pattern text/xml; charset=utf-8\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - for(a = 0; a < packet->parsed_lines; a++) { - if(packet->line[a].len >= 4 && (memcmp(packet->line[a].ptr, "CVR ", 4) == 0 - || memcmp(packet->line[a].ptr, "VER ", 4) == 0 || - memcmp(packet->line[a].ptr, "ANS ", 4) == 0)) { - - NDPI_LOG_DBG2(ndpi_struct, "found MSN with pattern text/sml; charset0utf-8\n"); - NDPI_LOG_INFO(ndpi_struct, "found MSN xml CVS / VER / ANS found\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - } - } - } - /* asym (1) ; possibly occurs in symmetric cases also. */ - if(flow->packet_counter <= 10 && - (flow->packet_direction_counter[0] <= 2 || flow->packet_direction_counter[1] <= 2) - && packet->payload_packet_len > 100) { - /* not necessary to check the length, because this has been done : >400. */ - if( - packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP || - ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.0 200 OK") || - ndpi_match_strprefix(packet->payload, packet->payload_packet_len, "HTTP/1.1 200 OK") - ) { - - ndpi_parse_packet_line_info(ndpi_struct, flow); - - if(packet->content_line.ptr != NULL && - ((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") && - memcmp(packet->content_line.ptr, "application/x-msn-messenger", NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) || - (packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") && - memcmp(packet->content_line.ptr, "text/x-msnmsgr", NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) { - - NDPI_LOG_INFO(ndpi_struct, - "found MSN application/x-msn-messenger.\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - if(ndpi_int_find_xmsn(ndpi_struct, flow) == 1) { - NDPI_LOG_INFO(ndpi_struct, "found MSN X-MSN\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - } - /* did not find any trace with this pattern */ - /* now block proxy connection */ - if(packet->payload_packet_len >= 42) { - if(memcmp(packet->payload, "CONNECT messenger.hotmail.com:1863 HTTP/1.", 42) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found MSN with pattern CONNECT messenger.hotmail.com:1863 HTTP/1.\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - if (packet->payload_packet_len >= 18) { - - if (memcmp(packet->payload, "USR ", 4) == 0 || memcmp(packet->payload, "ANS ", 4) == 0) { - /* now we must see a number */ - const u_int16_t endlen = packet->payload_packet_len - 12; - plen = 4; - while (1) { - if (packet->payload[plen] == ' ') { - break; - } - if (packet->payload[plen] < '0' || packet->payload[plen] > '9') { - goto ndpi_msn_exclude; - } - plen++; - if (plen >= endlen) { - goto ndpi_msn_exclude; - } - } - - while (plen < endlen) { - if (ndpi_check_for_email_address(ndpi_struct, flow, plen) != 0) { - NDPI_LOG_DBG2(ndpi_struct, "found mail address\n"); - break; - } - if (packet->payload_packet_len > plen + 1 - && (packet->payload[plen] < 20 || packet->payload[plen] > 128)) { - goto ndpi_msn_exclude; - } - plen++; - if (plen >= endlen) { - goto ndpi_msn_exclude; - } - } - NDPI_LOG_INFO(ndpi_struct, "found MSN with pattern USR/ANS ...mail_address\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - } - /* finished examining the first packet only. */ - - /* asym (1) ; possibly occurs in symmetric cases also. */ - if(flow->packet_counter <= 10 && - (flow->packet_direction_counter[0] <= 2 || flow->packet_direction_counter[1] <= 2) && - packet->payload_packet_len > 100) { - /* not necessary to check the length, because this has been done : >400. */ - if( - packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP || - (memcmp(packet->payload, "HTTP/1.0 200 OK", 15) == 0) || - (memcmp(packet->payload, "HTTP/1.1 200 OK", 15) == 0)) { - - ndpi_parse_packet_line_info(ndpi_struct, flow); - - if(packet->content_line.ptr != NULL && ((packet->content_line.len == NDPI_STATICSTRING_LEN("application/x-msn-messenger") && - memcmp(packet->content_line.ptr, "application/x-msn-messenger", - NDPI_STATICSTRING_LEN("application/x-msn-messenger")) == 0) || - (packet->content_line.len >= NDPI_STATICSTRING_LEN("text/x-msnmsgr") && - memcmp(packet->content_line.ptr, "text/x-msnmsgr", NDPI_STATICSTRING_LEN("text/x-msnmsgr")) == 0))) { - - NDPI_LOG_INFO(ndpi_struct, "found MSN application/x-msn-messenger\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - if(ndpi_int_find_xmsn(ndpi_struct, flow) == 1) { - NDPI_LOG_INFO(ndpi_struct, "found MSN X-MSN\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - } - /* finished examining the second packet only */ - /* direct user connection (file transfer,...) */ - - if((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0) - || (dst != NULL - && NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)) { - if (flow->packet_counter == 1 && - packet->payload_packet_len > 12 && memcmp(packet->payload, "recipientid=", 12) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found MSN file transfer\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - return; - } - } - /* MSN File Transfer of MSN 8.1 and 8.5 - * first packet with length 4 and pattern 0x04000000 - * second packet (in the same direction), with length 56 and pattern 0x00000000 from payload[16] - * third packet (in the opposite direction to 1 & 2), with length 4 and pattern 0x30000000 - */ - if(flow->l4.tcp.msn_stage == 0) { - /* asymmetric detection to this pattern is asym (2) */ - if((packet->payload_packet_len == 4 || packet->payload_packet_len == 8) - && get_u_int32_t(packet->payload, 0) == htonl(0x04000000)) { - - NDPI_LOG_DBG2(ndpi_struct, "maybe first TCP MSN detected\n"); - - if(packet->payload_packet_len == 8 && get_u_int32_t(packet->payload, 4) == htonl(0x666f6f00)) { - flow->l4.tcp.msn_stage = 5 + packet->packet_direction; - return; - } - flow->l4.tcp.msn_stage = 1 + packet->packet_direction; - return; - } - /* asymmetric detection to this pattern is asym (2) */ - } else if (flow->l4.tcp.msn_stage == 1 + packet->packet_direction) { - if (packet->payload_packet_len > 10 && get_u_int32_t(packet->payload, 0) == htonl(0x666f6f00)) { - ndpi_int_msn_add_connection(ndpi_struct, flow); - NDPI_LOG_INFO(ndpi_struct, "found MSN File Transfer 1\n"); - return; - } - /* did not see this pattern in any trace */ - if (packet->payload_packet_len == 56 && get_u_int32_t(packet->payload, 16) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "maybe Second TCP MSN detected\n"); - flow->l4.tcp.msn_stage = 3 + packet->packet_direction; - return; - } - - - } else if (flow->l4.tcp.msn_stage == 2 - packet->packet_direction - && packet->payload_packet_len == 4 && get_u_int32_t(packet->payload, 0) == htonl(0x30000000)) { - ndpi_int_msn_add_connection(ndpi_struct, flow); - NDPI_LOG_INFO(ndpi_struct, "found MSN File Transfer 2\n"); - return; - } else if ((flow->l4.tcp.msn_stage == 3 + packet->packet_direction) - || (flow->l4.tcp.msn_stage == 4 - packet->packet_direction)) { - if (packet->payload_packet_len == 4 && get_u_int32_t(packet->payload, 0) == htonl(0x30000000)) { - ndpi_int_msn_add_connection(ndpi_struct, flow); - NDPI_LOG_INFO(ndpi_struct, "found MSN File Transfer 2\n"); - return; - } - } else if (flow->l4.tcp.msn_stage == 6 - packet->packet_direction) { - if ((packet->payload_packet_len == 4) && - (get_u_int32_t(packet->payload, 0) == htonl(0x10000000) || get_u_int32_t(packet->payload, 0) == htonl(0x30000000))) { - ndpi_int_msn_add_connection(ndpi_struct, flow); - NDPI_LOG_INFO(ndpi_struct, "found MSN File Transfer 3\n"); - return; - } - } else if (flow->l4.tcp.msn_stage == 5 + packet->packet_direction) { - if ((packet->payload_packet_len == 20) && get_u_int32_t(packet->payload, 0) == htonl(0x10000000)) { - ndpi_int_msn_add_connection(ndpi_struct, flow); - NDPI_LOG_INFO(ndpi_struct, "found MSN File Transfer 3\n"); - return; - } - } - NDPI_LOG_DBG(ndpi_struct, "msn 7\n"); - - if (flow->packet_counter <= MAX_PACKETS_FOR_MSN) { - if (packet->payload_packet_len >=4 && (memcmp(&packet->payload[0], "MSG ", 4) == 0 - || memcmp(&packet->payload[0], "PNG", 3) == 0 - || memcmp(&packet->payload[0], "QNG ", 4) == 0 - || memcmp(&packet->payload[0], "OUT", 3) == 0 - || memcmp(&packet->payload[0], "RNG ", 4) == 0 - || memcmp(&packet->payload[0], "NLN ", 4) == 0 - || memcmp(&packet->payload[0], "UBX ", 4) == 0 - || memcmp(&packet->payload[0], "XFR ", 4) == 0) - ){ - ndpi_int_msn_add_connection(ndpi_struct, flow); - - NDPI_LOG_INFO(ndpi_struct, "found MSN\n"); - return; - } - } - ndpi_msn_exclude: - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - -/* search over UDP */ -static void ndpi_search_msn_udp_misc(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &flow->packet; - - struct ndpi_id_struct *src = flow->src; - struct ndpi_id_struct *dst = flow->dst; - - - /* do we have an msn login ? */ - if ((src == NULL || NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) == 0) - && (dst == NULL - || NDPI_COMPARE_PROTOCOL_TO_BITMASK(dst->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) == 0)) { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - return; - } - - /* asymmetric ft detection works */ - if (packet->payload_packet_len == 20 - && get_u_int32_t(packet->payload, 4) == 0 && packet->payload[9] == 0 - && get_u_int16_t(packet->payload, 10) == htons(0x0100)) { - NDPI_LOG_INFO(ndpi_struct, "found MSN udp misc data connection\n"); - ndpi_int_msn_add_connection(ndpi_struct, flow); - } - - /* asymmetric detection working. */ - return; - //} -} - - -void ndpi_search_msn(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &flow->packet; - - NDPI_LOG_DBG(ndpi_struct, "search msn\n"); - /* this if request should always be true */ - if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSN) == 0) { - /* we deal with tcp now */ - if(packet->tcp != NULL) { - /* msn can use http or ssl for connection. That's why every http, ssl and ukn packet must enter in the msn detection */ - /* the detection can switch out the http or the ssl detection. In this case we need not check those protocols */ - // need to do the ceck when protocol == http too (POST /gateway ...) - if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN - || packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP - || packet->detected_protocol_stack[0] == NDPI_PROTOCOL_TLS - || packet->detected_protocol_stack[0] == NDPI_PROTOCOL_STUN - ) - ndpi_search_msn_tcp(ndpi_struct, flow); - } else if (packet->udp != NULL) { - ndpi_search_msn_udp_misc(ndpi_struct, flow); - } - } -} - - -void init_msn_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) -{ - - NDPI_BITMASK_RESET(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask); - - ndpi_set_bitmask_protocol_detection("MSN", ndpi_struct, detection_bitmask, *id, - NDPI_PROTOCOL_MSN, - ndpi_search_msn, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} - diff --git a/src/lib/protocols/nats.c b/src/lib/protocols/nats.c new file mode 100644 index 000000000..a979fdbb9 --- /dev/null +++ b/src/lib/protocols/nats.c @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2020 - ntop.org + * + * This file is part of nDPI, an open source deep packet inspection + * library based on the OpenDPI and PACE technology by ipoque GmbH + * + * nDPI is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * nDPI is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with nDPI. If not, see . + * + */ + +#include "ndpi_protocol_ids.h" +#include "ndpi_api.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_NATS + +static const char* commands[] = + { + "INFO {", + "CONNECT {", + "PUB ", + "SUB", + "UNSUB ", + "MSG ", + "PING", + "PONG", + "+OK", + "-ERR", + NULL + }; + +void ndpi_search_nats_tcp(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) { + struct ndpi_packet_struct *packet = &flow->packet; + + /* Check connection over TCP */ + NDPI_LOG_DBG(ndpi_struct, "search NATS\n"); + + if(packet->tcp && (packet->payload_packet_len > 4)) { + int i; + + for(i=0; commands[i] != NULL; i++) { + char *match = ndpi_strnstr((const char *)flow->packet.payload, + commands[i], + flow->packet.payload_packet_len); + + if(!match) continue; + + if(ndpi_strnstr((const char *)match, "\r\n", + flow->packet.payload_packet_len - ((unsigned long)flow->packet.payload - (unsigned long)match)) != NULL) { + NDPI_LOG_INFO(ndpi_struct, "found NATS\n"); + + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NATS, NDPI_PROTOCOL_UNKNOWN); + return; + } + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + } +} + + + +void init_nats_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { + ndpi_set_bitmask_protocol_detection("Nats", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_NATS, + ndpi_search_nats_tcp, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + *id += 1; +} diff --git a/tests/pcap/msnms.pcap b/tests/pcap/msnms.pcap deleted file mode 100644 index ebcc569a71539161f3671108d216d40adf65b31a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62351 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 diff --git a/tests/pcap/nats.pcap b/tests/pcap/nats.pcap new file mode 100644 index 0000000000000000000000000000000000000000..1e04720f880502f41bd16ec2135f6e6fc2fb5d18 GIT binary patch literal 2916 zcmeH|Z%7ky7{_mFF$|YQi9v)M3cVP^n{!)|IX!JVwW%4cf|5B;J=k`7o0^2y8v~)2 zLGOb8AW<)}KlY{V@>C-t;mEwC}UKO>fNZqBp&0+i%?McYN;qe4l6E zd-wGIwLGSPS%0a=w-zs*xjtcK8nHnu537k`eDv{cWtj5}W1+QFUOfJNa{eH;nd!W> zwN)3cEvS2M$+|IP1J@TLj_JLICphTl=!w_u!%p0KEk(dIRW!~!_kC@n#G=QJSjyo zKP01xE=3$1k`xh@YgcLgf=AJCybtB_IMlbGk_@C4MC53y3u2@nh9{LFajdAYT?qPB zTYjP(BU{v&^zoSOS=jP6mn~}#tjr-;LQAuyCfgPrrxYAV#+De_+uoK|wdbL+D$V3s zm@H&9i)b-w)}5I@u)0h@SCOXAnm0Svfl&~byfVhSGgP9=1o#pf!~8^<|vp(6Q${F z2Db!WZA@KaDb%}36C6!j32EDm)A`C&>Qap=N1wV0((^xcbEhtn`S+C)uXJb{`KX(Ddj;v-8ZR9pojVx|6^DH1$9jWScs-{+mqduXCb_FyeuQsR( s=~WSJYK1s6%f_m792%j_6H4W%UJ>mXXhy2E4u(+UGE}`;e{QO@U#dn3KmY&$ literal 0 HcmV?d00001 diff --git a/tests/result/msnms.pcap.out b/tests/result/msnms.pcap.out deleted file mode 100644 index 37542b32e..000000000 --- a/tests/result/msnms.pcap.out +++ /dev/null @@ -1,8 +0,0 @@ -MSN 364 56503 6 - - 1 TCP 192.168.1.14:1208 <-> 207.46.108.83:1863 [proto: 68/MSN][cat: Web/5][43 pkts/7166 bytes <-> 48 pkts/9557 bytes][Goodput ratio: 68/73][521.13 sec][bytes ratio: -0.143 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 846/212 7349/5896 44758/28730 8212/5167][Pkt Len c2s/s2c min/avg/max/stddev: 59/65 167/199 525/333 61/41][PLAIN TEXT (ANS 89 jujurius@msn.com 1115371)] - 2 TCP 192.168.1.14:1221 <-> 207.46.108.59:1863 [proto: 68/MSN][cat: Web/5][43 pkts/7062 bytes <-> 40 pkts/7349 bytes][Goodput ratio: 67/71][521.81 sec][bytes ratio: -0.020 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 204/243 6666/6488 86912/66364 14190/11227][Pkt Len c2s/s2c min/avg/max/stddev: 59/78 164/184 347/320 46/54][PLAIN TEXT (USR 178 OK jujurius@msn.com Jul)] - 3 TCP 192.168.1.14:1217 <-> 207.46.108.41:1863 [proto: 68/MSN][cat: Web/5][46 pkts/7655 bytes <-> 19 pkts/3761 bytes][Goodput ratio: 68/73][333.85 sec][bytes ratio: 0.341 (Upload)][IAT c2s/s2c min/avg/max/stddev: 1004/231 6764/4683 59999/15340 8873/3555][Pkt Len c2s/s2c min/avg/max/stddev: 59/66 166/198 551/291 66/53][PLAIN TEXT (IRO 131 1 1 cecile260992@hotmai)] - 4 TCP 192.168.1.14:1037 <-> 207.46.107.149:1863 [proto: 68/MSN][cat: Web/5][41 pkts/2425 bytes <-> 55 pkts/6426 bytes][Goodput ratio: 9/54][1955.26 sec][bytes ratio: -0.452 (Download)][IAT c2s/s2c min/avg/max/stddev: 11047/159 47968/36072 131306/50206 17449/15623][Pkt Len c2s/s2c min/avg/max/stddev: 59/62 59/117 65/406 1/113][PLAIN TEXT (RNG 17069658 207.46.108.83)] - 5 TCP 192.168.1.14:1220 <-> 207.46.108.150:1863 [proto: 68/MSN][cat: Web/5][2 pkts/163 bytes <-> 14 pkts/2737 bytes][Goodput ratio: 34/72][168.98 sec][bytes ratio: -0.888 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/240 0/8648 0/58353 0/15116][Pkt Len c2s/s2c min/avg/max/stddev: 59/66 82/196 104/315 22/61][PLAIN TEXT (IRO 176 1 1 cecile260992@hotmai)] - 6 TCP 192.168.1.14:1176 -> 207.46.108.39:1863 [proto: 68/MSN][cat: Web/5][13 pkts/2202 bytes -> 0 pkts/0 bytes][Goodput ratio: 68/0][110.19 sec][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 334/0 9562/0 59851/0 15959/0][Pkt Len c2s/s2c min/avg/max/stddev: 59/0 169/0 427/0 79/0][PLAIN TEXT (MSG 77 U 89)] diff --git a/tests/result/nats.pcap.out b/tests/result/nats.pcap.out new file mode 100644 index 000000000..424772a68 --- /dev/null +++ b/tests/result/nats.pcap.out @@ -0,0 +1,4 @@ +Nats 27 2460 2 + + 1 TCP 127.0.0.1:54821 <-> 127.0.0.1:4222 [proto: 68/Nats][cat: RPC/16][7 pkts/545 bytes <-> 7 pkts/725 bytes][Goodput ratio: 26/44][2.20 sec][bytes ratio: -0.142 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 1/1 3/3 1/1][Pkt Len c2s/s2c min/avg/max/stddev: 56/56 78/104 191/365 46/107][PLAIN TEXT (rINFO )] + 2 TCP 127.0.0.1:54820 <-> 127.0.0.1:4222 [proto: 68/Nats][cat: RPC/16][7 pkts/527 bytes <-> 6 pkts/663 bytes][Goodput ratio: 26/47][0.01 sec][bytes ratio: -0.114 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 2/2 7/7 3/3][Pkt Len c2s/s2c min/avg/max/stddev: 44/56 75/110 191/365 48/114][PLAIN TEXT (bINFO )]