Added protocol - JRMI - Java Remote Method Invocation (#2470)

4 files changed, 75 insertions, 0 deletions

diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h
index a236c59ca..fbd10509b 100644
--- a/src/include/ndpi_private.h
+++ b/src/include/ndpi_private.h
@@ -922,6 +922,7 @@ void init_iqiyi_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
 void init_egd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
 void init_cod_mobile_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
 void init_zug_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
+void init_jrmi_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
 
 #endif
 
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index a729b8c30..8452827b8 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -444,6 +444,7 @@ typedef enum {
   NDPI_PROTOCOL_THREADS               = 413,
   NDPI_PROTOCOL_VIBER_VOIP            = 414,
   NDPI_PROTOCOL_ZUG                   = 415,
+  NDPI_PROTOCOL_JRMI                  = 416, 
 
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index b97385999..fe8c7086c 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -2274,6 +2274,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			  "ZUG", NDPI_PROTOCOL_CATEGORY_CRYPTO_CURRENCY,
 			  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_ACCEPTABLE, NDPI_PROTOCOL_JRMI,
+			  "JRMI", NDPI_PROTOCOL_CATEGORY_RPC,
+			  ndpi_build_default_ports(ports_a, 1099, 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"
@@ -6186,6 +6190,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
   /* ZUG */
   init_zug_dissector(ndpi_str, &a);
 
+  /* JRMI Java Remote Method Invocation*/
+  init_jrmi_dissector(ndpi_str, &a);
+
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_main_init.c"
 #endif
diff --git a/src/lib/protocols/jrmi.c b/src/lib/protocols/jrmi.c
new file mode 100644
index 000000000..e5d9848dc
--- /dev/null
+++ b/src/lib/protocols/jrmi.c
@@ -0,0 +1,66 @@
+/*
+ * jrmi.c
+ *
+ * Copyright (C) 2024 - 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_JRMI
+
+#include "ndpi_api.h"
+#include "ndpi_private.h"
+
+
+static void ndpi_int_jrmi_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
+					 struct ndpi_flow_struct *flow) {
+	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_JRMI, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
+}
+
+static void ndpi_search_jrmi(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) {
+			     
+	struct ndpi_packet_struct *packet = &ndpi_struct->packet;
+
+	NDPI_LOG_DBG(ndpi_struct, "search jrmi\n");
+
+	//>5 because of the version
+	if(packet->payload_packet_len > 5) {
+		if(packet->payload[0] == 0x4a &&
+			packet->payload[1] == 0x52 &&
+			packet->payload[2] == 0x4d &&
+			packet->payload[3] == 0x49 ) {
+			NDPI_LOG_INFO(ndpi_struct, "found jrmi over tcp\n");
+			ndpi_int_jrmi_add_connection(ndpi_struct, flow);
+			return;
+		}
+	}
+	
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+}
+
+
+void init_jrmi_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) {
+	ndpi_set_bitmask_protocol_detection("JRMI", ndpi_struct, *id,
+					    NDPI_PROTOCOL_JRMI,
+					    ndpi_search_jrmi,
+					    NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
+					    SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+					    ADD_TO_DETECTION_BITMASK);
+
+	*id += 1;
+}
+