Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Work-around for bug in HTTP analyzer.

Browse source 
See #488 for more information.
This commit is contained in:
Robin Sommer 2011-06-30 22:44:09 -07:00
parent b57624aabf
commit 27aa30c683
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/HTTP.cc
View file

@ -16,7 +16,7 @@
const bool DEBUG_http = false; const bool DEBUG_http = false;
// The EXPECT_*_NOTHING states are used to prevent further parsing. Used if a // The EXPECT_*_NOTHING states are used to prevent further parsing. Used if a
// message was interrupted. // message was interrupted.
enum { enum {
EXPECT_REQUEST_LINE, EXPECT_REQUEST_LINE,
EXPECT_REQUEST_MESSAGE, EXPECT_REQUEST_MESSAGE,
@ -88,7 +88,9 @@ void HTTP_Entity::Deliver(int len, const char* data, int trailing_CRLF)
if ( in_header ) if ( in_header )
{ {
ASSERT(trailing_CRLF); if ( ! trailing_CRLF )
http_message->MyHTTP_Analyzer()->Weird("no_http_in_header_list");
header_length += len; header_length += len;
MIME_Entity::Deliver(len, data, trailing_CRLF); MIME_Entity::Deliver(len, data, trailing_CRLF);
return; return;
@ -862,10 +864,10 @@ void HTTP_Analyzer::DeliverStream(int len, const u_char* data, bool is_orig)
// with len==0 while we are expecting // with len==0 while we are expecting
// a new request. Since HTTP servers // a new request. Since HTTP servers
// handle such requests gracefully, // handle such requests gracefully,
// we should do so as well. // we should do so as well.
if ( len == 0 ) if ( len == 0 )
Weird("empty_http_request"); Weird("empty_http_request");
else else
{ {
ProtocolViolation("not a http request line"); ProtocolViolation("not a http request line");
request_state = EXPECT_REQUEST_NOTHING; request_state = EXPECT_REQUEST_NOTHING;
@ -1289,7 +1291,7 @@ void HTTP_Analyzer::RequestMade(const int interrupted, const char* msg)
if ( interrupted ) if ( interrupted )
request_state = EXPECT_REQUEST_NOTHING; request_state = EXPECT_REQUEST_NOTHING;
else else
request_state = EXPECT_REQUEST_LINE; request_state = EXPECT_REQUEST_LINE;
} }