diff options
author | Luca Deri <lucaderi@users.noreply.github.com> | 2019-08-22 19:31:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-22 19:31:51 +0200 |
commit | 1e8a43d51ec1add545085ee900d5d3c2451ef651 (patch) | |
tree | 3b1c37621b92dd8f2a6d87c7d72f883ee239ed67 | |
parent | e7c0ac37d87958c80115e7553ea39b26668ce360 (diff) | |
parent | cdf61de12948e94f1f3cc707f7efbf2f3610944e (diff) |
Merge pull request #758 from tansly/wireguard
Add support for WireGuard VPN
-rw-r--r-- | src/include/ndpi_protocol_ids.h | 2 | ||||
-rw-r--r-- | src/include/ndpi_protocols.h | 2 | ||||
-rw-r--r-- | src/include/ndpi_typedefs.h | 4 | ||||
-rw-r--r-- | src/lib/ndpi_main.c | 9 | ||||
-rw-r--r-- | src/lib/protocols/wireguard.c | 172 | ||||
-rw-r--r-- | tests/pcap/wireguard.pcap | bin | 0 -> 815956 bytes | |||
-rw-r--r-- | tests/result/wireguard.pcap.out | 3 |
7 files changed, 188 insertions, 4 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index a7e496a2d..d988cd140 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -240,7 +240,7 @@ typedef enum { NDPI_PROTOCOL_GITHUB = 203, NDPI_PROTOCOL_BJNP = 204, NDPI_PROTOCOL_LINE = 205, /* https://en.wikipedia.org/wiki/Line_(software) */ - NDPI_PROTOCOL_FREE206 = 206, /* Free */ + NDPI_PROTOCOL_WIREGUARD = 206, NDPI_PROTOCOL_SMPP = 207, /* Damir Franusic <df@release14.org> */ NDPI_PROTOCOL_DNSCRYPT = 208, NDPI_PROTOCOL_TINC = 209, /* William Guglielmo <william@deselmo.com> */ diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 67cf6d4de..cb96270f1 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -205,6 +205,7 @@ void ndpi_search_csgo(struct ndpi_detection_module_struct *ndpi_struct, struct n void ndpi_search_ajp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); void ndpi_search_memcached(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); void ndpi_search_nest_log_sink(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); +void ndpi_search_wireguard(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); void ndpi_search_targus_getdata(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); void ndpi_search_apple_push(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); void ndpi_search_amazon_video(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow); @@ -369,6 +370,7 @@ void init_nest_log_sink_dissector(struct ndpi_detection_module_struct *ndpi_stru void init_ookla_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_modbus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_line_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_wireguard_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_targus_getdata_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); #endif /* __NDPI_PROTOCOLS_H__ */ diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index c206da93c..019d50155 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -711,6 +711,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__)) diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index fd5a407a8..cca061856 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1009,11 +1009,11 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "Line", NDPI_PROTOCOL_CATEGORY_VOIP, 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_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_FREE206, + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_WIREGUARD, 0 /* can_have_a_subprotocol */, no_master, - no_master, "Free206", NDPI_PROTOCOL_CATEGORY_MEDIA, + no_master, "WireGuard", NDPI_PROTOCOL_CATEGORY_VPN, 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_build_default_ports(ports_b, 51820, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_PPSTREAM, 0 /* can_have_a_subprotocol */, no_master, no_master, "PPStream", NDPI_PROTOCOL_CATEGORY_VIDEO, @@ -3275,6 +3275,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* Nest Log Sink */ init_nest_log_sink_dissector(ndpi_struct, &a, detection_bitmask); + /* WireGuard VPN */ + init_wireguard_dissector(ndpi_struct, &a, detection_bitmask); + /* AMAZON_VIDEO */ init_amazon_video_dissector(ndpi_struct, &a, detection_bitmask); diff --git a/src/lib/protocols/wireguard.c b/src/lib/protocols/wireguard.c new file mode 100644 index 000000000..902113bf4 --- /dev/null +++ b/src/lib/protocols/wireguard.c @@ -0,0 +1,172 @@ +/* + * wireguard.c + * + * Copyright (C) 2019 - ntop.org + * Copyright (C) 2019 - Yağmur Oymak + * + * 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 <http://www.gnu.org/licenses/>. + * + */ + +#include "ndpi_protocol_ids.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_WIREGUARD + +#include "ndpi_api.h" + +/* + * 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; + 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 + * u8 reserved_zero[3] + * u32 receiver_index + * u64 counter + * u8 encrypted_encapsulated_packet[] + * In the case of a keepalive message, the encapsulated packet will have + * zero length, but will still have a 16 byte poly1305 authentication tag. + * Thus, packet->payload will be at least 32 bytes in size. + * Note that handshake packets have a slightly different structure, but they are larger. + */ + if (packet->payload_packet_len < 32) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + /* + * The next three bytes after the message type are reserved and set to zero. + */ + if (payload[1] != 0 || payload[2] != 0 || payload[3] != 0) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + 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) +{ + ndpi_set_bitmask_protocol_detection("WireGuard", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_WIREGUARD, + ndpi_search_wireguard, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} diff --git a/tests/pcap/wireguard.pcap b/tests/pcap/wireguard.pcap Binary files differnew file mode 100644 index 000000000..a7df1208b --- /dev/null +++ b/tests/pcap/wireguard.pcap diff --git a/tests/result/wireguard.pcap.out b/tests/result/wireguard.pcap.out new file mode 100644 index 000000000..5b0d7dba4 --- /dev/null +++ b/tests/result/wireguard.pcap.out @@ -0,0 +1,3 @@ +WireGuard 2399 734182 1 + + 1 UDP 139.162.192.157:51820 <-> 192.168.0.14:36116 [proto: 206/WireGuard][cat: VPN/2][1362 pkts/518526 bytes <-> 1037 pkts/215656 bytes][PLAIN TEXT (RJxM17)] |