Get rid of RDP false positives (#2161)

* Get rid of false positives in the RDP protocol dissector

* Remove kludge for RDP

* RDP: improve detection

---------

Co-authored-by: 0xA50C1A1 <mage.wizard88@gmail.com>
Co-authored-by: Nardi Ivan <nardi.ivan@gmail.com>
This commit is contained in:
Vladimir Gavrilov
2023-11-23 09:35:43 +01:00
committed by GitHub
co-authored by 0xA50C1A1 Nardi Ivan
parent 5c8c5c90c2
commit fbae51ae9d
6 changed files with 81 additions and 24 deletions
-15
View File
@@ -54,21 +54,6 @@ static void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, s
u_int16_t len = ntohs(t->len);
if(packet->payload_packet_len == len) {
/*
We need to check if this packet is in reality
a RDP (Remote Desktop) packet encapsulated on TPTK
*/
if(packet->payload[4] == (packet->payload_packet_len - sizeof(struct tpkt) - 1)) {
/* ISO 8073/X.224 */
if((packet->payload[5] == 0xE0 /* CC Connect Request */)
|| (packet->payload[5] == 0xD0 /* CC Connect Confirm */)) {
NDPI_LOG_INFO(ndpi_struct, "found RDP\n");
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RDP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
return;
}
}
flow->h323_valid_packets++;
if(flow->h323_valid_packets >= 2) {
+25 -9
View File
@@ -46,16 +46,32 @@ static void ndpi_search_rdp(struct ndpi_detection_module_struct *ndpi_struct,
NDPI_LOG_DBG(ndpi_struct, "search RDP\n");
if (packet->tcp != NULL) {
if (packet->payload_packet_len > 10
&& get_u_int8_t(packet->payload, 0) > 0
&& get_u_int8_t(packet->payload, 0) < 4 && get_u_int16_t(packet->payload, 2) == ntohs(packet->payload_packet_len)
&& get_u_int8_t(packet->payload, 4) == packet->payload_packet_len - 5
&& get_u_int8_t(packet->payload, 5) == 0xe0
&& get_u_int16_t(packet->payload, 6) == 0 && get_u_int16_t(packet->payload, 8) == 0 && get_u_int8_t(packet->payload, 10) == 0) {
ndpi_int_rdp_add_connection(ndpi_struct, flow);
return;
}
if(packet->payload_packet_len > 13 &&
/* TPKT */
packet->payload[0] == 0x03 && packet->payload[1] == 0x00 &&
ntohs(*(uint16_t *)&packet->payload[2]) == packet->payload_packet_len &&
/* COTP */
packet->payload[4] == packet->payload_packet_len - 5) {
if(current_pkt_from_client_to_server(ndpi_struct, flow)) {
if(packet->payload[5] == 0xE0 && /* COTP CR */
((packet->payload[11] == 0x01 && /* RDP Negotiation Request */
packet->payload[13] == 0x08 /* RDP Length */) ||
(packet->payload_packet_len > 17 &&
memcmp(&packet->payload[11], "Cookie:", 7) == 0))) /* RDP Cookie */ {
ndpi_int_rdp_add_connection(ndpi_struct, flow);
return;
}
} else {
/* Asymmetric detection via RDP Negotiation Response */
if(packet->payload[5] == 0xD0 && /* COTP CC */
packet->payload[11] == 0x02 && /* RDP Negotiation Response */
packet->payload[13] == 0x08 /* RDP Length */) {
ndpi_int_rdp_add_connection(ndpi_struct, flow);
return;
}
}
}
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
} else if(packet->udp != NULL) {
u_int16_t s_port = ntohs(packet->udp->source);