Moved stix to comparison package

Author: MaartendeKruijf

internal/executors/condition/condition.go

@@ -6,7 +6,7 @@ import (
 	"soarca/logger"
 	"soarca/models/cacao"
 	"soarca/models/execution"
-	"soarca/utils/stix"
+	"soarca/utils/stix/expression/comparison"
 )
 
 var component = reflect.TypeOf(Executor{}).PkgPath()
@@ -16,8 +16,8 @@ func init() {
 	log = logger.Logger(component, logger.Info, "", logger.Json)
 }
 
-func New(stix stix.IStix) *Executor {
-	return &Executor{stix: stix}
+func New(comparison comparison.IComparison) *Executor {
+	return &Executor{comparison: comparison}
 }
 
 type IExecuter interface {
@@ -26,7 +26,7 @@ type IExecuter interface {
 }
 
 type Executor struct {
-	stix stix.IStix
+	comparison comparison.IComparison
 }
 
 func (executor *Executor) Execute(meta execution.Metadata, step cacao.Step, variables cacao.Variables) (string, bool, error) {
@@ -37,7 +37,7 @@ func (executor *Executor) Execute(meta execution.Metadata, step cacao.Step, vari
 		return step.OnFailure, false, err
 	}
 
-	result, err := executor.stix.Evaluate(step.Condition, variables)
+	result, err := executor.comparison.Evaluate(step.Condition, variables)
 	if err != nil {
 		log.Error(err)
 		return "", false, err

test/unittest/utils/stix/stix_test.go test/unittest/utils/stix/expression/comparison/comparison_test.go

@@ -1,17 +1,17 @@
-package stix_test
+package comparison_test
 
 import (
 	"errors"
 	"soarca/models/cacao"
-	"soarca/utils/stix"
+	"soarca/utils/stix/expression/comparison"
 	"testing"
 
 	"github.com/go-playground/assert/v2"
 )
 
 func TestStringEquals(t *testing.T) {
 
-	stix := stix.New()
+	stix := comparison.New()
 
 	var1 := cacao.Variable{Type: cacao.VariableTypeString}
 	var1.Value = "a"
@@ -55,7 +55,7 @@ func TestStringEquals(t *testing.T) {
 }
 
 func TestIntEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 
 	var1 := cacao.Variable{Type: cacao.VariableTypeLong}
 	var1.Value = "1000"
@@ -102,7 +102,7 @@ func TestIntEquals(t *testing.T) {
 }
 
 func TestFloatEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 
 	var1 := cacao.Variable{Type: cacao.VariableTypeFloat}
 	var1.Value = "1000.0"
@@ -158,7 +158,7 @@ func TestFloatEquals(t *testing.T) {
 }
 
 func TestIp4AddressEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 	var1 := cacao.Variable{Type: cacao.VariableTypeIpv4Address}
 	var1.Value = "10.0.0.30"
 	var1.Name = "__var1__"
@@ -182,7 +182,7 @@ func TestIp4AddressEquals(t *testing.T) {
 }
 
 func TestIp6AddressEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 	var1 := cacao.Variable{Type: cacao.VariableTypeIpv6Address}
 	var1.Value = "2001:db8::1"
 	var1.Name = "__var1__"
@@ -206,7 +206,7 @@ func TestIp6AddressEquals(t *testing.T) {
 }
 
 func TestMacAddressEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 	var1 := cacao.Variable{Type: cacao.VariableTypeMacAddress}
 	var1.Value = "BC-24-11-00-00-01"
 	var1.Name = "__var1__"
@@ -240,7 +240,7 @@ func TestMacAddressEquals(t *testing.T) {
 }
 
 func TestHashEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 	md5 := cacao.Variable{Type: cacao.VariableTypeMd5Has}
 	md5.Value = "d41d8cd98f00b204e9800998ecf8427e"
 	md5.Name = "__md5__"
@@ -294,7 +294,7 @@ func TestHashEquals(t *testing.T) {
 }
 
 func TestUriEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 
 	var1 := cacao.Variable{Type: cacao.VariableTypeUri}
 	var1.Value = "https://google.com"
@@ -316,7 +316,7 @@ func TestUriEquals(t *testing.T) {
 }
 
 func TestUuidEquals(t *testing.T) {
-	stix := stix.New()
+	stix := comparison.New()
 
 	var1 := cacao.Variable{Type: cacao.VariableTypeUuid}
 	var1.Value = "ec887691-9a21-4ccf-8fae-360c13a819d1"

utils/stix/strix.go utils/stix/expression/comparison/comparison.go

@@ -1,4 +1,4 @@
-package stix
+package comparison
 
 import (
 	"errors"
@@ -29,25 +29,25 @@ const (
 )
 
 var (
-	component = reflect.TypeOf(Stix{}).PkgPath()
+	component = reflect.TypeOf(Comparison{}).PkgPath()
 	log       *logger.Log
 )
 
 func init() {
 	log = logger.Logger(component, logger.Info, "", logger.Json)
 }
 
-type IStix interface {
+type IComparison interface {
 	Evaluate(string, cacao.Variables) (bool, error)
 }
 
-func New() *Stix {
-	return &Stix{}
+func New() *Comparison {
+	return &Comparison{}
 }
 
-type Stix struct{}
+type Comparison struct{}
 
-func (s *Stix) Evaluate(expression string, vars cacao.Variables) (bool, error) {
+func (s *Comparison) Evaluate(expression string, vars cacao.Variables) (bool, error) {
 
 	//"condition": "__variable__:value == '10.0.0.0/8'"
 	//"condition": "__ip__:value/__subnet__:value == '10.0.0.0/8'"
@@ -66,6 +66,8 @@ func (s *Stix) Evaluate(expression string, vars cacao.Variables) (bool, error) {
 
 	parts[0] = vars.Interpolate(parts[0])
 
+	log.Trace(parts)
+
 	switch usedVariable.Type {
 	case cacao.VariableTypeBool:
 		return boolCompare(parts)