Rename NDPI_PROTOCOL_RPC to NDPI_PROTOCOL_MS_RPCH (#2218)
* Rename NDPI_PROTOCOL_RPC to NDPI_PROTOCOL_MS_RPCH * Add protocol description * Improve MS-RPCH detection
This commit is contained in:
@@ -23,6 +23,14 @@ TFTP is a very simple protocol used to transfer files. It is from this that its
|
||||
References: `RFC1350 <https://datatracker.ietf.org/doc/html/rfc1350>`_ and `RFC2347 <https://datatracker.ietf.org/doc/html/rfc2347>`_ and `RFC2349 <https://datatracker.ietf.org/doc/html/rfc2349>`_
|
||||
|
||||
|
||||
.. _Proto 127:
|
||||
|
||||
`NDPI_PROTOCOL_MS_RPCH`
|
||||
====================
|
||||
A Remote Procedure Call protocol over HTTP from Microsoft.
|
||||
|
||||
References: `Protocol Specs: <https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-rpch/c0f4c9c5-1a61-4d10-b8e2-005378d1d212`_.
|
||||
|
||||
.. _Proto 338:
|
||||
|
||||
`NDPI_PROTOCOL_SRTP`
|
||||
|
||||
@@ -155,7 +155,7 @@ typedef enum {
|
||||
NDPI_PROTOCOL_YOUTUBE = 124,
|
||||
NDPI_PROTOCOL_SKYPE_TEAMS = 125,
|
||||
NDPI_PROTOCOL_GOOGLE = 126,
|
||||
NDPI_PROTOCOL_RPC = 127,
|
||||
NDPI_PROTOCOL_MS_RPCH = 127,
|
||||
NDPI_PROTOCOL_NETFLOW = 128,
|
||||
NDPI_PROTOCOL_SFLOW = 129,
|
||||
NDPI_PROTOCOL_HTTP_CONNECT = 130,
|
||||
|
||||
@@ -677,6 +677,7 @@ typedef enum {
|
||||
NDPI_HTTP_METHOD_DELETE,
|
||||
NDPI_HTTP_METHOD_TRACE,
|
||||
NDPI_HTTP_METHOD_CONNECT,
|
||||
NDPI_HTTP_METHOD_RPC_CONNECT,
|
||||
NDPI_HTTP_METHOD_RPC_IN_DATA,
|
||||
NDPI_HTTP_METHOD_RPC_OUT_DATA,
|
||||
} ndpi_http_method;
|
||||
|
||||
+2
-2
@@ -1508,8 +1508,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
"WorldOfKungFu", NDPI_PROTOCOL_CATEGORY_GAME,
|
||||
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_RPC,
|
||||
"RPC", NDPI_PROTOCOL_CATEGORY_RPC,
|
||||
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_MS_RPCH,
|
||||
"MS-RPCH", 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 */);
|
||||
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_NETFLOW,
|
||||
|
||||
@@ -2157,6 +2157,7 @@ const char* ndpi_http_method2str(ndpi_http_method m) {
|
||||
case NDPI_HTTP_METHOD_DELETE: return("DELETE");
|
||||
case NDPI_HTTP_METHOD_TRACE: return("TRACE");
|
||||
case NDPI_HTTP_METHOD_CONNECT: return("CONNECT");
|
||||
case NDPI_HTTP_METHOD_RPC_CONNECT: return("RPC_CONNECT");
|
||||
case NDPI_HTTP_METHOD_RPC_IN_DATA: return("RPC_IN_DATA");
|
||||
case NDPI_HTTP_METHOD_RPC_OUT_DATA: return("RPC_OUT_DATA");
|
||||
}
|
||||
@@ -2188,10 +2189,13 @@ ndpi_http_method ndpi_http_str2method(const char* method, u_int16_t method_len)
|
||||
case 'C': return(NDPI_HTTP_METHOD_CONNECT);
|
||||
case 'R':
|
||||
if(method_len >= 11) {
|
||||
if(strncmp(method, "RPC_IN_DATA", 11) == 0)
|
||||
return(NDPI_HTTP_METHOD_RPC_IN_DATA);
|
||||
else if(strncmp(method, "RPC_OUT_DATA", 11) == 0)
|
||||
return(NDPI_HTTP_METHOD_RPC_OUT_DATA);
|
||||
if(strncmp(method, "RPC_CONNECT", 11) == 0) {
|
||||
return(NDPI_HTTP_METHOD_RPC_CONNECT);
|
||||
} else if(strncmp(method, "RPC_IN_DATA", 11) == 0) {
|
||||
return(NDPI_HTTP_METHOD_RPC_IN_DATA);
|
||||
} else if(strncmp(method, "RPC_OUT_DATA", 11) == 0) {
|
||||
return(NDPI_HTTP_METHOD_RPC_OUT_DATA);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -435,9 +435,10 @@ static void ndpi_http_parse_subprotocol(struct ndpi_detection_module_struct *ndp
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OCSP, master_protocol, NDPI_CONFIDENCE_DPI);
|
||||
}
|
||||
|
||||
if(flow->http.method == NDPI_HTTP_METHOD_RPC_IN_DATA ||
|
||||
flow->http.method == NDPI_HTTP_METHOD_RPC_OUT_DATA) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RPC, master_protocol, NDPI_CONFIDENCE_DPI);
|
||||
if((flow->http.method == NDPI_HTTP_METHOD_RPC_CONNECT) ||
|
||||
(flow->http.method == NDPI_HTTP_METHOD_RPC_IN_DATA) ||
|
||||
(flow->http.method == NDPI_HTTP_METHOD_RPC_OUT_DATA)) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MS_RPCH, master_protocol, NDPI_CONFIDENCE_DPI);
|
||||
}
|
||||
|
||||
if(flow->detected_protocol_stack[1] == NDPI_PROTOCOL_UNKNOWN &&
|
||||
@@ -526,6 +527,11 @@ static void ndpi_http_parse_subprotocol(struct ndpi_detection_module_struct *ndp
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, master_protocol, NDPI_CONFIDENCE_DPI);
|
||||
ookla_add_to_cache(ndpi_struct, flow);
|
||||
}
|
||||
|
||||
if ((flow->detected_protocol_stack[1] == NDPI_PROTOCOL_UNKNOWN) &&
|
||||
flow->http.user_agent && strstr(flow->http.user_agent, "MSRPC")) {
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MS_RPCH, master_protocol, NDPI_CONFIDENCE_DPI);
|
||||
}
|
||||
}
|
||||
|
||||
/* ************************************************************* */
|
||||
@@ -1002,7 +1008,9 @@ static struct l_string {
|
||||
STATIC_STRING_L("CONNECT "),
|
||||
STATIC_STRING_L("PROPFIND "),
|
||||
STATIC_STRING_L("REPORT "),
|
||||
STATIC_STRING_L("RPC_IN_DATA "), STATIC_STRING_L("RPC_OUT_DATA ")
|
||||
STATIC_STRING_L("RPC_CONNECT "),
|
||||
STATIC_STRING_L("RPC_IN_DATA "),
|
||||
STATIC_STRING_L("RPC_OUT_DATA ")
|
||||
};
|
||||
static const char *http_fs = "CDGHOPR";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user