Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixing logging filter "include" and "exclude" options.

Browse source
This commit is contained in:
Robin Sommer 2011-04-17 11:14:07 -07:00
parent 58f86ae55d
commit 09d37b2026
6 changed files with 95 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/LogMgr.cc
View file

@ -553,8 +553,6 @@ bool LogMgr::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt, Tabl
else else
new_path = path + "." + rt->FieldName(i); new_path = path + "." + rt->FieldName(i);
StringVal* new_path_val = new StringVal(path.c_str());
if ( t->InternalType() == TYPE_INTERNAL_OTHER ) if ( t->InternalType() == TYPE_INTERNAL_OTHER )
{ {
if ( t->Tag() == TYPE_RECORD ) if ( t->Tag() == TYPE_RECORD )
@ -585,15 +583,25 @@ bool LogMgr::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt, Tabl
// If include fields are specified, only include if explicitly listed. // If include fields are specified, only include if explicitly listed.
if ( include ) if ( include )
{ {
if ( ! include->Lookup(new_path_val) ) StringVal* new_path_val = new StringVal(new_path.c_str());
return true; bool result = include->Lookup(new_path_val);
Unref(new_path_val);
if ( ! result )
continue;
} }
// If exclude fields are specified, do not only include if listed. // If exclude fields are specified, do not only include if listed.
if ( exclude ) if ( exclude )
{ {
if ( exclude->Lookup(new_path_val) ) StringVal* new_path_val = new StringVal(new_path.c_str());
return true; bool result = exclude->Lookup(new_path_val);
Unref(new_path_val);
if ( result )
continue;
} }
// Alright, we want this field. // Alright, we want this field.

6
testing/btest/Baseline/logging.exclude/ssh.log Normal file
View file

@ -0,0 +1,6 @@
# id.orig_p id.resp_h id.resp_p status country
1234 2.3.4.5 80 success unknown
1234 2.3.4.5 80 failure US
1234 2.3.4.5 80 failure UK
1234 2.3.4.5 80 success BR
1234 2.3.4.5 80 failure MX

6
testing/btest/Baseline/logging.include/ssh.log Normal file
View file

@ -0,0 +1,6 @@
# t id.orig_h
1303064007.48299 1.2.3.4
1303064007.48299 1.2.3.4
1303064007.48299 1.2.3.4
1303064007.48299 1.2.3.4
1303064007.48299 1.2.3.4

2
testing/btest/btest.cfg
View file

@ -1,6 +1,6 @@
[btest] [btest]
TestDirs = logging TestDirs = logging language
TmpDir = %(testbase)s/.tmp TmpDir = %(testbase)s/.tmp
BaselineDir = %(testbase)s/Baseline BaselineDir = %(testbase)s/Baseline
IgnoreDirs = .svn CVS .tmp IgnoreDirs = .svn CVS .tmp

34
testing/btest/logging/exclude.bro Normal file
View file

@ -0,0 +1,34 @@
#
# @TEST-EXEC: bro %INPUT
# @TEST-EXEC: btest-diff ssh.log
module SSH;
export {
redef enum Log::ID += { SSH };
type Log: record {
t: time;
id: conn_id; # Will be rolled out into individual columns.
status: string &optional;
country: string &default="unknown";
} &log;
}
event bro_init()
{
Log::create_stream(SSH, [$columns=Log]);
Log::remove_default_filter(SSH);
Log::add_filter(SSH, [$name="f1", $exclude=set("t", "id.orig_h")]);
local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp];
Log::write(SSH, [$t=network_time(), $id=cid, $status="success"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="failure", $country="US"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="failure", $country="UK"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="success", $country="BR"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="failure", $country="MX"]);
}

34
testing/btest/logging/include.bro Normal file
View file

@ -0,0 +1,34 @@
#
# @TEST-EXEC: bro %INPUT
# @TEST-EXEC: btest-diff ssh.log
module SSH;
export {
redef enum Log::ID += { SSH };
type Log: record {
t: time;
id: conn_id; # Will be rolled out into individual columns.
status: string &optional;
country: string &default="unknown";
} &log;
}
event bro_init()
{
Log::create_stream(SSH, [$columns=Log]);
Log::remove_default_filter(SSH);
Log::add_filter(SSH, [$name="default", $include=set("t", "id.orig_h")]);
local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp];
Log::write(SSH, [$t=network_time(), $id=cid, $status="success"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="failure", $country="US"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="failure", $country="UK"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="success", $country="BR"]);
Log::write(SSH, [$t=network_time(), $id=cid, $status="failure", $country="MX"]);
}