fix(query): ALB Listening on HTTP for AWS CloudFormation (#5212)

* fix incorrect line in result exposure * Fix E2E * update seach line * change search line
Checkmarx · Apr 26, 2022 · 7498c60 · 7498c60
1 parent 8dc621e
commit 7498c60
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 9 deletions.
diff --git a/assets/queries/cloudFormation/aws/alb_listening_on_http/query.rego b/assets/queries/cloudFormation/aws/alb_listening_on_http/query.rego
@@ -1,17 +1,20 @@
 package Cx
 
+import data.generic.common as common_lib
+
 CxPolicy[result] {
 	resource := input.document[i].Resources[name]
 	resource.Type == "AWS::ElasticLoadBalancing::LoadBalancer"
 
-	resource.Properties.Listeners[_].Protocol == "HTTP"
+	resource.Properties.Listeners[l].Protocol == "HTTP"
 
 	result := {
 		"documentId": input.document[i].id,
 		"searchKey": sprintf("Resources.%s.Properties.Listeners.Protocol=HTTP", [name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("'Resources.%s.Listeners.Protocol' not equal to 'HTTP'", [name]),
 		"keyActualValue": sprintf("'Resources.%s.Listeners.Protocol' equals to 'HTTP'", [name]),
+		"searchLine": common_lib.build_search_line(["Resources", name, "Properties","Listeners",l,"Protocol"], []),
 	}
 }
 
@@ -28,5 +31,6 @@ CxPolicy[result] {
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("'Resources.%s.Protocol' not equal to 'HTTP'", [name]),
 		"keyActualValue": sprintf("'Resources.%s.Protocol' equals to 'HTTP'", [name]),
+		"searchLine": common_lib.build_search_line(["Resources", name, "Properties","Protocol"], []),
 	}
 }
diff --git a/assets/queries/cloudFormation/aws/alb_listening_on_http/test/positive3.yaml b/assets/queries/cloudFormation/aws/alb_listening_on_http/test/positive3.yaml
@@ -0,0 +1,16 @@
+Resources:
+  HTTPlistener:
+   Type: "AWS::ElasticLoadBalancingV2::Listener"
+   Properties:
+     DefaultActions:
+       - Type: "redirect"
+         RedirectConfig:
+           Protocol: "HTTPS"
+           Port: "443"
+           Host: "#{host}"
+           Path: "/#{path}"
+           Query: "#{query}"
+           StatusCode: "HTTP_301"
+     LoadBalancerArn: !Ref myLoadBalancer
+     Port: 80
+     Protocol: "HTTP"
diff --git a/assets/queries/cloudFormation/aws/alb_listening_on_http/test/positive_expected_result.json b/assets/queries/cloudFormation/aws/alb_listening_on_http/test/positive_expected_result.json
@@ -3,24 +3,30 @@
     "fileName": "positive1.yaml",
     "queryName": "ALB Listening on HTTP",
     "severity": "HIGH",
-    "line": 13
+    "line": 25
   },
   {
     "fileName": "positive1.yaml",
     "queryName": "ALB Listening on HTTP",
     "severity": "HIGH",
-    "line": 25
+    "line": 13
   },
   {
-    "queryName": "ALB Listening on HTTP",
-    "severity": "HIGH",
     "line": 35,
-    "fileName": "positive2.json"
+    "fileName": "positive2.json",
+    "queryName": "ALB Listening on HTTP",
+    "severity": "HIGH"
   },
   {
-    "line": 35,
+    "line": 9,
     "fileName": "positive2.json",
     "queryName": "ALB Listening on HTTP",
     "severity": "HIGH"
+  },
+  {
+    "queryName": "ALB Listening on HTTP",
+    "severity": "HIGH",
+    "line": 16,
+    "fileName": "positive3.yaml"
   }
 ]
diff --git a/e2e/fixtures/E2E_CLI_032_RESULT.json b/e2e/fixtures/E2E_CLI_032_RESULT.json
@@ -37,7 +37,7 @@
 			"files": [
 				{
 					"file_name": "/path/e2e/fixtures/samples/positive.yaml",
-					"similarity_id": "f9c0a2aed39f325f242beed63be5c53d938d2c02f243366523b2984fd10243de",
+					"similarity_id": "7d59e0095d8eda260b02394f129910d70d01b55dffb356780166354f9360d848",
 					"line": 104,
 					"issue_type": "IncorrectValue",
 					"search_key": "Resources.ALBListener.Properties.Protocol",

diff --git a/e2e/fixtures/E2E_CLI_036_RESULT.json b/e2e/fixtures/E2E_CLI_036_RESULT.json
@@ -37,7 +37,7 @@
 			"files": [
 				{
 					"file_name": "fixtures\\samples\\positive.yaml",
-					"similarity_id": "f9c0a2aed39f325f242beed63be5c53d938d2c02f243366523b2984fd10243de",
+					"similarity_id": "7d59e0095d8eda260b02394f129910d70d01b55dffb356780166354f9360d848",
 					"line": 104,
 					"issue_type": "IncorrectValue",
 					"search_key": "Resources.ALBListener.Properties.Protocol",