beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dont create 3 maps just pass the same one to expr (#2421)

Browse source
This commit is contained in:
Laurence Jones 2023-10-13 22:35:30 +01:00 committed by GitHub
parent f0cda0406b
commit b2a6eb92bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/leakybucket/manager_run.go
View file

@ -297,7 +297,7 @@ func PourItemToHolders(parsed types.Event, holders []BucketFactory, buckets *Buc
evt := deepcopy.Copy(parsed) evt := deepcopy.Copy(parsed)
BucketPourCache["OK"] = append(BucketPourCache["OK"], evt.(types.Event)) BucketPourCache["OK"] = append(BucketPourCache["OK"], evt.(types.Event))
} }
parserEnv := map[string]interface{}{"evt": &parsed}
//find the relevant holders (scenarios) //find the relevant holders (scenarios)
for idx := 0; idx < len(holders); idx++ { for idx := 0; idx < len(holders); idx++ {
//for idx, holder := range holders { //for idx, holder := range holders {
@ -305,7 +305,7 @@ func PourItemToHolders(parsed types.Event, holders []BucketFactory, buckets *Buc
//evaluate bucket's condition //evaluate bucket's condition
if holders[idx].RunTimeFilter != nil { if holders[idx].RunTimeFilter != nil {
holders[idx].logger.Tracef("event against holder %d/%d", idx, len(holders)) holders[idx].logger.Tracef("event against holder %d/%d", idx, len(holders))
output, err := expr.Run(holders[idx].RunTimeFilter, map[string]interface{}{"evt": &parsed}) output, err := expr.Run(holders[idx].RunTimeFilter, parserEnv)
if err != nil { if err != nil {
holders[idx].logger.Errorf("failed parsing : %v", err) holders[idx].logger.Errorf("failed parsing : %v", err)
return false, fmt.Errorf("leaky failed : %s", err) return false, fmt.Errorf("leaky failed : %s", err)
@ -317,7 +317,7 @@ func PourItemToHolders(parsed types.Event, holders []BucketFactory, buckets *Buc
} }
if holders[idx].Debug { if holders[idx].Debug {
holders[idx].ExprDebugger.Run(holders[idx].logger, condition, map[string]interface{}{"evt": &parsed}) holders[idx].ExprDebugger.Run(holders[idx].logger, condition, parserEnv)
} }
if !condition { if !condition {
holders[idx].logger.Debugf("Event leaving node : ko (filter mismatch)") holders[idx].logger.Debugf("Event leaving node : ko (filter mismatch)")
@ -328,7 +328,7 @@ func PourItemToHolders(parsed types.Event, holders []BucketFactory, buckets *Buc
//groupby determines the partition key for the specific bucket //groupby determines the partition key for the specific bucket
var groupby string var groupby string
if holders[idx].RunTimeGroupBy != nil { if holders[idx].RunTimeGroupBy != nil {
tmpGroupBy, err := expr.Run(holders[idx].RunTimeGroupBy, map[string]interface{}{"evt": &parsed}) tmpGroupBy, err := expr.Run(holders[idx].RunTimeGroupBy, parserEnv)
if err != nil { if err != nil {
holders[idx].logger.Errorf("failed groupby : %v", err) holders[idx].logger.Errorf("failed groupby : %v", err)
return false, errors.New("leaky failed :/") return false, errors.New("leaky failed :/")