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

Fixes an issue with missing zlib headers on deflated HTTP content.

Browse source 
- Includes a test.
This commit is contained in:
Seth Hall 2015-05-18 14:30:32 -04:00
parent 501dc821bf
commit ea2ce67c5f
4 changed files with 72 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/analyzer/protocol/zip/ZIP.cc
View file

@ -22,10 +22,9 @@ ZIP_Analyzer::ZIP_Analyzer(Connection* conn, bool orig, Method arg_method)
zip->next_in = 0;
zip->avail_in = 0;
// "15" here means maximum compression. "32" is a gross overload
// hack that means "check it for whether it's a gzip file". Sheesh.
zip_status = inflateInit2(zip, 15 + 32);
if ( zip_status != Z_OK )
// "32" is a gross overload hack that means "check it
// for whether it's a gzip file". Sheesh.
if ( inflateInit2(zip, MAX_WBITS+32) != Z_OK )
{
Weird("inflate_init_failed");
delete zip;
@ -54,40 +53,69 @@ void ZIP_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
return;
static unsigned int unzip_size = 4096;
Bytef unzipbuf[unzip_size];
int allow_restart = 1;
u_char *unzipbuf = new u_char[unzip_size];
if ( unzipbuf == NULL )
{
Weird("failed_to_allocate_deflate_buffer");
return;
}
zip->next_in = (Bytef*) data;
zip->avail_in = len;
do
Bytef *orig_in = zip->next_in;
size_t nread = zip->avail_in;
for(;;)
{
zip->next_out = unzipbuf;
zip->next_out = (Bytef *)unzipbuf;
zip->avail_out = unzip_size;
zip_status = inflate(zip, Z_SYNC_FLUSH);
if ( zip_status == Z_STREAM_END ||
zip_status == Z_OK )
{
allow_restart = 0;
if ( zip_status != Z_STREAM_END &&
zip_status != Z_OK &&
zip_status != Z_BUF_ERROR )
int have = unzip_size - zip->avail_out;
if ( have )
ForwardStream(have, unzipbuf, IsOrig());
if ( zip_status == Z_STREAM_END )
{
inflateEnd(zip);
delete unzipbuf;
return;
}
if ( zip->avail_in == 0 )
{
delete unzipbuf;
return;
}
}
else if ( allow_restart && zip_status == Z_DATA_ERROR )
{
// Some servers seem to not generate zlib headers,
// so this is an attempt to fix and continue anyway.
inflateEnd(zip);
if ( inflateInit2(zip, -MAX_WBITS) != Z_OK )
{
delete unzipbuf;
return;
}
zip->next_in = orig_in;
zip->avail_in = nread;
allow_restart = 0;
continue;
}
else
{
Weird("inflate_failed");
inflateEnd(zip);
break;
delete unzipbuf;
return;
}
int have = unzip_size - zip->avail_out;
if ( have )
ForwardStream(have, unzipbuf, IsOrig());
if ( zip_status == Z_STREAM_END )
{
inflateEnd(zip);
delete zip;
zip = 0;
break;
}
zip_status = Z_OK;
}
while ( zip->avail_out == 0 );
}