From 81e42b748e46666158596cc22224b0ec11d85be0 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 29 May 2024 18:31:10 +0200 Subject: [PATCH] RTP: fix detection over TCP (#2462) RFC4571 is not the only way to wrap RTP messages in TCP streams. For example, when RTP is encapsulated over TURN flows (i.e. via DATA attribute) there is no additional framing. See also 6127e0490 --- src/include/ndpi_private.h | 3 +- src/lib/protocols/line.c | 2 +- src/lib/protocols/rtp.c | 15 +++----- src/lib/protocols/stun.c | 2 +- tests/cfgs/default/pcap/stun_dtls_rtp.pcapng | Bin 10120 -> 30096 bytes .../default/result/stun_dtls_rtp.pcapng.out | 16 +++++---- tests/cfgs/stun_extra_dissection/config.txt | 2 +- .../pcap/stun_dtls_rtp.pcapng | 1 + .../result/stun_dtls_rtp.pcapng.out | 34 ++++++++++++++++++ 9 files changed, 54 insertions(+), 21 deletions(-) create mode 120000 tests/cfgs/stun_extra_dissection/pcap/stun_dtls_rtp.pcapng create mode 100644 tests/cfgs/stun_extra_dissection/result/stun_dtls_rtp.pcapng.out diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h index 4ecb7c1b8..341d01900 100644 --- a/src/include/ndpi_private.h +++ b/src/include/ndpi_private.h @@ -648,7 +648,8 @@ const uint8_t *get_crypto_data(struct ndpi_detection_module_struct *ndpi_struct, /* RTP */ int is_valid_rtp_payload_type(uint8_t type); -int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t *seq); +int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, + const u_int8_t *payload, u_int16_t payload_len, u_int16_t *seq); u_int8_t rtp_get_stream_type(u_int8_t payloadType, ndpi_multimedia_flow_type *s_type); /* Bittorrent */ diff --git a/src/lib/protocols/line.c b/src/lib/protocols/line.c index da28e613b..933693ed9 100644 --- a/src/lib/protocols/line.c +++ b/src/lib/protocols/line.c @@ -83,7 +83,7 @@ static void ndpi_search_line(struct ndpi_detection_module_struct *ndpi_struct, /* It might be a RTP/RTCP packet. Ignore it and keep looking for the LINE packet numbers */ /* Basic RTP detection */ - rc = is_rtp_or_rtcp(ndpi_struct, NULL); + rc = is_rtp_or_rtcp(ndpi_struct, packet->payload, packet->payload_packet_len, NULL); if(rc == IS_RTCP || rc == IS_RTP) { if(flow->packet_counter < 10) { NDPI_LOG_DBG(ndpi_struct, "Probably RTP; keep looking for LINE\n"); diff --git a/src/lib/protocols/rtp.c b/src/lib/protocols/rtp.c index b543e8b99..d8c09be3a 100644 --- a/src/lib/protocols/rtp.c +++ b/src/lib/protocols/rtp.c @@ -83,23 +83,16 @@ static int is_valid_rtcp_payload_type(uint8_t type) { return (type >= 192 && type <= 213); } -int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t *seq) +int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, + const u_int8_t *payload, u_int16_t payload_len, u_int16_t *seq) { - struct ndpi_packet_struct *packet = &ndpi_struct->packet; u_int8_t csrc_count, ext_header; u_int16_t ext_len; u_int32_t min_len; - const u_int8_t *payload = packet->payload; - u_int16_t payload_len = packet->payload_packet_len; if(payload_len < 2) return NO_RTP_RTCP; - if(packet->tcp != NULL) { - payload_len -= 2; - payload += 2; /* Skip the length field */ - } - if((payload[0] & 0xC0) != 0x80) { /* Version 2 */ NDPI_LOG_DBG(ndpi_struct, "Not version 2\n"); return NO_RTP_RTCP; @@ -149,10 +142,12 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, u_int8_t is_rtp; struct ndpi_packet_struct *packet = &ndpi_struct->packet; const u_int8_t *payload = packet->payload; + u_int16_t payload_len = packet->payload_packet_len; u_int16_t seq; if(packet->tcp != NULL) { payload += 2; /* Skip the length field */ + payload_len -= 2; } NDPI_LOG_DBG(ndpi_struct, "search RTP (stage %d/%d)\n", flow->rtp_stage, flow->rtcp_stage); @@ -169,7 +164,7 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, return; } - is_rtp = is_rtp_or_rtcp(ndpi_struct, &seq); + is_rtp = is_rtp_or_rtcp(ndpi_struct, payload, payload_len, &seq); if(is_rtp == IS_RTP) { if(flow->rtp_stage == 2) { diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c index aca6540fc..877379abc 100644 --- a/src/lib/protocols/stun.c +++ b/src/lib/protocols/stun.c @@ -796,7 +796,7 @@ static int stun_search_again(struct ndpi_detection_module_struct *ndpi_struct, NDPI_LOG_DBG(ndpi_struct, "QUIC range. Unexpected\n"); } else if(first_byte <= 191) { - rtp_rtcp = is_rtp_or_rtcp(ndpi_struct, NULL); + rtp_rtcp = is_rtp_or_rtcp(ndpi_struct, packet->payload, packet->payload_packet_len, NULL); if(rtp_rtcp == IS_RTP) { NDPI_LOG_DBG(ndpi_struct, "RTP (dir %d)\n", packet->packet_direction); NDPI_LOG_INFO(ndpi_struct, "Found RTP over STUN\n"); diff --git a/tests/cfgs/default/pcap/stun_dtls_rtp.pcapng b/tests/cfgs/default/pcap/stun_dtls_rtp.pcapng index 9d51e7ca70c03e773d989252f1adc155de8f8c6d..2d1308ec7d70f29764cf95ee0e2859a796486569 100644 GIT binary patch delta 20123 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 bF6tSs(?7VE|M_>=AYkPj2>6!SIq?4n&tVFt delta 313 zcmbR6nz6$_l#7>_>jnb@gRhOY6eE!S4+TsN<_w;BC8;?YL7EEA`9-N3A-zV19D`>c9mMD}#*aeBn*@@|?DGG_j5LsQry3(Z5ypmEQ13d#1 zJp=7>nD&&^vf`4&q?}Yupi>zbZcOYA-fY15MKy;N$jbqXF)-YG$I9^KP&OMQgA9Xn zKG2-hqGE-DqWrSV6rd$Zl?o{kXE8BwFx&vD-LOPq8#9m%(iZ^K#{y)h8Zm=SV+FF2 H0mu#jBY9UU diff --git a/tests/cfgs/default/result/stun_dtls_rtp.pcapng.out b/tests/cfgs/default/result/stun_dtls_rtp.pcapng.out index d396ffb37..2e4518519 100644 --- a/tests/cfgs/default/result/stun_dtls_rtp.pcapng.out +++ b/tests/cfgs/default/result/stun_dtls_rtp.pcapng.out @@ -1,9 +1,10 @@ +DPI Packets (TCP): 11 (11.00 pkts/flow) DPI Packets (UDP): 17 (17.00 pkts/flow) -Confidence DPI : 1 (flows) -Num dissector calls: 6 (6.00 diss/flow) +Confidence DPI : 2 (flows) +Num dissector calls: 13 (6.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) -LRU cache stun: 4/0/0 (insert/search/found) +LRU cache stun: 7/0/0 (insert/search/found) LRU cache tls_cert: 0/1/0 (insert/search/found) LRU cache mining: 0/0/0 (insert/search/found) LRU cache msteams: 0/0/0 (insert/search/found) @@ -17,16 +18,17 @@ Patricia risk mask: 2/0 (search/found) Patricia risk mask IPv6: 0/0 (search/found) Patricia risk: 0/0 (search/found) Patricia risk IPv6: 0/0 (search/found) -Patricia protocols: 1/1 (search/found) +Patricia protocols: 2/2 (search/found) Patricia protocols IPv6: 0/0 (search/found) -GoogleCall 39 8413 1 +GoogleCall 102 26347 2 -Acceptable 39 8413 1 +Acceptable 102 26347 2 JA3 Host Stats: IP Address # JA3C 1 192.168.12.156 1 - 1 UDP 192.168.12.156:37967 <-> 142.250.82.76:19305 [proto: 30.404/DTLS.GoogleCall][IP: 126/Google][Encrypted][Confidence: DPI][DPI packets: 17][cat: VoIP/10][25 pkts/4202 bytes <-> 14 pkts/4211 bytes][Goodput ratio: 75/86][0.88 sec][bytes ratio: -0.001 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 37/35 203/107 47/36][Pkt Len c2s/s2c min/avg/max/stddev: 103/82 168/301 587/1245 125/320][Mapped IP/Port: 93.35.171.3:61536][DTLSv1.2][JA3C: c14667d7da3e6f7a7ab5519ef78c2452][JA4: dd2d110700_c45550529adf_d9dd6182da81][JA3S: 1f5d6a6d0bc5d514dd84d13e6283d309][Issuer: CN=hangouts][Subject: CN=hangouts][Certificate SHA-1: AF:DD:BF:F5:59:23:0C:D1:B0:9F:B1:04:2E:89:DF:4C:1B:AB:BE:CC][Validity: 2022-11-30 17:35:18 - 2023-12-01 17:35:18][Cipher: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256][PLAIN TEXT (ShSURJhNF)][Plen Bins: 0,5,47,30,2,0,0,0,0,0,0,0,0,2,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0] + 1 TCP 192.168.12.182:50221 <-> 142.250.82.249:3478 [proto: 78.404/STUN.GoogleCall][IP: 126/Google][ClearText][Confidence: DPI][DPI packets: 11][cat: VoIP/10][28 pkts/3492 bytes <-> 35 pkts/14442 bytes][Goodput ratio: 56/87][0.89 sec][Hostname/SNI: turn.l.google.com][bytes ratio: -0.611 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 11/13 55/55 17/18][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 125/413 250/1162 71/442][Mapped IP/Port: 93.35.170.27:64994][Peer IP/Port: 10.13.0.50:1259][Relayed IP/Port: 10.13.0.62:15530][PLAIN TEXT (Lvsrdelc)][Plen Bins: 2,2,12,15,21,10,2,0,0,0,5,0,0,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 UDP 192.168.12.156:37967 <-> 142.250.82.76:19305 [proto: 30.404/DTLS.GoogleCall][IP: 126/Google][Encrypted][Confidence: DPI][DPI packets: 17][cat: VoIP/10][25 pkts/4202 bytes <-> 14 pkts/4211 bytes][Goodput ratio: 75/86][0.88 sec][bytes ratio: -0.001 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 37/35 203/107 47/36][Pkt Len c2s/s2c min/avg/max/stddev: 103/82 168/301 587/1245 125/320][Mapped IP/Port: 93.35.171.3:61536][DTLSv1.2][JA3C: c14667d7da3e6f7a7ab5519ef78c2452][JA4: dd2d110700_c45550529adf_d9dd6182da81][JA3S: 1f5d6a6d0bc5d514dd84d13e6283d309][Issuer: CN=hangouts][Subject: CN=hangouts][Certificate SHA-1: AF:DD:BF:F5:59:23:0C:D1:B0:9F:B1:04:2E:89:DF:4C:1B:AB:BE:CC][Validity: 2022-11-30 17:35:18 - 2023-12-01 17:35:18][Cipher: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256][PLAIN TEXT (ShSURJhNF)][Plen Bins: 0,5,47,30,2,0,0,0,0,0,0,0,0,2,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/cfgs/stun_extra_dissection/config.txt b/tests/cfgs/stun_extra_dissection/config.txt index 8f6faf085..87f466543 100644 --- a/tests/cfgs/stun_extra_dissection/config.txt +++ b/tests/cfgs/stun_extra_dissection/config.txt @@ -1 +1 @@ ---cfg=stun,max_packets_extra_dissection,255 +--cfg=stun,max_packets_extra_dissection,255 -U 0 -T 0 --cfg=packets_limit_per_flow,255 diff --git a/tests/cfgs/stun_extra_dissection/pcap/stun_dtls_rtp.pcapng b/tests/cfgs/stun_extra_dissection/pcap/stun_dtls_rtp.pcapng new file mode 120000 index 000000000..d30bde120 --- /dev/null +++ b/tests/cfgs/stun_extra_dissection/pcap/stun_dtls_rtp.pcapng @@ -0,0 +1 @@ +../../default/pcap/stun_dtls_rtp.pcapng \ No newline at end of file diff --git a/tests/cfgs/stun_extra_dissection/result/stun_dtls_rtp.pcapng.out b/tests/cfgs/stun_extra_dissection/result/stun_dtls_rtp.pcapng.out new file mode 100644 index 000000000..afe07e3c2 --- /dev/null +++ b/tests/cfgs/stun_extra_dissection/result/stun_dtls_rtp.pcapng.out @@ -0,0 +1,34 @@ +DPI Packets (TCP): 63 (63.00 pkts/flow) +DPI Packets (UDP): 39 (39.00 pkts/flow) +Confidence DPI : 2 (flows) +Num dissector calls: 13 (6.50 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/0/0 (insert/search/found) +LRU cache stun: 42/0/0 (insert/search/found) +LRU cache tls_cert: 0/1/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 2/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 2/2 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +GoogleCall 102 26347 2 + +Acceptable 102 26347 2 + +JA3 Host Stats: + IP Address # JA3C + 1 192.168.12.156 1 + + + 1 TCP 192.168.12.182:50221 <-> 142.250.82.249:3478 [proto: 338.404/SRTP.GoogleCall][IP: 126/Google][Stream Content: Audio][Encrypted][Confidence: DPI][DPI packets: 63][cat: VoIP/10][28 pkts/3492 bytes <-> 35 pkts/14442 bytes][Goodput ratio: 56/87][0.89 sec][Hostname/SNI: turn.l.google.com][bytes ratio: -0.611 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 11/13 55/55 17/18][Pkt Len c2s/s2c min/avg/max/stddev: 54/54 125/413 250/1162 71/442][Mapped IP/Port: 10.13.0.62:15530][Peer IP/Port: 10.13.0.50:1259][Relayed IP/Port: 10.13.0.62:15530][PLAIN TEXT (Lvsrdelc)][Plen Bins: 2,2,12,15,21,10,2,0,0,0,5,0,0,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 UDP 192.168.12.156:37967 <-> 142.250.82.76:19305 [proto: 30.404/DTLS.GoogleCall][IP: 126/Google][Stream Content: Audio][Encrypted][Confidence: DPI][DPI packets: 39][cat: VoIP/10][25 pkts/4202 bytes <-> 14 pkts/4211 bytes][Goodput ratio: 75/86][0.88 sec][bytes ratio: -0.001 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 37/35 203/107 47/36][Pkt Len c2s/s2c min/avg/max/stddev: 103/82 168/301 587/1245 125/320][Mapped IP/Port: 93.35.171.3:61536][DTLSv1.2][JA3C: c14667d7da3e6f7a7ab5519ef78c2452][JA4: dd2d110700_c45550529adf_d9dd6182da81][JA3S: 1f5d6a6d0bc5d514dd84d13e6283d309][Issuer: CN=hangouts][Subject: CN=hangouts][Certificate SHA-1: AF:DD:BF:F5:59:23:0C:D1:B0:9F:B1:04:2E:89:DF:4C:1B:AB:BE:CC][Validity: 2022-11-30 17:35:18 - 2023-12-01 17:35:18][Cipher: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256][PLAIN TEXT (ShSURJhNF)][Plen Bins: 0,5,47,30,2,0,0,0,0,0,0,0,0,2,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0]