aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ndpi_main.c19
-rw-r--r--src/lib/protocols/haproxy.c81
-rw-r--r--src/lib/protocols/tls.c5
3 files changed, 102 insertions, 3 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 7a50731d6..b15f383f4 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -2150,6 +2150,14 @@ 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 */);
+ ndpi_set_proto_subprotocols(ndpi_str, NDPI_PROTOCOL_HAPROXY,
+ NDPI_PROTOCOL_CALL_EXCLUDED,
+ NDPI_PROTOCOL_TLS,
+ NDPI_PROTOCOL_NO_MORE_SUBPROTOCOLS);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -5216,6 +5224,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
@@ -6143,6 +6154,7 @@ static u_int32_t check_ndpi_subprotocols(struct ndpi_detection_module_struct * c
u_int16_t detected_protocol)
{
u_int32_t num_calls = 0, a;
+ int call_excluded = 0;
if(detected_protocol == NDPI_PROTOCOL_UNKNOWN)
{
@@ -6152,6 +6164,11 @@ static u_int32_t check_ndpi_subprotocols(struct ndpi_detection_module_struct * c
for (a = 0; a < ndpi_str->proto_defaults[detected_protocol].subprotocol_count; a++)
{
u_int16_t subproto_id = ndpi_str->proto_defaults[detected_protocol].subprotocols[a];
+ if(subproto_id == (uint16_t)NDPI_PROTOCOL_CALL_EXCLUDED)
+ {
+ call_excluded = 1;
+ continue;
+ }
if(subproto_id == (uint16_t)NDPI_PROTOCOL_MATCHED_BY_CONTENT ||
subproto_id == flow->detected_protocol_stack[0] ||
subproto_id == flow->detected_protocol_stack[1])
@@ -6163,7 +6180,7 @@ static u_int32_t check_ndpi_subprotocols(struct ndpi_detection_module_struct * c
if((ndpi_str->callback_buffer[subproto_index].ndpi_selection_bitmask & ndpi_selection_packet) ==
ndpi_str->callback_buffer[subproto_index].ndpi_selection_bitmask &&
NDPI_BITMASK_COMPARE(flow->excluded_protocol_bitmask,
- ndpi_str->callback_buffer[subproto_index].excluded_protocol_bitmask) == 0 &&
+ ndpi_str->callback_buffer[subproto_index].excluded_protocol_bitmask) == call_excluded &&
NDPI_BITMASK_COMPARE(ndpi_str->callback_buffer[subproto_index].detection_bitmask,
detection_bitmask) != 0)
{
diff --git a/src/lib/protocols/haproxy.c b/src/lib/protocols/haproxy.c
new file mode 100644
index 000000000..80b180a49
--- /dev/null
+++ b/src/lib/protocols/haproxy.c
@@ -0,0 +1,81 @@
+/*
+ * 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"
+
+extern void switch_to_tls(struct ndpi_detection_module_struct *ndpi_struct,
+ struct ndpi_flow_struct *flow);
+
+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;
+ }
+
+ ndpi_int_haproxy_add_connection(ndpi_struct, flow);
+
+ haproxy_end = (uint8_t *)ndpi_strnstr((char *)packet->payload, "\r\n", packet->payload_packet_len);
+ if (haproxy_end == NULL)
+ {
+ return;
+ }
+ haproxy_end += 2;
+ if (packet->payload_packet_len - (haproxy_end - packet->payload) == 0)
+ {
+ return;
+ }
+
+ packet->payload_packet_len -= haproxy_end - packet->payload;
+ packet->payload = haproxy_end;
+}
+
+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;
+}
diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c
index bedc3be59..4263edeaf 100644
--- a/src/lib/protocols/tls.c
+++ b/src/lib/protocols/tls.c
@@ -1509,7 +1509,8 @@ static void ndpi_int_tls_add_connection(struct ndpi_detection_module_struct *ndp
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, protocol, NDPI_CONFIDENCE_DPI);
- tlsInitExtraPacketProcessing(ndpi_struct, flow);
+ if(!flow->extra_packets_func)
+ tlsInitExtraPacketProcessing(ndpi_struct, flow);
}
/* **************************************** */
@@ -2543,7 +2544,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. */
Powered by cgit, Themed by Ted Yin.