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

Added mime types to http.log

Browse source
This commit is contained in:
Seth Hall 2013-07-12 16:06:40 -04:00
parent 1a60fae41c
commit b14f5a853e
2 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
scripts/base/protocols/http/entities.bro
View file

@ -9,14 +9,23 @@ module HTTP;
export { export {
type Entity: record { type Entity: record {
## Depth of the entity if multiple entities are sent in a single transaction.
depth: count &default=0;
## Filename for the entity if discovered from a header. ## Filename for the entity if discovered from a header.
filename: string &optional; filename: string &optional;
}; };
redef record Info += { redef record Info += {
## An ordered vector of file unique IDs.
orig_fuids: vector of string &log &optional;
## An ordered vector of mime types.
orig_mime_types: vector of string &log &optional;
## An ordered vector of file unique IDs.
resp_fuids: vector of string &log &optional;
## An ordered vector of mime types.
resp_mime_types: vector of string &log &optional;
## The current entity being seen. ## The current entity being seen.
entity: Entity &optional; entity: Entity &optional;
@ -36,7 +45,7 @@ event http_begin_entity(c: connection, is_orig: bool) &priority=10
else else
++c$http$resp_mime_depth; ++c$http$resp_mime_depth;
c$http$entity = Entity($depth = is_orig ? c$http$orig_mime_depth : c$http$resp_mime_depth); c$http$entity = Entity();
} }
event http_header(c: connection, is_orig: bool, name: string, value: string) &priority=3 event http_header(c: connection, is_orig: bool, name: string, value: string) &priority=3
@ -55,12 +64,43 @@ event http_header(c: connection, is_orig: bool, name: string, value: string) &pr
event file_over_new_connection(f: fa_file, c: connection, is_orig: bool) &priority=5 event file_over_new_connection(f: fa_file, c: connection, is_orig: bool) &priority=5
{ {
if ( f$source == "HTTP" && c$http?$entity ) if ( f$source == "HTTP" && c?$http )
{ {
f$info$depth = c$http$entity$depth; if ( c$http?$entity && c$http$entity?$filename )
if ( c$http$entity?$filename )
f$info$filename = c$http$entity$filename; f$info$filename = c$http$entity$filename;
if ( f$is_orig )
{
if ( ! c$http?$resp_mime_types )
c$http$resp_fuids = string_vec(f$id);
else
c$http$orig_fuids[|c$http$orig_fuids|] = f$id;
if ( f?$mime_type )
{
if ( ! c$http?$orig_mime_types )
c$http$orig_mime_types = string_vec(f$mime_type);
else
c$http$orig_mime_types[|c$http$orig_mime_types|] = f$mime_type;
}
}
else
{
if ( ! c$http?$resp_mime_types )
c$http$resp_fuids = string_vec(f$id);
else
c$http$resp_fuids[|c$http$resp_fuids|] = f$id;
if ( f?$mime_type )
{
if ( ! c$http?$resp_mime_types )
c$http$resp_mime_types = string_vec(f$mime_type);
else
c$http$resp_mime_types[|c$http$resp_mime_types|] = f$mime_type;
}
}
} }
} }
event http_end_entity(c: connection, is_orig: bool) &priority=5 event http_end_entity(c: connection, is_orig: bool) &priority=5

19
scripts/base/protocols/http/files.bro
View file

@ -6,14 +6,6 @@
module HTTP; module HTTP;
export { export {
redef record Info += {
## An ordered vector of file unique IDs seen sent by the originator (client).
orig_fuids: vector of string &log &default=string_vec();
## An ordered vector of file unique IDs seen sent by the responder (server).
resp_fuids: vector of string &log &default=string_vec();
};
## Default file handle provider for HTTP. ## Default file handle provider for HTTP.
global get_file_handle: function(c: connection, is_orig: bool): string; global get_file_handle: function(c: connection, is_orig: bool): string;
} }
@ -39,14 +31,3 @@ event bro_init() &priority=5
{ {
Files::register_protocol(Analyzer::ANALYZER_HTTP, HTTP::get_file_handle); Files::register_protocol(Analyzer::ANALYZER_HTTP, HTTP::get_file_handle);
} }
event file_over_new_connection(f: fa_file, c: connection, is_orig: bool) &priority=5
{
if ( c?$http )
{
if ( f$is_orig )
c$http$orig_fuids[|c$http$orig_fuids|] = f$id;
else
c$http$resp_fuids[|c$http$resp_fuids|] = f$id;
}
}