From 32750271c38ff754395e167c5a646172140aaf9f Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 30 May 2022 14:54:27 +0200 Subject: [PATCH] Prohibit MPEG-DASH to set HTTP as application protocol. (#1560) Signed-off-by: lns --- src/lib/protocols/http.c | 8 ++++---- src/lib/protocols/mpegdash.c | 11 +++++++++-- tests/pcap/mpeg-dash.pcap | Bin 2861 -> 4901 bytes tests/result/mpeg-dash.pcap.out | 12 +++++++----- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index f30857577..88c207c9e 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -1110,10 +1110,10 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct /* Let's check for Wordpress */ char *slash = strchr(flow->http.url, '/'); - if( - ((flow->http.method == NDPI_HTTP_METHOD_POST) && (strncmp(slash, "/wp-admin/", 10) == 0)) - || ((flow->http.method == NDPI_HTTP_METHOD_GET) && (strncmp(slash, "/wp-content/uploads/", 20) == 0)) - ) { + if(slash != NULL && + (((flow->http.method == NDPI_HTTP_METHOD_POST) && (strncmp(slash, "/wp-admin/", 10) == 0)) + || ((flow->http.method == NDPI_HTTP_METHOD_GET) && (strncmp(slash, "/wp-content/uploads/", 20) == 0)) + )) { /* Example of popular exploits https://www.wordfence.com/blog/2022/05/millions-of-attacks-target-tatsu-builder-plugin/ */ ndpi_set_risk(ndpi_struct, flow, NDPI_POSSIBLE_EXPLOIT, "Possible Wordpress Exploit"); } diff --git a/src/lib/protocols/mpegdash.c b/src/lib/protocols/mpegdash.c index 6be2c1fe5..0e2ac1944 100644 --- a/src/lib/protocols/mpegdash.c +++ b/src/lib/protocols/mpegdash.c @@ -31,8 +31,15 @@ static void ndpi_int_mpegdash_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, - NDPI_PROTOCOL_MPEGDASH, NDPI_CONFIDENCE_DPI); + if (flow->guessed_host_protocol_id == NDPI_PROTOCOL_UNKNOWN || + flow->guessed_host_protocol_id == NDPI_PROTOCOL_HTTP) + { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MPEGDASH, NDPI_PROTOCOL_HTTP, + NDPI_CONFIDENCE_DPI); + } else { + ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, NDPI_PROTOCOL_MPEGDASH, + NDPI_CONFIDENCE_DPI); + } } void ndpi_search_mpegdash_http(struct ndpi_detection_module_struct *ndpi_struct, diff --git a/tests/pcap/mpeg-dash.pcap b/tests/pcap/mpeg-dash.pcap index 71fdfb2c619f0b7a7f9f802e256167c6acbde962..eaf6e75c4b828e3b2939df20ed854bbb265e2f43 100644 GIT binary patch delta 1716 zcmZ8idu&rx9R9j?8&s>~u~A`+OF$^dZSQT@JvzX3Wo+4l4O%)LL%D13x|_AVwfC-! zX>1b{jV8uNRX`I(6Z}K)8BLU!nD~f)$R8#?Fi|5IHO7PpqLIXe`Q0)k?j)zbd(J)Q z`+eW{JNNX}h7;=^cNd>pa^Jz19tQewtut87fwG!gfNo&(=o6jjtSLX>jM;X+eC4R~ z!c`2PjqYA)EjwN{JNsS{sB%=l?WkJd{QUHu{notAZg*P9j~=N)7spngYj&jDFISM8 zfzBeN8mzQnEqDxHxcd5EXX1o!DlN{}t(dAnPupycs_T$Hx$U^$hDx7<{Ew_HH(IvH zJ~=p#Y!gvOhTVwcGSJf<6MTx{8`DyHQB;y*BCjf@R!|LJzzF#K>7iJ-)tkvR3%#+} zuut~NF6VAT&5Plbnl(ehpgyCe(~2+Xl?2a#mYtgJ5W?AHUe}U>EO!XeK{4Da2e%7d zQ(8Ld+chkQy?#k*^-Eq!_IC(}3LAuQE|*qE)Ujf}X8MAGR&St1@bve_1_w3?X>C#! zdep?EzCnnqc|+5)zGmi%Oyu>9>T7HFO5WxGgDeF}W=u<~LR1-7^4c7d%V|jyClq5M zB*eFO?U)$~Xz@g$CpWSq>2mh!234ezX>V379x}v4GV3)oQ*}8bdN!*jOePEo{i>Q1 z!)e;$a)uKLHD`+5*@T|dvMFw!(Q+=Qt5V~}jn#Oq8kIi3#?{BqOP!Ew+@*OX9yuG0 zj}O;jpy{hsz;&Mm+9VA1yPQ!qUr_TQLC>k#ylR+-UCwQasfL8;RCbdfx6!{m7yD%z z9+IVy>=$|lW94TZD~i-$vP|NDnoXJ1A8ZXYOMdD9;wCL|$~AE}goXrD%c%O4xkYZX zHYkY+RkZN(dO9Rzlxa~(sapbaFwi2g(U%k{1!XDV=MmW>c8QT*M@W$Uy%REwe6*(%R0Q2(WwS0*_!UrLfoS)YID-b%i`(tYzR+mrKG_tm+x0k=E*}8n`M}|3;=J<$V8Wp~Lwz51_ zmTDVU*OrLi%c0e+X1k>?9`l9c5g}4JIps{PyC^G#M8uYaXZAdnrx;ItVLP|rg=gvj zJFFkO=h6d9N;Wtqemn6QQ9OoeR;2TpR@itez+<7aZ zkrnKG9#BKThyZNr1~#q%268|LlZ1Z+w%yMCtw5B?5B>n`Uj*#k2#jAMk$;N7>4Ck6EOT7V?Ch6DD*KV7J=nlH@X>UBI&h%lIZu0?*r=>a=xFP z$>nvxo*>ZP0<3u#SW2uVZvcySv4S7+=!^mji&uHv3S{i1@^fU`035iPDo=6q6p1Am zsXj)<(N8)52UT1IPEzGQDqBlZi322f4F Ezq8e$f&c&j delta 11 ScmZ3gwpMI{#AX2wQEmVi?*k$L diff --git a/tests/result/mpeg-dash.pcap.out b/tests/result/mpeg-dash.pcap.out index f64effeab..919d6638a 100644 --- a/tests/result/mpeg-dash.pcap.out +++ b/tests/result/mpeg-dash.pcap.out @@ -1,10 +1,12 @@ Guessed flow protos: 0 -DPI Packets (TCP): 6 (2.00 pkts/flow) -Confidence DPI : 3 (flows) +DPI Packets (TCP): 10 (2.50 pkts/flow) +Confidence DPI : 4 (flows) AmazonAWS 9 2693 3 +MpegDash 4 1976 1 - 1 TCP 54.161.101.85:80 <-> 192.168.2.105:59144 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Media/1][2 pkts/1649 bytes <-> 2 pkts/323 bytes][Goodput ratio: 92/59][0.01 sec][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (OHTTP/1.1 200 OK)][Plen Bins: 0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0] - 2 TCP 192.168.2.105:59142 <-> 54.161.101.85:80 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Cloud/13][3 pkts/390 bytes <-> 1 pkts/74 bytes][Goodput ratio: 47/0][0.10 sec][Hostname/SNI: livesim.dashif.org][User-Agent: VLC/3.0.16 LibVLC/3.0.16][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (IGET /livesim/sts)][Plen Bins: 0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 3 TCP 192.168.2.105:59146 -> 54.161.101.85:80 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Cloud/13][1 pkts/257 bytes -> 0 pkts/0 bytes][Goodput ratio: 74/0][< 1 sec][Hostname/SNI: livesim.dashif.org][User-Agent: VLC/3.0.16 LibVLC/3.0.16][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (GET /livesim/sts)][Plen Bins: 0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 1 TCP 10.84.1.81:60926 <-> 166.248.152.10:80 [proto: 7.291/HTTP.MpegDash][ClearText][Confidence: DPI][cat: Media/1][2 pkts/456 bytes <-> 2 pkts/1520 bytes][Goodput ratio: 72/92][0.30 sec][Hostname/SNI: gdl.news-cdn.site][URL: gdl.news-cdn.site/as/bigo-ad-creatives/3s3/2lOTA7.mp4][StatusCode: 200][User-Agent: Mozilla/5.0 (Linux; Android 11; SM-A715F Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/89.0.4389.105 Mobile Safari/537.36][Risk: ** Suspicious DGA Domain name **][Risk Score: 100][PLAIN TEXT (GET /as/bigo)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0] + 2 TCP 54.161.101.85:80 <-> 192.168.2.105:59144 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Media/1][2 pkts/1649 bytes <-> 2 pkts/323 bytes][Goodput ratio: 92/59][0.01 sec][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (OHTTP/1.1 200 OK)][Plen Bins: 0,0,33,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0] + 3 TCP 192.168.2.105:59142 <-> 54.161.101.85:80 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Cloud/13][3 pkts/390 bytes <-> 1 pkts/74 bytes][Goodput ratio: 47/0][0.10 sec][Hostname/SNI: livesim.dashif.org][User-Agent: VLC/3.0.16 LibVLC/3.0.16][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (IGET /livesim/sts)][Plen Bins: 0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 TCP 192.168.2.105:59146 -> 54.161.101.85:80 [proto: 291.265/MpegDash.AmazonAWS][ClearText][Confidence: DPI][cat: Cloud/13][1 pkts/257 bytes -> 0 pkts/0 bytes][Goodput ratio: 74/0][< 1 sec][Hostname/SNI: livesim.dashif.org][User-Agent: VLC/3.0.16 LibVLC/3.0.16][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][PLAIN TEXT (GET /livesim/sts)][Plen Bins: 0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]