Harden WireGuard detection
Exploit the fixed size handshake messages and sender/receiver indices.
This commit is contained in:
@@ -662,6 +662,10 @@ struct ndpi_flow_udp_struct {
|
||||
|
||||
/* NDPI_PROTOCOL_MEMCACHED */
|
||||
u_int8_t memcached_matches;
|
||||
|
||||
/* NDPI_PROTOCOL_WIREGUARD */
|
||||
u_int8_t wireguard_stage;
|
||||
u_int32_t wireguard_peer_index[2];
|
||||
}
|
||||
#ifndef WIN32
|
||||
__attribute__ ((__packed__))
|
||||
|
||||
@@ -28,34 +28,31 @@
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
/*
|
||||
* TODO: Detection mechanism can be improved by taking the properties
|
||||
* of specific message types into account. For example:
|
||||
* - Handshake messages have a fixed size.
|
||||
* - Counter field is an integer that is incremented with each packet.
|
||||
* - Receiver/sender index fields.
|
||||
* etc. (https://lists.zx2c4.com/pipermail/wireguard/2016-July/000185.html)
|
||||
* Exploiting these properties may reduce the probability of false positives;
|
||||
* with the tradeoff of requiring the inspection of multiple packets.
|
||||
*
|
||||
* Current approach identifies the protocol with a single packet and
|
||||
* does not yield false positives in any of the existing tests.
|
||||
*/
|
||||
|
||||
/*
|
||||
* See https://www.wireguard.com/protocol/ for protocol reference.
|
||||
*/
|
||||
|
||||
enum wg_message_type {
|
||||
WG_TYPE_HANDSHAKE_INITIATION = 1,
|
||||
WG_TYPE_HANDSHAKE_RESPONSE = 2,
|
||||
WG_TYPE_COOKIE_REPLY = 3,
|
||||
WG_TYPE_TRANSPORT_DATA = 4
|
||||
};
|
||||
|
||||
void ndpi_search_wireguard(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
const u_int8_t *payload = packet->payload;
|
||||
/*
|
||||
* The first byte of the payload is the message type.
|
||||
*/
|
||||
u_int8_t message_type = payload[0];
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search WireGuard\n");
|
||||
|
||||
/*
|
||||
* First, try some easy ways to rule out the protocol.
|
||||
* The packet size and the reserved bytes in the header are good candidates.
|
||||
*/
|
||||
|
||||
/*
|
||||
* A transport packet contains at minimum the following fields:
|
||||
* u8 message_type
|
||||
@@ -79,20 +76,87 @@ void ndpi_search_wireguard(struct ndpi_detection_module_struct
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Message type can have one of the following values:
|
||||
* 1) Handshake Initiation
|
||||
* 2) Handshake Response
|
||||
* 3) Cookie Reply
|
||||
* 4) Transport Data
|
||||
*/
|
||||
if (message_type == 0 || message_type > 4) {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WIREGUARD, NDPI_PROTOCOL_UNKNOWN);
|
||||
return;
|
||||
/*
|
||||
* Below we make a deeper analysis; possibly inspecting multiple packets to
|
||||
* look for consistent sender/receiver index fields. We also exploit the fact
|
||||
* that handshake messages always have a fixed size.
|
||||
*
|
||||
* Stages 1-2 means we are processing a handshake sequence.
|
||||
* Stages 3-4 means we are processing a transport packet sequence.
|
||||
*
|
||||
* Message type can be one of the following:
|
||||
* 1) Handshake Initiation (148 bytes)
|
||||
* 2) Handshake Response (92 bytes)
|
||||
* 3) Cookie Reply (64 bytes)
|
||||
* 4) Transport Data (variable length, min 32 bytes)
|
||||
*/
|
||||
if (message_type == WG_TYPE_HANDSHAKE_INITIATION && packet->payload_packet_len == 148) {
|
||||
u_int32_t sender_index = get_u_int32_t(payload, 4);
|
||||
/*
|
||||
* We always start a new detection stage on a handshake initiation.
|
||||
*/
|
||||
flow->l4.udp.wireguard_stage = 1 + packet->packet_direction;
|
||||
flow->l4.udp.wireguard_peer_index[packet->packet_direction] = sender_index;
|
||||
/* need more packets before deciding */
|
||||
} else if (message_type == WG_TYPE_HANDSHAKE_RESPONSE && packet->payload_packet_len == 92) {
|
||||
if (flow->l4.udp.wireguard_stage == 2 - packet->packet_direction) {
|
||||
/*
|
||||
* This means we are probably processing a handshake response to a handshake
|
||||
* initiation that we've just processed, so we check if the receiver index
|
||||
* matches the index in the handshake initiation.
|
||||
*/
|
||||
u_int32_t receiver_index = get_u_int32_t(payload, 8);
|
||||
if (receiver_index == flow->l4.udp.wireguard_peer_index[1 - packet->packet_direction]) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WIREGUARD, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
/* need more packets before deciding */
|
||||
} else if (message_type == WG_TYPE_COOKIE_REPLY && packet->payload_packet_len == 64) {
|
||||
/*
|
||||
* A cookie reply is sent as response to a handshake initiation when under load,
|
||||
* for DoS mitigation. If we have just seen a handshake initiation before
|
||||
* this cookie reply packet, we check if the receiver index in this packet
|
||||
* matches the sender index in that handshake initiation packet.
|
||||
*/
|
||||
if (flow->l4.udp.wireguard_stage == 2 - packet->packet_direction) {
|
||||
u_int32_t receiver_index = get_u_int32_t(payload, 4);
|
||||
if (receiver_index == flow->l4.udp.wireguard_peer_index[1 - packet->packet_direction]) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WIREGUARD, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
/* need more packets before deciding */
|
||||
} else if (message_type == WG_TYPE_TRANSPORT_DATA) {
|
||||
/*
|
||||
* For detecting transport data packets, we save the peer
|
||||
* indices in both directions first. This requires at least one packet in each
|
||||
* direction (stages 3-4). The third packet that we process will be checked
|
||||
* against the appropriate index for a match (stage 5).
|
||||
*/
|
||||
u_int32_t receiver_index = get_u_int32_t(payload, 4);
|
||||
if (flow->l4.udp.wireguard_stage == 0) {
|
||||
flow->l4.udp.wireguard_stage = 3 + packet->packet_direction;
|
||||
flow->l4.udp.wireguard_peer_index[packet->packet_direction] = receiver_index;
|
||||
/* need more packets before deciding */
|
||||
} else if (flow->l4.udp.wireguard_stage == 4 - packet->packet_direction) {
|
||||
flow->l4.udp.wireguard_peer_index[packet->packet_direction] = receiver_index;
|
||||
flow->l4.udp.wireguard_stage = 5;
|
||||
/* need more packets before deciding */
|
||||
} else if (flow->l4.udp.wireguard_stage == 5) {
|
||||
if (receiver_index == flow->l4.udp.wireguard_peer_index[packet->packet_direction]) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WIREGUARD, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
/* need more packets before deciding */
|
||||
} else {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
|
||||
void init_wireguard_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
@@ -106,4 +170,3 @@ void init_wireguard_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user