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

Be more liberal with whitespaces for ip-addresses, subnets, etc.

Browse source 
This change ignores leading/trailing whitespaces for a couple of
data-types (bool, port, subnet, addr) and just parses them as if the
whitespace was not present.
This commit is contained in:
Johanna Amann 2019-01-31 15:40:16 -08:00
parent aff3f4b3fd
commit cb47b37215
3 changed files with 82 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
testing/btest/Baseline/scripts.base.frameworks.input.config.spaces/out Normal file
View file

@ -0,0 +1,11 @@
testbool, F
testcount, 1
testint, -1
testportandproto, 45/udp
testaddr, 127.0.0.3
test_set, {
127.0.0.2,
127.0.0.1,
127.0.0.3
}
test_vector, [10.0.0.1/32, 10.0.0.0/16, 10.0.0.0/8]

59
testing/btest/scripts/base/frameworks/input/config/spaces.bro Normal file
View file

@ -0,0 +1,59 @@
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait 10
# @TEST-EXEC: btest-diff out
redef exit_only_after_terminate = T;
redef InputConfig::empty_field = "EMPTY";
@TEST-START-FILE configfile
testbool F
testcount 1
testint -1
testportandproto 45/udp
testaddr 127.0.0.3
test_set 127.0.0.1, 127.0.0.2, 127.0.0.3
test_vector 10.0.0.1/32, 10.0.0.1/16, 10.0.0.1/8
@TEST-END-FILE
@load base/protocols/ssh
@load base/protocols/conn
global outfile: file;
export {
option testbool: bool = T;
option testcount: count = 0;
option testint: int = 0;
option testportandproto = 42/tcp;
option testaddr = 127.0.0.1;
option test_set: set[addr] = {};
option test_vector: vector of subnet = {};
}
type Idx: record {
option_name: string;
};
type Val: record {
option_val: string;
};
global currconfig: table[string] of string = table();
event InputConfig::new_value(name: string, source: string, id: string, value: any)
{
print outfile, id, value;
}
event Input::end_of_data(name: string, source:string)
{
close(outfile);
terminate();
}
event bro_init()
{
outfile = open("../out");
Input::add_table([$reader=Input::READER_CONFIG, $source="../configfile", $name="configuration", $idx=Idx, $val=Val, $destination=currconfig, $want_record=F]);
}