From 4b8c8608d146c5407c6180a5698057c146e0d60b Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Sun, 5 Jul 2020 18:36:57 +0200 Subject: [PATCH] Improved HTTP line parsing if request splitted into multiple packets. Signed-off-by: Toni Uhlig --- src/lib/protocols/http.c | 7 +++++++ tests/pcap/http-lines-split.pcap | Bin 0 -> 2751 bytes tests/result/http-lines-split.pcap.out | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 tests/pcap/http-lines-split.pcap create mode 100644 tests/result/http-lines-split.pcap.out diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index dd6d39c88..9ac26785c 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -805,6 +805,13 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct return; } + /* try to get some additional request header info even if the packet may not be HTTP */ + ndpi_parse_packet_line_info(ndpi_struct, flow); + if (packet->http_num_headers > 0) { + check_content_type_and_change_protocol(ndpi_struct, flow); + return; + } + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); http_bitmask_exclude_other(flow); return; diff --git a/tests/pcap/http-lines-split.pcap b/tests/pcap/http-lines-split.pcap new file mode 100644 index 0000000000000000000000000000000000000000..01570c76c5f123c4dbb1c4f14f456834625b9c2c GIT binary patch literal 2751 zcmaKuPi)&%9LHb!CyYpuw!xtjmp5}Mu-Hi&+Abv4+9XZO(l%OCmBO^~;<)hx$1e8s zwDi;=@#g>sB!sjB2srV7YXvP#L)tVUaoxmWLI~{umuZJdXcd|e@OyUJq;Zl+&;Gr< zkH5dKf6sn?zuegTqz?_C=5GK6pmSCD_spTAK{N?5Z)oVR%EsF-kKg&}*^dvP972ih zFHfL)@aN5IpP>M>$1i5r=rf-#Z*X|M@8SLBD+u)s41OC34D<#1`-5CD)uQNWdAgn= zLMPB>Fn@-tan&_?G5gPJm#%^8=KA4>_bJYr#=;?<>s`n-3Tb%rRbn{3#48bctgRB)p%S-?2Ln47);-6mCxd7K z6nOJF&TW6=I{v85@oo3+!SS!}BeZC%R%D{88sO7WbP7RaMP-T>4tYjrAVm+OFStez zcQE>()#%OPAj*SB-h8)vJiY9yppGg-aJ%mz)F^5c$D>g^f6_B&KNUoG2a(&_We0yt zzsO|=PPfV4f-1V^-bz5_RO_5-CGi5St?H_qBr1;LVx4KGA;rZpF*X_wWeHQ0xTHD9 za5RpecXV(OkK)*PGI~4-e)6-Wa42IMjF*qqR{>_~c_wMBray-jjaatI(u<|3$as@0 zs794(NgPXzL5grFbu>GlDJ>Usm|upAi<5G4iv^0{Dq--e*Pu6S!kBD(RMGc}$ zQf^L=Q=FDVDMp#D%2{fu3Nx)b)~U^?QN=5!g{73_4Tn-?vr-3Ii+4w13;+ub4j0y` zoFZ7W)RnX#Rx9PR8Yn{sL2m7(B;sQ!lQ;yY&ZD$yn3n1xUfh|}NjaiWv0l?Xw%PB% zGh&sAu18>6ZE6~DMcY4}uCd5DYBv(Fy^fzGif$@I7i$SYZpMCYVzD$me`-OH8-br7 z4m07k6KxHY_TtW5Ex}Y#A&RC#JvrR+hyRMQL-k68IOhRw#(plN5u>UW%&H*og?>sg zYpYa;NooY02xEm-#j2y)HpiO1uB^_JHb{uOayBE(X^MK??zB_hQ?;FPH_qXYoR=KJ z9+XIw77%)VHZxybo|(%-1--yeR0tz55$>tOsJhDQ3gcejCuZgrN)v^GAU6U(K@F%2 zJn;NUYQ}!9mH;1c@Q=)rSJf4Fl6Rx-j7VyNyo*7n2T9@O+asyrCu`KUVTl4)Uf?I@ za!c?M@ng#v|9)=4%6}6+CcL$;{OCsdCBE`M%J#4P-@WOs{6_*iuRnoMV?`^T%ug=P z6taT68?|I=FsE`8+1Z>Rd*^QBVy&`^KBp z!5$l%OYW!r3fy4p=Ia4`+HdiV%^!b5UECip)*Dav)Vl0y{ovQy5 192.168.0.20:31337 [proto: 7/HTTP][cat: Web/5][7 pkts/481 bytes <-> 7 pkts/2022 bytes][Goodput ratio: 14/81][0.00 sec][Host: toni.lan][bytes ratio: -0.616 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 0/1 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 60/54 69/289 92/1514 12/503][URL: toni.lan:31337/][StatusCode: 200][User-Agent: uclient-fetch][Risk: ** Known protocol on non standard port **** HTTP Suspicious User-Agent **][PLAIN TEXT (GET / HTTP/1.1)][Plen Bins: 40,20,0,0,20,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,20,0]