From 562b90d93cdf20931c9a31686aad1ed8eea49013 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Sun, 28 Aug 2016 00:41:39 +0200 Subject: [PATCH] Fix openvpn with multiple hard_reset_client not being recognized --- src/lib/protocols/openvpn.c | 22 +++++++++++++++------- tests/pcap/openvpn.pcap | Bin 31811 -> 61903 bytes tests/result/openvpn.pcap.out | 5 +++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/lib/protocols/openvpn.c b/src/lib/protocols/openvpn.c index f13b274c8..3e8412355 100644 --- a/src/lib/protocols/openvpn.c +++ b/src/lib/protocols/openvpn.c @@ -35,6 +35,7 @@ #define P_HMAC_160 20 // (RSA-|DSA-)SHA(1), ..others, SHA1 is openvpn default #define P_HARD_RESET_PACKET_ID_OFFSET(hmac_size) (9 + hmac_size) #define P_PACKET_ID_ARRAY_LEN_OFFSET(hmac_size) (P_HARD_RESET_PACKET_ID_OFFSET(hmac_size) + 8) +#define P_HARD_RESET_CLIENT_MAX_COUNT 5 static inline u_int32_t get_packet_id(const u_int8_t * payload, u_int8_t hms) { return ntohl(*(u_int32_t*)(payload + P_HARD_RESET_PACKET_ID_OFFSET(hms))); @@ -57,6 +58,7 @@ void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct, u_int8_t opcode; u_int8_t alen; int8_t hmac_size; + int8_t failed = 0; if (packet->payload_packet_len >= 40) { // skip openvpn TCP transport packet size @@ -65,7 +67,7 @@ void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct, opcode = ovpn_payload[0] & P_OPCODE_MASK; - if (flow->ovpn_counter == 0 && (opcode == P_CONTROL_HARD_RESET_CLIENT_V1 || + if (flow->ovpn_counter < P_HARD_RESET_CLIENT_MAX_COUNT && (opcode == P_CONTROL_HARD_RESET_CLIENT_V1 || opcode == P_CONTROL_HARD_RESET_CLIENT_V2)) { if (check_pkid_and_detect_hmac_size(ovpn_payload) > 0) { @@ -76,8 +78,8 @@ void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct, flow->ovpn_session_id[0], flow->ovpn_session_id[1], flow->ovpn_session_id[2], flow->ovpn_session_id[3], flow->ovpn_session_id[4], flow->ovpn_session_id[5], flow->ovpn_session_id[6], flow->ovpn_session_id[7]); } - } else if (flow->ovpn_counter == 1 && (opcode == P_CONTROL_HARD_RESET_SERVER_V1 || - opcode == P_CONTROL_HARD_RESET_SERVER_V2)) { + } else if (flow->ovpn_counter >= 1 && flow->ovpn_counter <= P_HARD_RESET_CLIENT_MAX_COUNT && + (opcode == P_CONTROL_HARD_RESET_SERVER_V1 || opcode == P_CONTROL_HARD_RESET_SERVER_V2)) { hmac_size = check_pkid_and_detect_hmac_size(ovpn_payload); @@ -87,16 +89,22 @@ void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct, if (memcmp(flow->ovpn_session_id, session_remote, 8) == 0) ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OPENVPN, NDPI_PROTOCOL_UNKNOWN); - else + else { NDPI_LOG(NDPI_PROTOCOL_OPENVPN, ndpi_struct, NDPI_LOG_DEBUG, "key mismatch: %02x%02x%02x%02x%02x%02x%02x%02x\n", session_remote[0], session_remote[1], session_remote[2], session_remote[3], session_remote[4], session_remote[5], session_remote[6], session_remote[7]); - } - } else if (flow->ovpn_counter >= 2) - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OPENVPN); + failed = 1; + } + } else + failed = 1; + } else + failed = 1; flow->ovpn_counter++; + + if (failed) + NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OPENVPN); } } diff --git a/tests/pcap/openvpn.pcap b/tests/pcap/openvpn.pcap index d0448afcc8ca304c30942f3f9876648d0437c982..9ae8351a12578c1de8e781890ac3792ba533bc48 100644 GIT binary patch delta 27182 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�$=Z$neS6TAmb5{20V3 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 WbAKZOzX%KEdn?bBDK$*&@BI(?AR9jb delta 9 QcmX^AnECJz#tqIj02=)S;Q#;t diff --git a/tests/result/openvpn.pcap.out b/tests/result/openvpn.pcap.out index 7f6a21fbc..81d959dc1 100644 --- a/tests/result/openvpn.pcap.out +++ b/tests/result/openvpn.pcap.out @@ -1,4 +1,5 @@ -OpenVPN 178 28939 2 +OpenVPN 298 57111 3 1 UDP 192.168.43.12:41507 <-> 139.59.151.137:13680 [proto: 159/OpenVPN][83 pkts/13559 bytes] - 2 TCP 192.168.1.77:60140 <-> 46.101.231.218:443 [proto: 159/OpenVPN][95 pkts/15380 bytes] + 2 UDP 192.168.43.18:13680 <-> 139.59.151.137:13680 [proto: 159/OpenVPN][120 pkts/28172 bytes] + 3 TCP 192.168.1.77:60140 <-> 46.101.231.218:443 [proto: 159/OpenVPN][95 pkts/15380 bytes]