fixed script test app

Threagile · Apr 13, 2024 · 4ec01d2 · 4ec01d2
1 parent 3aa5fc7
commit 4ec01d2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/pkg/script/expressions/true-expression.go b/pkg/script/expressions/true-expression.go
@@ -13,9 +13,7 @@ type TrueExpression struct {
 func (what *TrueExpression) ParseBool(script any) (common.BoolExpression, any, error) {
 	what.literal = common.ToLiteral(script)
 
-	what.literal = common.ToLiteral(script)
-
-	item, errorScript, itemError := new(ExpressionList).ParseAny(script.(map[string]any))
+	item, errorScript, itemError := new(ExpressionList).ParseAny(script)
 	if itemError != nil {
 		return nil, errorScript, fmt.Errorf("failed to parse true-expression: %v", itemError)
 	}

diff --git a/pkg/security/types/technology.go b/pkg/security/types/technology.go
@@ -63,12 +63,12 @@ const (
 )
 
 type Technology struct {
-	Name        string          `yaml:"name,omitempty"`
-	Parent      string          `yaml:"parent,omitempty"`
-	Description string          `yaml:"description,omitempty"`
-	Aliases     []string        `yaml:"aliases,omitempty"`
-	Examples    []string        `yaml:"examples,omitempty"`
-	Attributes  map[string]bool `yaml:"attributes,omitempty"`
+	Name        string          `yaml:"name,omitempty" json:"name,omitempty"`
+	Parent      string          `yaml:"parent,omitempty" json:"parent,omitempty"`
+	Description string          `yaml:"description,omitempty" json:"description,omitempty"`
+	Aliases     []string        `yaml:"aliases,omitempty" json:"aliases,omitempty"`
+	Examples    []string        `yaml:"examples,omitempty" json:"examples,omitempty"`
+	Attributes  map[string]bool `yaml:"attributes,omitempty" json:"attributes,omitempty"`
 }
 
 func (what Technology) String() string {

diff --git a/test/risk-category.yaml b/test/risk-category.yaml
@@ -47,16 +47,20 @@ script:
   match:
     parameter: tech_asset
     do:
-      if:
-        and:
-          - false: "{tech_asset.out_of_scope}"
-          - contains:
-              item: "{tech_asset.technology}"
-              in:
-                - sourcecode-repository
-                - artifact-registry
-        then:
-          return: true
+      - if:
+          "true": "{tech_asset.out_of_scope}"
+          then:
+            return: false
+      - loop:
+          item: technology
+          in: "{tech_asset.technologies}"
+          do:
+            if:
+              or:
+                - true: "{technology.attributes.sourcecode-repository}"
+                - true: "{technology.attributes.artifact-registry}"
+              then:
+                return: true
 
   utils:
     get_title: