Add TiVoConnect dissector. Fixes #1697. (#1699)

* added static assert if supported, to complain if the flow struct changes

Signed-off-by: lns <matzeton@googlemail.com>
This commit is contained in:
Toni
2022-08-08 19:04:20 +02:00
committed by GitHub
parent 523360001e
commit 2e25c36396
118 changed files with 1945 additions and 1699 deletions
+1
View File
@@ -336,6 +336,7 @@ typedef enum {
NDPI_PROTOCOL_THREEMA = 305,
NDPI_PROTOCOL_ALICLOUD = 306,
NDPI_PROTOCOL_AVAST = 307,
NDPI_PROTOCOL_TIVOCONNECT = 308,
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
+1
View File
@@ -237,6 +237,7 @@ void init_avast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
void init_softether_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_activision_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_discord_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_tivoconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
/* ndpi_main.c */
extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port);
+18
View File
@@ -1447,6 +1447,13 @@ struct ndpi_flow_struct {
u_int8_t primitive; /* GET, SET... */
u_int8_t error_status;
} snmp;
struct {
char identity_uuid[36];
char machine[48];
char platform[32];
char services[48];
} tivoconnect;
} protos;
/*** ALL protocol specific 64 bit variables here ***/
@@ -1524,6 +1531,17 @@ struct ndpi_flow_struct {
u_int8_t priv_data[16];
};
#if !defined(NDPI_CFFI_PREPROCESSING) && defined(__linux__)
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
_Static_assert(sizeof(((struct ndpi_flow_struct *)0)->protos) <= 200,
"Size of the struct member protocols increased to more than 200 bytes, "
"please check if this change is necessary.");
_Static_assert(sizeof(struct ndpi_flow_struct) <= 904,
"Size of the flow struct increased to more than 904 bytes, "
"please check if this change is necessary.");
#endif
#endif
#define NDPI_PROTOCOL_DEFAULT_LEVEL 0
typedef struct {
+7
View File
@@ -1962,6 +1962,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"AVAST", NDPI_PROTOCOL_CATEGORY_NETWORK,
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, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_TIVOCONNECT,
"TiVoConnect", NDPI_PROTOCOL_CATEGORY_NETWORK,
ndpi_build_default_ports(ports_a, 2190, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 2190, 0, 0, 0, 0) /* UDP */);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -4547,6 +4551,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* Discord */
init_discord_dissector(ndpi_str, &a, detection_bitmask);
/* TiVoConnect */
init_tivoconnect_dissector(ndpi_str, &a, detection_bitmask);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+147
View File
@@ -0,0 +1,147 @@
/*
* tivoconnect.c
*
* Copyright (C) 2022 - ntop.org
*
* 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 <http://www.gnu.org/licenses/>.
*
*/
#include "ndpi_protocol_ids.h"
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_TIVOCONNECT
#include "ndpi_api.h"
static void ndpi_int_tivoconnect_add_connection(struct ndpi_detection_module_struct * const ndpi_struct,
struct ndpi_flow_struct * const flow)
{
NDPI_LOG_INFO(ndpi_struct, "found tivoconnect\n");
ndpi_set_detected_protocol(ndpi_struct, flow,
NDPI_PROTOCOL_TIVOCONNECT,
NDPI_PROTOCOL_UNKNOWN,
NDPI_CONFIDENCE_DPI);
}
static void dissect_tivoconnect_data(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
char const * const payload = (char const *)packet->payload;
size_t const payload_len = packet->payload_packet_len;
char const *key = payload;
char const *newline;
for (newline = ndpi_strnstr(payload, "\n", payload_len);
newline != NULL;
key = ++newline,
newline = ndpi_strnstr(newline, "\n", payload_len - (newline - payload)))
{
size_t const line_len = newline - key;
char const *value = ndpi_strnstr(key, "=", line_len);
if (value == NULL)
{
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Missing value type in TiViConnect beacon");
continue;
}
value++;
size_t const key_len = value - 1 - key;
size_t const value_len = newline - value;
if (key_len == NDPI_STATICSTRING_LEN("identity") &&
strncasecmp(key, "identity", key_len) == 0)
{
if (value_len >= NDPI_STATICSTRING_LEN("uuid:") &&
strncasecmp(value, "uuid:", NDPI_STATICSTRING_LEN("uuid:")) == 0)
{
size_t const len = ndpi_min(sizeof(flow->protos.tivoconnect.identity_uuid) - 1,
value_len - NDPI_STATICSTRING_LEN("uuid:"));
strncpy(flow->protos.tivoconnect.identity_uuid,
value + NDPI_STATICSTRING_LEN("uuid:"), len);
flow->protos.tivoconnect.identity_uuid[len] = '\0';
}
continue;
}
if (key_len == NDPI_STATICSTRING_LEN("machine") &&
strncasecmp(key, "machine", key_len) == 0)
{
size_t const len = ndpi_min(sizeof(flow->protos.tivoconnect.machine) - 1,
value_len);
strncpy(flow->protos.tivoconnect.machine, value, len);
flow->protos.tivoconnect.machine[len] = '\0';
continue;
}
if (key_len == NDPI_STATICSTRING_LEN("platform") &&
strncasecmp(key, "platform", key_len) == 0)
{
size_t const len = ndpi_min(sizeof(flow->protos.tivoconnect.platform) - 1,
value_len);
strncpy(flow->protos.tivoconnect.platform, value, len);
flow->protos.tivoconnect.platform[len] = '\0';
continue;
}
if (key_len == NDPI_STATICSTRING_LEN("services") &&
strncasecmp(key, "services", key_len) == 0)
{
size_t const len = ndpi_min(sizeof(flow->protos.tivoconnect.services) - 1,
value_len);
strncpy(flow->protos.tivoconnect.services, value, len);
flow->protos.tivoconnect.services[len] = '\0';
continue;
}
}
if ((size_t)(key - payload) != payload_len)
{
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET,
"TiViConnect beacon malformed packet");
}
}
void ndpi_search_tivoconnect(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
NDPI_LOG_INFO(ndpi_struct, "search tivoconnect\n");
if (packet->payload_packet_len >= NDPI_STATICSTRING_LEN("tivoconnect=") &&
strncasecmp((char const *)packet->payload,
"tivoconnect=", NDPI_STATICSTRING_LEN("tivoconnect=")) == 0)
{
ndpi_int_tivoconnect_add_connection(ndpi_struct, flow);
} else {
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
dissect_tivoconnect_data(ndpi_struct, flow);
}
void init_tivoconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct,
u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
{
ndpi_set_bitmask_protocol_detection("TiVoConnect", ndpi_struct, detection_bitmask, *id,
NDPI_PROTOCOL_TIVOCONNECT,
ndpi_search_tivoconnect,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK
);
*id += 1;
}