From bc68949c769150c8a708505398168afa394ba27a Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 7 Apr 2017 08:05:39 +0200 Subject: [PATCH] Added AMQP (Advanced Message Queueing Protocol) --- src/include/ndpi_protocol_ids.h | 7 +-- src/include/ndpi_protocols.h | 1 + src/lib/Makefile.am | 1 + src/lib/ndpi_main.c | 9 +++- src/lib/protocols/amqp.c | 83 ++++++++++++++++++++++++++++++++ tests/pcap/amqp.pcap | Bin 0 -> 26098 bytes tests/result/amqp.pcap.out | 5 ++ 7 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 src/lib/protocols/amqp.c create mode 100644 tests/pcap/amqp.pcap create mode 100644 tests/result/amqp.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 5afa63c92..dfb39af8d 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -1,7 +1,7 @@ /* * ndpi_protocol_ids.h * - * Copyright (C) 2016 - ntop.org + * Copyright (C) 2011-17 - ntop.org * * This file is part of nDPI, an open source deep packet inspection * library based on the OpenDPI and PACE technology by ipoque GmbH @@ -228,10 +228,7 @@ #define NDPI_PROTOCOL_WHATSAPP_VOICE 189 #define NDPI_PROTOCOL_EAQ 190 #define NDPI_PROTOCOL_OOKLA 191 - -/* 192 is free */ -#define NDPI_PROTOCOL_FREE_192 192 - +#define NDPI_PROTOCOL_AMQP 192 #define NDPI_PROTOCOL_KAKAOTALK 193 /* KakaoTalk Chat (no voice call) */ #define NDPI_PROTOCOL_KAKAOTALK_VOICE 194 /* KakaoTalk Voice */ #define NDPI_PROTOCOL_TWITCH 195 /* Edoardo Dominici */ diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index edf4ca3dc..b3b4092b4 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -202,6 +202,7 @@ void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_battlefield_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 987975c47..3770c9cfc 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -21,6 +21,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \ protocols/applejuice.c \ protocols/armagetron.c \ protocols/ayiya.c \ + protocols/amqp.c \ protocols/battlefield.c \ protocols/bgp.c \ protocols/bittorrent.c \ diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 2250928c4..9a2c5d7a5 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1611,9 +1611,13 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "Ookla", NDPI_PROTOCOL_CATEGORY_NETWORK_TOOL, 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_AMQP, + no_master, + no_master, "AMQP", NDPI_PROTOCOL_CATEGORY_RPC, + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0), /* TCP */ + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0)); /* UDP */ /* To be removed as soon as we define new protocols */ - ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_192); ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_197); ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_208); ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_209); @@ -2687,6 +2691,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* BITTORRENT */ init_bittorrent_dissector(ndpi_struct, &a, detection_bitmask); + /* AMQP */ + init_amqp_dissector(ndpi_struct, &a, detection_bitmask); + /* ----------------------------------------------------------------- */ diff --git a/src/lib/protocols/amqp.c b/src/lib/protocols/amqp.c new file mode 100644 index 000000000..72bbc0a38 --- /dev/null +++ b/src/lib/protocols/amqp.c @@ -0,0 +1,83 @@ +/* + * amqp.c + * + * Copyright (C) 2011-17 - 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 . + * + */ + + +#include "ndpi_protocols.h" +#ifdef NDPI_PROTOCOL_AMQP + +PACK_ON +struct amqp_header { + u_int8_t ptype; + u_int16_t channel; + u_int32_t length; + u_int16_t class_id, method; +} PACK_OFF; + +static void ndpi_int_amqp_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow/* , */ + /* ndpi_protocol_type_t protocol_type */) { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AMQP, NDPI_PROTOCOL_UNKNOWN); +} + +void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { + struct ndpi_packet_struct *packet = &flow->packet; + + NDPI_LOG(NDPI_PROTOCOL_AMQP, ndpi_struct, NDPI_LOG_DEBUG, "search amqp. \n"); + + if (packet->tcp != NULL) { + if(packet->payload_packet_len > sizeof(struct amqp_header)) { + struct amqp_header *h = (struct amqp_header*)packet->payload; + + if(h->ptype <= 3) { + u_int32_t length = htonl(h->length); + + if(((length+8) >= packet->payload_packet_len) + && (length < 32768) /* Upper bound */) { + u_int16_t class_id = htons(h->class_id); + + if((class_id >= 10) /* Connection */ + && (class_id <= 110) /* Tunnel */) { + u_int16_t method = htons(h->method); + + if(method <= 120 /* Method basic NACK */) { + NDPI_LOG(NDPI_PROTOCOL_AMQP, ndpi_struct, NDPI_LOG_DEBUG, "found amqp over tcp. \n"); + ndpi_int_amqp_add_connection(ndpi_struct, flow); + return; + } + } + } + } + } + } +} + + +void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { + ndpi_set_bitmask_protocol_detection("AMQP", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_AMQP, + ndpi_search_amqp, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} + +#endif diff --git a/tests/pcap/amqp.pcap b/tests/pcap/amqp.pcap new file mode 100644 index 0000000000000000000000000000000000000000..30633f1ed2512275d42cfbdfba9d26613adcf375 GIT binary patch literal 26098 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 literal 0 HcmV?d00001 diff --git a/tests/result/amqp.pcap.out b/tests/result/amqp.pcap.out new file mode 100644 index 000000000..200394193 --- /dev/null +++ b/tests/result/amqp.pcap.out @@ -0,0 +1,5 @@ +AMQP 160 23514 3 + + 1 TCP 127.0.0.1:44205 <-> 127.0.1.1:5672 [proto: 192/AMQP][108 pkts/14423 bytes] + 2 TCP 127.0.0.1:44204 <-> 127.0.1.1:5672 [proto: 192/AMQP][22 pkts/5026 bytes] + 3 TCP 127.0.0.1:44206 <-> 127.0.1.1:5672 [proto: 192/AMQP][30 pkts/4065 bytes]