From f5d6cd511ecbf19bc434fcabb6c2304976359ea1 Mon Sep 17 00:00:00 2001 From: Luca Date: Sun, 5 Jul 2015 19:21:12 +0200 Subject: [PATCH] Added support for Snapchat Reworked code to better handle host-based protocols --- src/include/ndpi_protocol_ids.h | 3 ++- src/lib/ndpi_content_match.c.inc | 6 +++++ src/lib/ndpi_main.c | 40 +++++++++++++++++++++++++++---- src/lib/protocols/skype.c | 9 ------- tests/pcap/snapchat.pcap | Bin 0 -> 11119 bytes tests/result/snapchat.pcap.out | 6 +++++ 6 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 tests/pcap/snapchat.pcap create mode 100644 tests/result/snapchat.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 8b7dca46d..67b6189b7 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -245,9 +245,10 @@ #define NDPI_SERVICE_QUICKPLAY 196 /* Streaming service used by various services such as hooq.tv */ #define NDPI_SERVICE_TIM 197 /* Traffic for tim.com.br and tim.it */ #define NDPI_PROTOCOL_MPEGTS 198 +#define NDPI_SERVICE_SNAPCHAT 199 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ -#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MPEGTS +#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_SNAPCHAT #define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1) #define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL) diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index 42d423482..9d4256da8 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -7372,6 +7372,12 @@ ndpi_protocol_match host_match[] = { { "quickplay.com", "QuickPlay", NDPI_SERVICE_QUICKPLAY, NDPI_PROTOCOL_FUN }, { "tim.com.br", "TIM", NDPI_SERVICE_TIM, NDPI_PROTOCOL_ACCEPTABLE }, { "tim.it", "TIM", NDPI_SERVICE_TIM, NDPI_PROTOCOL_ACCEPTABLE }, + + /* https://support.cipafilter.com/index.php?/Knowledgebase/Article/View/117/0/snapchat---how-to-block */ + { "feelinsonice.appspot.com", "Snapchat", NDPI_SERVICE_SNAPCHAT, NDPI_PROTOCOL_FUN }, + { "feelinsonice-hrd.appspot.com", "Snapchat", NDPI_SERVICE_SNAPCHAT, NDPI_PROTOCOL_FUN }, + { "feelinsonice.com", "Snapchat", NDPI_SERVICE_SNAPCHAT, NDPI_PROTOCOL_FUN }, + { NULL, 0 } }; diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 8650b37c3..e4efcfc2d 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -530,15 +530,25 @@ void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod, u_int16_t tcp_master_protoId[2], u_int16_t udp_master_protoId[2], char *protoName, ndpi_port_range *tcpDefPorts, ndpi_port_range *udpDefPorts) { - char *name = ndpi_strdup(protoName); + char *name; int j; if(protoId >= NDPI_MAX_SUPPORTED_PROTOCOLS+NDPI_MAX_NUM_CUSTOM_PROTOCOLS) { - printf("[NDPI] %s(protoId=%d): INTERNAL ERROR\n", __FUNCTION__, protoId); - ndpi_free(name); +#ifdef DEBUG + printf("[NDPI] %s(%s/protoId=%d): INTERNAL ERROR\n", __FUNCTION__, protoName, protoId); +#endif return; } + if(ndpi_mod->proto_defaults[protoId].protoName != NULL) { +#ifdef DEBUG + printf("[NDPI] %s(%s/protoId=%d): already initialized. Ignoring it\n", __FUNCTION__, protoName, protoId); +#endif + return; + } + + name = ndpi_strdup(protoName); + ndpi_mod->proto_defaults[protoId].protoName = name, ndpi_mod->proto_defaults[protoId].protoId = protoId, ndpi_mod->proto_defaults[protoId].protoBreed = breed; @@ -672,6 +682,10 @@ static int ndpi_string_to_automa(struct ndpi_detection_module_struct *ndpi_struc static int ndpi_add_host_url_subprotocol(struct ndpi_detection_module_struct *ndpi_struct, char *value, int protocol_id, ndpi_protocol_breed_t breed) { +#ifdef DEBUG + printf("[NDPI] Adding [%s][%d]\n", value, protocol_id); +#endif + return(ndpi_string_to_automa(ndpi_struct, &ndpi_struct->host_automa, value, protocol_id, breed)); } @@ -681,7 +695,8 @@ static int ndpi_add_host_url_subprotocol(struct ndpi_detection_module_struct *nd int ndpi_add_content_subprotocol(struct ndpi_detection_module_struct *ndpi_struct, char *value, int protocol_id, ndpi_protocol_breed_t breed) { - return(ndpi_string_to_automa(ndpi_struct, &ndpi_struct->content_automa, value, protocol_id, breed)); + return(ndpi_string_to_automa(ndpi_struct, &ndpi_struct->content_automa, + value, protocol_id, breed)); } /* ****************************************************** */ @@ -705,6 +720,9 @@ static void init_string_based_protocols(struct ndpi_detection_module_struct *ndp int i; for(i=0; host_match[i].string_to_match != NULL; i++) { + u_int16_t no_master[2] = { NDPI_PROTOCOL_NO_MASTER_PROTO, NDPI_PROTOCOL_NO_MASTER_PROTO }; + ndpi_port_range ports_a[MAX_DEFAULT_PORTS], ports_b[MAX_DEFAULT_PORTS]; + ndpi_add_host_url_subprotocol(ndpi_mod, host_match[i].string_to_match, host_match[i].protocol_id, host_match[i].protocol_breed); @@ -713,8 +731,20 @@ static void init_string_based_protocols(struct ndpi_detection_module_struct *ndp ndpi_mod->proto_defaults[host_match[i].protocol_id].protoId = host_match[i].protocol_id; ndpi_mod->proto_defaults[host_match[i].protocol_id].protoBreed = host_match[i].protocol_breed; } + + ndpi_set_proto_defaults(ndpi_mod, + ndpi_mod->proto_defaults[host_match[i].protocol_id].protoBreed, + ndpi_mod->proto_defaults[host_match[i].protocol_id].protoId, + no_master, no_master, + ndpi_mod->proto_defaults[host_match[i].protocol_id].protoName, + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); } +#ifdef DEBUG + ac_automata_display(ndpi_mod->host_automa.ac_automa, 'n'); +#endif + for(i=0; content_match[i].string_to_match != NULL; i++) ndpi_add_content_subprotocol(ndpi_mod, content_match[i].string_to_match, content_match[i].protocol_id, @@ -5280,7 +5310,7 @@ static int ndpi_automa_match_string_subprotocol(struct ndpi_detection_module_str struct ndpi_packet_struct *packet = &flow->packet; AC_TEXT_t ac_input_text; - if((automa->ac_automa == NULL) || (string_to_match_len== 0)) return(NDPI_PROTOCOL_UNKNOWN); + if((automa->ac_automa == NULL) || (string_to_match_len == 0)) return(NDPI_PROTOCOL_UNKNOWN); if(!automa->ac_automa_finalized) { ac_automata_finalize((AC_AUTOMATA_t*)automa->ac_automa); diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c index ba9396925..339147dfa 100644 --- a/src/lib/protocols/skype.c +++ b/src/lib/protocols/skype.c @@ -119,15 +119,6 @@ void ndpi_search_skype(struct ndpi_detection_module_struct *ndpi_struct, struct } void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_port_range ports_a[MAX_DEFAULT_PORTS], ports_b[MAX_DEFAULT_PORTS]; - u_int16_t no_master[2] = { NDPI_PROTOCOL_NO_MASTER_PROTO, NDPI_PROTOCOL_NO_MASTER_PROTO }; - - ndpi_set_proto_defaults(ndpi_struct, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_SKYPE, - no_master, - no_master, "Skype", - 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_bitmask_protocol_detection("Skype", ndpi_struct, detection_bitmask, *id, NDPI_PROTOCOL_SKYPE, ndpi_search_skype, diff --git a/tests/pcap/snapchat.pcap b/tests/pcap/snapchat.pcap new file mode 100644 index 0000000000000000000000000000000000000000..874f2f4c491ffd2b13b68a577823a0a4eb04f89a GIT binary patch literal 11119 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 literal 0 HcmV?d00001 diff --git a/tests/result/snapchat.pcap.out b/tests/result/snapchat.pcap.out new file mode 100644 index 000000000..cb75d1a87 --- /dev/null +++ b/tests/result/snapchat.pcap.out @@ -0,0 +1,6 @@ +SSL_No_Cert 22 2879 1 +Snapchat 34 7320 2 + + 1 TCP 10.8.0.1:56193 <-> 74.125.136.141:443 [proto: 199/Snapchat][17 pkts/3943 bytes][SSL client: feelinsonice-hrd.appspot.com] + 2 TCP 10.8.0.1:44536 <-> 74.125.136.141:443 [proto: 199/Snapchat][17 pkts/3377 bytes][SSL client: feelinsonice-hrd.appspot.com] + 3 TCP 10.8.0.1:33233 <-> 74.125.136.141:443 [proto: 64/SSL_No_Cert][22 pkts/2879 bytes]