diff options
| author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2023-09-18 14:06:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 14:06:09 +0200 |
| commit | 6925890383659b01cad4322d7051d2710bc9b723 (patch) | |
| tree | 6093b08a184144a2e9489043d11f9b635ebe33c0 /src | |
| parent | 70814002a98ec52deda2ff61ac03613916c3efeb (diff) | |
Add support for (un-encrypted) HTTP/2 (#2087)
Plaintext HTTP/2 is quite rare on the general "internet" but it is
used in some private networks (example: 5G core network)
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 7 | ||||
| -rw-r--r-- | src/lib/protocols/http2.c | 67 |
4 files changed, 76 insertions, 0 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index d4cb02ebb..e909d7b20 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -377,6 +377,7 @@ typedef enum { NDPI_PROTOCOL_ROBLOX = 346, NDPI_PROTOCOL_SERVICE_LOCATION = 347, NDPI_PROTOCOL_MULLVAD = 348, + NDPI_PROTOCOL_HTTP2 = 349, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 4dae42c48..6c9da92a6 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -244,6 +244,7 @@ void init_epicgames_dissector(struct ndpi_detection_module_struct *ndpi_struct, void init_bitcoin_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); 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); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 17d1cd36c..9f0b946a6 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2146,6 +2146,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "OperaVPN", 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_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_HTTP2, + "HTTP/2", 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" @@ -5209,6 +5213,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* Service Location Protocol */ init_slp_dissector(ndpi_str, &a); + /* HTTP/2 */ + init_http2_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/http2.c b/src/lib/protocols/http2.c new file mode 100644 index 000000000..085d10aae --- /dev/null +++ b/src/lib/protocols/http2.c @@ -0,0 +1,67 @@ +/* + * http2.c + * + * Copyright (C) 2023 - ntop.org + * + * 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_HTTP2 + +#include "ndpi_api.h" + +static void ndpi_int_http2_add_connection(struct ndpi_detection_module_struct * const ndpi_struct, + struct ndpi_flow_struct * const flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found HTTP/2\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HTTP2, + NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); +} + +void ndpi_search_http2(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + const char magic[] = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"; + + NDPI_LOG_DBG(ndpi_struct, "search http2\n"); + + if(packet->payload_packet_len < NDPI_STATICSTRING_LEN(magic)) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if(strncmp((char const *)packet->payload, magic, NDPI_STATICSTRING_LEN(magic)) == 0) { + ndpi_int_http2_add_connection(ndpi_struct, flow); + return; + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_http2_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("HTTP/2", ndpi_struct, *id, + NDPI_PROTOCOL_HTTP2, + ndpi_search_http2, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + *id += 1; +} |