Added HAProxy protocol. (#2088)

* fixed tests/do.sh.in failure print

Signed-off-by: lns <matzeton@googlemail.com>
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2023-10-02 18:10:47 +02:00
committed by GitHub
parent 77e5daf03e
commit a98d7ff433
97 changed files with 216 additions and 94 deletions
+1
View File
@@ -378,6 +378,7 @@ typedef enum {
NDPI_PROTOCOL_SERVICE_LOCATION = 347,
NDPI_PROTOCOL_MULLVAD = 348,
NDPI_PROTOCOL_HTTP2 = 349,
NDPI_PROTOCOL_HAPROXY = 350,
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
+1
View File
@@ -245,6 +245,7 @@ void init_bitcoin_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_
void init_apache_thrift_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_slp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_http2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_haproxy_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
/* ndpi_main.c */
extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port);
+7
View File
@@ -2151,6 +2151,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"HTTP2", NDPI_PROTOCOL_CATEGORY_WEB,
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_HAPROXY,
"HAProxy", NDPI_PROTOCOL_CATEGORY_WEB,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -5221,6 +5225,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* HTTP/2 */
init_http2_dissector(ndpi_str, &a);
/* HAProxy */
init_haproxy_dissector(ndpi_str, &a);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+78
View File
@@ -0,0 +1,78 @@
/*
* haproxy.c
*
* Copyright (C) 2023 - ntop.org
*
* nDPI is free software: you can zmqtribute 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_HAPROXY
#include "ndpi_api.h"
static void ndpi_int_haproxy_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
{
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HAPROXY, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
}
static void ndpi_search_haproxy(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
struct ndpi_packet_struct *packet = &ndpi_struct->packet;
const uint8_t *haproxy_end;
NDPI_LOG_DBG(ndpi_struct, "search HAProxy\n");
if (packet->payload_packet_len < NDPI_STATICSTRING_LEN("PROXY TCP"))
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
if (strncmp((char *)packet->payload, "PROXY TCP", NDPI_STATICSTRING_LEN("PROXY TCP")) != 0)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
/* The following code may be also used in the future to call subprotocol dissectors e.g. TLS. */
haproxy_end = (uint8_t *)ndpi_strnstr((char *)packet->payload, "\r\n", packet->payload_packet_len);
if (haproxy_end == NULL)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
haproxy_end += 2;
if (packet->payload_packet_len - (haproxy_end - packet->payload) == 0)
{
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
ndpi_int_haproxy_add_connection(ndpi_struct, flow);
}
void init_haproxy_dissector(struct ndpi_detection_module_struct *ndpi_struct,
u_int32_t *id)
{
ndpi_set_bitmask_protocol_detection("HAProxy", ndpi_struct, *id,
NDPI_PROTOCOL_HAPROXY,
ndpi_search_haproxy,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK);
*id += 1;
}
+1 -1
View File
@@ -2543,7 +2543,7 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct,
}
} else if(extension_id == 65037 /* ECH: latest drafts */) {
#ifdef DEBUG_TLS
printf("Client TLS: ECH version 0x%x\n", extension_id;
printf("Client TLS: ECH version 0x%x\n", extension_id);
#endif
/* Beginning with draft-08, the version is the same as the code point
for the "encrypted_client_hello" extension. */