Improved NATPMP dissection. (#1745)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2022-09-21 18:24:04 +02:00
committed by GitHub
parent d6701e8979
commit 644ad34962
10 changed files with 185 additions and 69 deletions
+7
View File
@@ -1475,6 +1475,13 @@ struct ndpi_flow_struct {
char platform[32];
char services[48];
} tivoconnect;
struct {
u_int16_t result_code;
u_int16_t internal_port;
u_int16_t external_port;
ndpi_ip_addr_t external_address;
} natpmp;
} protos;
/*** ALL protocol specific 64 bit variables here ***/
+10
View File
@@ -1327,6 +1327,16 @@ int ndpi_dpi2json(struct ndpi_detection_module_struct *ndpi_struct,
ndpi_serialize_end_of_block(serializer);
break;
case NDPI_PROTOCOL_NATPMP:
ndpi_serialize_start_of_block(serializer, "natpmp");
ndpi_serialize_string_uint32(serializer, "result", flow->protos.natpmp.result_code);
ndpi_serialize_string_uint32(serializer, "internal_port", flow->protos.natpmp.internal_port);
ndpi_serialize_string_uint32(serializer, "external_port", flow->protos.natpmp.external_port);
inet_ntop(AF_INET, &flow->protos.natpmp.external_address.ipv4, buf, sizeof(buf));
ndpi_serialize_string_string(serializer, "external_address", buf);
ndpi_serialize_end_of_block(serializer);
break;
case NDPI_PROTOCOL_STUN:
ndpi_serialize_start_of_block(serializer, "stun");
ndpi_serialize_string_uint32(serializer, "num_pkts", flow->stun.num_pkts);
+123 -47
View File
@@ -31,11 +31,14 @@ enum natpmp_type {
NATPMP_REQUEST_ADDRESS = 0x00,
NATPMP_REQUEST_UDP_MAPPING = 0x01,
NATPMP_REQUEST_TCP_MAPPING = 0x02,
NATPMP_RESPONSE_ADRESS = 0x80,
NATPMP_RESPONSE_ADDRESS = 0x80,
NATPMP_RESPONSE_UDP_MAPPING = 0x81,
NATPMP_RESPONSE_TCP_MAPPING = 0x82
};
static int ndpi_search_natpmp_extra(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow);
static void ndpi_int_natpmp_add_connection(struct ndpi_detection_module_struct * const ndpi_struct,
struct ndpi_flow_struct * const flow)
{
@@ -44,6 +47,119 @@ static void ndpi_int_natpmp_add_connection(struct ndpi_detection_module_struct *
NDPI_PROTOCOL_NATPMP,
NDPI_PROTOCOL_UNKNOWN,
NDPI_CONFIDENCE_DPI);
if (flow->extra_packets_func == NULL)
{
flow->max_extra_packets_to_check = 5;
flow->extra_packets_func = ndpi_search_natpmp_extra;
}
}
static void natpmp_disable_extra_dissection(struct ndpi_flow_struct * const flow)
{
flow->max_extra_packets_to_check = 0;
flow->extra_packets_func = NULL;
}
static int natpmp_is_common_header(struct ndpi_packet_struct const * const packet)
{
return packet->payload_packet_len >= 2 && packet->payload[0] == 0x00 /* Protocol version: 0x00 */;
}
static int natpmp_is_valid(struct ndpi_packet_struct const * const packet, enum natpmp_type * const natpmp_type)
{
if (natpmp_is_common_header(packet) == 0)
{
return 0;
}
*natpmp_type = packet->payload[1];
switch (*natpmp_type)
{
case NATPMP_REQUEST_ADDRESS:
if (packet->payload_packet_len != 2)
{
return 0;
}
break;
case NATPMP_REQUEST_UDP_MAPPING:
case NATPMP_REQUEST_TCP_MAPPING:
if (packet->payload_packet_len != 12 || get_u_int16_t(packet->payload, 2) != 0x0000)
{
return 0;
}
break;
case NATPMP_RESPONSE_ADDRESS:
case NATPMP_RESPONSE_UDP_MAPPING:
case NATPMP_RESPONSE_TCP_MAPPING:
if ((*natpmp_type == NATPMP_RESPONSE_ADDRESS && packet->payload_packet_len != 12) ||
(*natpmp_type != NATPMP_RESPONSE_ADDRESS && packet->payload_packet_len != 16))
{
return 0;
}
{
u_int16_t result_code = ntohs(get_u_int16_t(packet->payload, 2));
if (result_code > 5)
{
return 0;
}
}
break;
default:
return 0;
}
return 1;
}
static int ndpi_search_natpmp_extra(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
enum natpmp_type natpmp_type;
if (natpmp_is_valid(packet, &natpmp_type) == 0)
{
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Invalid NATPMP Header");
return 0;
}
switch (natpmp_type)
{
case NATPMP_REQUEST_ADDRESS:
return 1; // Nothing to do here.
case NATPMP_REQUEST_UDP_MAPPING:
case NATPMP_REQUEST_TCP_MAPPING:
flow->protos.natpmp.internal_port = ntohs(get_u_int16_t(packet->payload, 4));
flow->protos.natpmp.external_port = ntohs(get_u_int16_t(packet->payload, 6));
if (flow->protos.natpmp.internal_port == 0)
{
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Request Port Mapping: Internal port must not 0");
}
break;
case NATPMP_RESPONSE_ADDRESS:
flow->protos.natpmp.result_code = ntohs(get_u_int16_t(packet->payload, 2));
flow->protos.natpmp.external_address.ipv4 = get_u_int32_t(packet->payload, 8);
if (flow->protos.natpmp.result_code != 0 && flow->protos.natpmp.external_address.ipv4 != 0)
{
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Address Response: Result code indicates an error, but External IPv4 Address is set");
}
break;
case NATPMP_RESPONSE_UDP_MAPPING:
case NATPMP_RESPONSE_TCP_MAPPING:
{
flow->protos.natpmp.internal_port = ntohs(get_u_int16_t(packet->payload, 8));
flow->protos.natpmp.external_port = ntohs(get_u_int16_t(packet->payload, 12));
if (flow->protos.natpmp.internal_port == 0 || flow->protos.natpmp.external_port == 0)
{
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Port Mapping Response: Internal/External port must not 0");
}
break;
}
}
return 1;
}
void ndpi_search_natpmp(struct ndpi_detection_module_struct *ndpi_struct,
@@ -54,60 +170,20 @@ void ndpi_search_natpmp(struct ndpi_detection_module_struct *ndpi_struct,
NDPI_LOG_DBG(ndpi_struct, "search nat-pmp\n");
if (packet->payload_packet_len < 2 || packet->payload[0] != 0x00 /* Protocol version: 0x00 */)
if (natpmp_is_valid(packet, &natpmp_type) == 0)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
natpmp_type = packet->payload[1];
switch (natpmp_type)
{
case NATPMP_REQUEST_ADDRESS:
if (packet->payload_packet_len != 2)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
}
return;
case NATPMP_REQUEST_UDP_MAPPING:
case NATPMP_REQUEST_TCP_MAPPING:
if (packet->payload_packet_len != 12 || get_u_int16_t(packet->payload, 2) != 0x0000)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
break;
case NATPMP_RESPONSE_ADRESS:
case NATPMP_RESPONSE_UDP_MAPPING:
case NATPMP_RESPONSE_TCP_MAPPING:
if ((natpmp_type == NATPMP_RESPONSE_ADRESS && packet->payload_packet_len != 12) ||
(natpmp_type != NATPMP_RESPONSE_ADRESS && packet->payload_packet_len != 16))
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
{
u_int16_t result_code = ntohs(get_u_int16_t(packet->payload, 2));
if (result_code > 5)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
}
break;
default:
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
if (flow->packet_counter > 2 ||
if ((flow->packet_counter > 2 && natpmp_type != NATPMP_REQUEST_ADDRESS) ||
ntohs(packet->udp->source) == NATPMP_PORT || ntohs(packet->udp->dest) == NATPMP_PORT)
{
ndpi_int_natpmp_add_connection(ndpi_struct, flow);
if (ndpi_search_natpmp_extra(ndpi_struct, flow) == 0)
{
natpmp_disable_extra_dissection(flow);
}
}
}