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

Fix SumStats::observe key normalization logic

Browse source 
The loop over Reducers in SumStats::observe performs a key normalization
and inadvertently modifies the key used for subsequent iterations.

Reported by Jim Mellander.
This commit is contained in:
Jon Siwek 2018-08-13 17:40:06 -05:00
parent 2d47586473
commit 5821c16490
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.5-840 | 2018-08-13 17:40:06 -0500
* Fix SumStats::observe key normalization logic
(reported by Jim Mellander and fixed by Jon Siwek, Corelight)
2.5-839 | 2018-08-13 10:51:43 -0500 2.5-839 | 2018-08-13 10:51:43 -0500
* Make options redef-able by default. (Johanna Amann, Corelight) * Make options redef-able by default. (Johanna Amann, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.5-839 2.5-840

5
scripts/base/frameworks/sumstats/main.bro
View file

@ -399,7 +399,7 @@ function create(ss: SumStat)
schedule ss$epoch { SumStats::finish_epoch(ss) }; schedule ss$epoch { SumStats::finish_epoch(ss) };
} }
function observe(id: string, key: Key, obs: Observation) function observe(id: string, orig_key: Key, obs: Observation)
{ {
if ( id !in reducer_store ) if ( id !in reducer_store )
return; return;
@ -407,8 +407,7 @@ function observe(id: string, key: Key, obs: Observation)
# Try to add the data to all of the defined reducers. # Try to add the data to all of the defined reducers.
for ( r in reducer_store[id] ) for ( r in reducer_store[id] )
{ {
if ( r?$normalize_key ) local key = r?$normalize_key ? r$normalize_key(copy(orig_key)) : orig_key;
key = r$normalize_key(copy(key));
# If this reducer has a predicate, run the predicate # If this reducer has a predicate, run the predicate
# and skip this key if the predicate return false. # and skip this key if the predicate return false.