From 5982c88b7910b1545d38803b6c5e29be31ad5bcd Mon Sep 17 00:00:00 2001 From: Ronen Schaffer Date: Sun, 6 Mar 2022 17:44:44 +0200 Subject: [PATCH] Fix bug with AddIf --- pkg/pipeline/transform/transform_network.go | 4 +++- pkg/pipeline/transform/transform_network_test.go | 4 ++-- pkg/test/utils.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/pipeline/transform/transform_network.go b/pkg/pipeline/transform/transform_network.go index c06dc5bfe..468281eca 100644 --- a/pkg/pipeline/transform/transform_network.go +++ b/pkg/pipeline/transform/transform_network.go @@ -74,8 +74,10 @@ func (n *Network) Transform(inputEntry config.GenericMap) config.GenericMap { outputEntries[rule.Output+"_Matched"] = true } case api.TransformNetworkOperationName("AddIf"): - expression, err := govaluate.NewEvaluableExpression(fmt.Sprintf("%s%s", outputEntries[rule.Input], rule.Parameters)) + expressionString := fmt.Sprintf("%v%s", outputEntries[rule.Input], rule.Parameters) + expression, err := govaluate.NewEvaluableExpression(expressionString) if err != nil { + log.Errorf("Can't evaluate AddIf rule: %+v expression: %v. err %v", rule, expressionString, err) continue } result, evaluateErr := expression.Evaluate(nil) diff --git a/pkg/pipeline/transform/transform_network_test.go b/pkg/pipeline/transform/transform_network_test.go index 69dfca3ea..31f090392 100644 --- a/pkg/pipeline/transform/transform_network_test.go +++ b/pkg/pipeline/transform/transform_network_test.go @@ -104,8 +104,8 @@ func getExpectedOutput() config.GenericMap { "subnet16SrcIP": "10.0.0.0/16", "subnet24SrcIP": "10.0.0.0/24", "emptyIP": "", - "value": "7", - "smaller_than_10": "7", + "value": 7.0, + "smaller_than_10": 7.0, "smaller_than_10_Evaluate": true, "service": "ssh", "service_protocol_num": "ssh", diff --git a/pkg/test/utils.go b/pkg/test/utils.go index e0960b3fd..063f971f4 100644 --- a/pkg/test/utils.go +++ b/pkg/test/utils.go @@ -38,7 +38,7 @@ func GetIngestMockEntry(missingKey bool) config.GenericMap { "srcPort": 11777, "protocol": "tcp", "protocol_num": 6, - "value": "7", + "value": 7.0, "message": "test message", }