Unifiying queries names categories, and severities & fixing typos (Ch…

…eckmarx#2671)
sashka3076 · Apr 1, 2021 · 07b528d · 07b528d
1 parent 4e4ca36
commit 07b528d
Show file tree

Hide file tree

Showing 154 changed files with 370 additions and 370 deletions.
diff --git a/..._volume_encrytpion_disabled/metadata.json → ..._volume_encryption_disabled/metadata.json b/..._volume_encrytpion_disabled/metadata.json → ..._volume_encryption_disabled/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "4b6012e7-7176-46e4-8108-e441785eae57",
   "queryName": "EBS Volume Encryption Disabled",
-  "severity": "HIGH",
+  "severity": "MEDIUM",
   "category": "Encryption",
   "descriptionText": "EBS Encryption should be enabled",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/amazon/aws/ec2_vol_module.html#parameter-encrypted",
   "platform": "Ansible"
-}
+}
diff --git a/...ebs_volume_encrytpion_disabled/query.rego → ...ebs_volume_encryption_disabled/query.rego b/...ebs_volume_encrytpion_disabled/query.rego → ...ebs_volume_encryption_disabled/query.rego
diff --git a/...me_encrytpion_disabled/test/negative.yaml → ...me_encryption_disabled/test/negative.yaml b/...me_encrytpion_disabled/test/negative.yaml → ...me_encryption_disabled/test/negative.yaml
diff --git a/...me_encrytpion_disabled/test/positive.yaml → ...me_encryption_disabled/test/positive.yaml b/...me_encrytpion_disabled/test/positive.yaml → ...me_encryption_disabled/test/positive.yaml
diff --git a/...sabled/test/positive_expected_result.json → ...sabled/test/positive_expected_result.json b/...sabled/test/positive_expected_result.json → ...sabled/test/positive_expected_result.json
@@ -1,22 +1,22 @@
 [
   {
     "queryName": "EBS Volume Encryption Disabled",
-    "severity": "HIGH",
+    "severity": "MEDIUM",
     "line": 5
   },
   {
     "queryName": "EBS Volume Encryption Disabled",
-    "severity": "HIGH",
+    "severity": "MEDIUM",
     "line": 12
   },
   {
     "queryName": "EBS Volume Encryption Disabled",
-    "severity": "HIGH",
+    "severity": "MEDIUM",
     "line": 19
   },
   {
     "queryName": "EBS Volume Encryption Disabled",
-    "severity": "HIGH",
+    "severity": "MEDIUM",
     "line": 24
   }
 ]
diff --git a/assets/queries/ansible/aws/ecs_task_definition_network_mode_not_recommended/metadata.json b/assets/queries/ansible/aws/ecs_task_definition_network_mode_not_recommended/metadata.json
@@ -2,7 +2,7 @@
   "id": "01aec7c2-3e4d-4274-ae47-2b8fea22fd1f",
   "queryName": "ECS Task Definition Network Mode Not Recommended",
   "severity": "HIGH",
-  "category": "Access Control",
+  "category": "Insecure Configurations",
   "descriptionText": "Network_Mode should be 'awsvpc' in ecs_task_definition. AWS VPCs provides the controls to facilitate a formal process for approving and testing all network connections and changes to the firewall and router configurations",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/community/aws/ecs_taskdefinition_module.html#parameter-network_mode",
   "platform": "Ansible"

diff --git a/assets/queries/ansible/aws/efs_without_kms/metadata.json b/assets/queries/ansible/aws/efs_without_kms/metadata.json
@@ -1,9 +1,9 @@
 {
-	"id": "bd77554e-f138-40c5-91b2-2a09f878608e",
-	"queryName": "EFS Without KMS",
-	"severity": "HIGH",
-	"category": "Secret Management",
-	"descriptionText": "Elastic File System (EFS) must have KMS Key ID",
-	"descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/community/aws/efs_module.html#parameter-kms_key_id",
-	"platform": "Ansible"
+  "id": "bd77554e-f138-40c5-91b2-2a09f878608e",
+  "queryName": "EFS Without KMS",
+  "severity": "HIGH",
+  "category": "Encryption",
+  "descriptionText": "Elastic File System (EFS) must have KMS Key ID",
+  "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/community/aws/efs_module.html#parameter-kms_key_id",
+  "platform": "Ansible"
 }
diff --git a/assets/queries/ansible/aws/iam_policies_with_full_privileges/metadata.json b/assets/queries/ansible/aws/iam_policies_with_full_privileges/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "e401d614-8026-4f4b-9af9-75d1197461ba",
   "queryName": "IAM Policies With Full Privileges",
-  "severity": "MEDIUM",
+  "severity": "HIGH",
   "category": "Access Control",
   "descriptionText": "IAM policies that allow full administrative privileges (for all resources)",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/community/aws/iam_managed_policy_module.html",
   "platform": "Ansible"
-}
+}
diff --git a/.../queries/ansible/aws/iam_policies_with_full_privileges/test/positive_expected_result.json b/.../queries/ansible/aws/iam_policies_with_full_privileges/test/positive_expected_result.json
@@ -1,7 +1,7 @@
 [
   {
     "queryName": "IAM Policies With Full Privileges",
-    "severity": "MEDIUM",
+    "severity": "HIGH",
     "line": 8
   }
-]
+]
diff --git a/assets/queries/ansible/aws/kinesis_not_encrypted_with_kms/metadata.json b/assets/queries/ansible/aws/kinesis_not_encrypted_with_kms/metadata.json
@@ -2,7 +2,7 @@
   "id": "f2ea6481-1d31-4d40-946a-520dc6321dd7",
   "queryName": "Kinesis Not Encrypted With KMS",
   "severity": "HIGH",
-  "category": "Secret Management",
+  "category": "Encryption",
   "descriptionText": "AWS Kinesis Streams and metadata should be protected with KMS",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/community/aws/kinesis_stream_module.html",
   "platform": "Ansible"

diff --git a/assets/queries/ansible/aws/kms_key_with_vulnerable_policy/metadata.json b/assets/queries/ansible/aws/kms_key_with_vulnerable_policy/metadata.json
@@ -2,8 +2,8 @@
   "id": "5b9d237a-57d5-4177-be0e-71434b0fef47",
   "queryName": "KMS Key With Vulnerable Policy",
   "severity": "HIGH",
-  "category": "Networking and Firewall",
+  "category": "Insecure Configurations",
   "descriptionText": "Checks if the policy is vulnerable and needs updating.",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/community/aws/aws_kms_module.html",
   "platform": "Ansible"
-}
+}
diff --git a/...le/aws/s3_bucket_acl_allows_read_or_write_to_all_users/test/positive_expected_result.json b/...le/aws/s3_bucket_acl_allows_read_or_write_to_all_users/test/positive_expected_result.json
diff --git a/...sers_group_gets_read_access/metadata.json → ...cl_allows_read_to_all_users/metadata.json b/...sers_group_gets_read_access/metadata.json → ...cl_allows_read_to_all_users/metadata.json
diff --git a/...l_users_group_gets_read_access/query.rego → ...t_acl_allows_read_to_all_users/query.rego b/...l_users_group_gets_read_access/query.rego → ...t_acl_allows_read_to_all_users/query.rego
diff --git a/...group_gets_read_access/test/negative.yaml → ...lows_read_to_all_users/test/negative.yaml b/...group_gets_read_access/test/negative.yaml → ...lows_read_to_all_users/test/negative.yaml
diff --git a/...group_gets_read_access/test/positive.yaml → ...lows_read_to_all_users/test/positive.yaml b/...group_gets_read_access/test/positive.yaml → ...lows_read_to_all_users/test/positive.yaml
diff --git a/...access/test/positive_expected_result.json → ..._users/test/positive_expected_result.json b/...access/test/positive_expected_result.json → ..._users/test/positive_expected_result.json
diff --git a/..._read_or_write_to_all_users/metadata.json → ..._action_from_all_principals/metadata.json b/..._read_or_write_to_all_users/metadata.json → ..._action_from_all_principals/metadata.json
@@ -1,6 +1,6 @@
 {
   "id": "7529b8d2-55d7-44d2-b1cd-d7d2984a2a81",
-  "queryName": "S3 Bucket ACL Allows Read Or Write to All Users",
+  "queryName": "S3 Bucket Allows WriteACP Action From All Principals",
   "severity": "HIGH",
   "category": "Access Control",
   "descriptionText": "S3 Buckets must not allow Write_ACP Action From All Principals, as to prevent leaking private information to the entire internet or allow unauthorized data tampering / deletion. This means the 'Effect' must not be 'Allow' when the 'Action' is Write_ACP, for all Principals.",

diff --git a/...ows_read_or_write_to_all_users/query.rego → ...acp_action_from_all_principals/query.rego b/...ows_read_or_write_to_all_users/query.rego → ...acp_action_from_all_principals/query.rego
diff --git a/..._or_write_to_all_users/test/negative.yaml → ...on_from_all_principals/test/negative.yaml b/..._or_write_to_all_users/test/negative.yaml → ...on_from_all_principals/test/negative.yaml
diff --git a/..._or_write_to_all_users/test/positive.yaml → ...on_from_all_principals/test/positive.yaml b/..._or_write_to_all_users/test/positive.yaml → ...on_from_all_principals/test/positive.yaml
diff --git a/...s/s3_bucket_allows_writeacp_action_from_all_principals/test/positive_expected_result.json b/...s/s3_bucket_allows_writeacp_action_from_all_principals/test/positive_expected_result.json
@@ -0,0 +1,7 @@
+[
+  {
+    "queryName": "S3 Bucket Allows WriteACP Action From All Principals",
+    "severity": "HIGH",
+    "line": 8
+  }
+]
diff --git a/...les_with_master_key_id_null/metadata.json → .../aws/s3_bucket_sse_disabled/metadata.json b/...les_with_master_key_id_null/metadata.json → .../aws/s3_bucket_sse_disabled/metadata.json
diff --git a/..._rules_with_master_key_id_null/query.rego → ...ble/aws/s3_bucket_sse_disabled/query.rego b/..._rules_with_master_key_id_null/query.rego → ...ble/aws/s3_bucket_sse_disabled/query.rego
diff --git a/...ith_master_key_id_null/test/negative.yaml → ...s3_bucket_sse_disabled/test/negative.yaml b/...ith_master_key_id_null/test/negative.yaml → ...s3_bucket_sse_disabled/test/negative.yaml
diff --git a/...ith_master_key_id_null/test/positive.yaml → ...s3_bucket_sse_disabled/test/positive.yaml b/...ith_master_key_id_null/test/positive.yaml → ...s3_bucket_sse_disabled/test/positive.yaml
diff --git a/...d_null/test/positive_expected_result.json → ...sabled/test/positive_expected_result.json b/...d_null/test/positive_expected_result.json → ...sabled/test/positive_expected_result.json
diff --git a/assets/queries/ansible/aws/s3_bucket_without_versioning/metadata.json b/assets/queries/ansible/aws/s3_bucket_without_versioning/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "9232306a-f839-40aa-b3ef-b352001da9a5",
   "queryName": "S3 Bucket Without Versioning",
-  "severity": "HIGH",
+  "severity": "MEDIUM",
   "category": "Observability",
   "descriptionText": "S3 bucket without versioning",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-versioning",
   "platform": "Ansible"
-}
+}
diff --git a/assets/queries/ansible/aws/s3_bucket_without_versioning/test/positive_expected_result.json b/assets/queries/ansible/aws/s3_bucket_without_versioning/test/positive_expected_result.json
@@ -1,12 +1,12 @@
 [
   {
     "queryName": "S3 Bucket Without Versioning",
-    "severity": "HIGH",
+    "severity": "MEDIUM",
     "line": 3
   },
   {
     "queryName": "S3 Bucket Without Versioning",
-    "severity": "HIGH",
+    "severity": "MEDIUM",
     "line": 15
   }
-]
+]
diff --git a/assets/queries/ansible/azure/ad_admin_not_configured_for_sql_server/metadata.json b/assets/queries/ansible/azure/ad_admin_not_configured_for_sql_server/metadata.json
@@ -2,8 +2,8 @@
   "id": "b176e927-bbe2-44a6-a9c3-041417137e5f",
   "queryName": "AD Admin Not Configured For SQL Server",
   "severity": "HIGH",
-  "category": "Access Control",
+  "category": "Insecure Configurations",
   "descriptionText": "The Active Directory Administrator is not configured for a SQL server",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/azure/azcollection/azure_rm_sqlserver_module.html#parameter-ad_user",
   "platform": "Ansible"
-}
+}
diff --git a/assets/queries/ansible/azure/blob_container_with_public_access/metadata.json b/assets/queries/ansible/azure/blob_container_with_public_access/metadata.json
diff --git a/...ueries/ansible/azure/blob_container_with_public_access/test/positive_expected_result.json b/...ueries/ansible/azure/blob_container_with_public_access/test/positive_expected_result.json
diff --git a/...ies/ansible/azure/firewall_rule_allows_too_many_hosts_to_access_redis_cache/metadata.json b/...ies/ansible/azure/firewall_rule_allows_too_many_hosts_to_access_redis_cache/metadata.json
@@ -2,8 +2,8 @@
   "id": "69f72007-502e-457b-bd2d-5012e31ac049",
   "queryName": "Firewall Rule Allows Too Many Hosts To Access Redis Cache",
   "severity": "MEDIUM",
-  "category": "Access Control",
+  "category": "Networking and Firewall",
   "descriptionText": "Check if any firewall rule allows too many hosts to access Redis Cache.",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/azure/azcollection/azure_rm_rediscachefirewallrule_module.html",
   "platform": "Ansible"
-}
+}
diff --git a/assets/queries/ansible/azure/log_disconnections_is_not_set/metadata.json b/assets/queries/ansible/azure/log_disconnections_is_not_set/metadata.json
diff --git a/...ts/queries/ansible/azure/log_disconnections_is_not_set/test/positive_expected_result.json b/...ts/queries/ansible/azure/log_disconnections_is_not_set/test/positive_expected_result.json
diff --git a/assets/queries/ansible/azure/postgresql_log_disconnections_not_set/metadata.json b/assets/queries/ansible/azure/postgresql_log_disconnections_not_set/metadata.json
@@ -0,0 +1,9 @@
+{
+  "id": "054d07b5-941b-4c28-8eef-18989dc62323",
+  "queryName": "PostgreSQL Log Disconnections Not Set",
+  "severity": "MEDIUM",
+  "category": "Observability",
+  "descriptionText": "Make sure that for PostgreSQL Database, server parameter 'log_disconnections' is set to 'ON'",
+  "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/azure/azcollection/azure_rm_postgresqlconfiguration_module.html",
+  "platform": "Ansible"
+}
diff --git a/.../log_disconnections_is_not_set/query.rego → ...sql_log_disconnections_not_set/query.rego b/.../log_disconnections_is_not_set/query.rego → ...sql_log_disconnections_not_set/query.rego
diff --git a/...connections_is_not_set/test/negative.yaml → ...disconnections_not_set/test/negative.yaml b/...connections_is_not_set/test/negative.yaml → ...disconnections_not_set/test/negative.yaml
diff --git a/...connections_is_not_set/test/positive.yaml → ...disconnections_not_set/test/positive.yaml b/...connections_is_not_set/test/positive.yaml → ...disconnections_not_set/test/positive.yaml
diff --git a/...es/ansible/azure/postgresql_log_disconnections_not_set/test/positive_expected_result.json b/...es/ansible/azure/postgresql_log_disconnections_not_set/test/positive_expected_result.json
@@ -0,0 +1,32 @@
+[
+  {
+    "queryName": "PostgreSQL Log Disconnections Not Set",
+    "severity": "MEDIUM",
+    "line": 7
+  },
+  {
+    "queryName": "PostgreSQL Log Disconnections Not Set",
+    "severity": "MEDIUM",
+    "line": 13
+  },
+  {
+    "queryName": "PostgreSQL Log Disconnections Not Set",
+    "severity": "MEDIUM",
+    "line": 19
+  },
+  {
+    "queryName": "PostgreSQL Log Disconnections Not Set",
+    "severity": "MEDIUM",
+    "line": 25
+  },
+  {
+    "queryName": "PostgreSQL Log Disconnections Not Set",
+    "severity": "MEDIUM",
+    "line": 31
+  },
+  {
+    "queryName": "PostgreSQL Log Disconnections Not Set",
+    "severity": "MEDIUM",
+    "line": 37
+  }
+]
diff --git a/assets/queries/ansible/azure/redis_entirely_accessible/metadata.json b/assets/queries/ansible/azure/redis_entirely_accessible/metadata.json
@@ -2,8 +2,8 @@
   "id": "0d0c12b9-edce-4510-9065-13f6a758750c",
   "queryName": "Redis Entirely Accessible",
   "severity": "HIGH",
-  "category": "Access Control",
+  "category": "Networking and Firewall",
   "descriptionText": "Firewall rule allowing unrestricted access to Redis from the Internet",
   "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/azure/azcollection/azure_rm_rediscachefirewallrule_module.html#parameter-start_ip_address",
   "platform": "Ansible"
-}
+}
diff --git a/assets/queries/ansible/azure/storage_container_is_publicly_accessible/metadata.json b/assets/queries/ansible/azure/storage_container_is_publicly_accessible/metadata.json
@@ -0,0 +1,9 @@
+{
+  "id": "4d3817db-dd35-4de4-a80d-3867157e7f7f",
+  "queryName": "Storage Container Is Publicly Accessible",
+  "severity": "HIGH",
+  "category": "Access Control",
+  "descriptionText": "Anonymous, public read access to a container and its blobs are enabled in Azure Blob Storage",
+  "descriptionUrl": "https://docs.ansible.com/ansible/latest/collections/azure/azcollection/azure_rm_storageblob_module.html#parameter-public_access",
+  "platform": "Ansible"
+}
diff --git a/...b_container_with_public_access/query.rego → ...ntainer_is_publicly_accessible/query.rego b/...b_container_with_public_access/query.rego → ...ntainer_is_publicly_accessible/query.rego
diff --git a/...ner_with_public_access/test/negative.yaml → ...is_publicly_accessible/test/negative.yaml b/...ner_with_public_access/test/negative.yaml → ...is_publicly_accessible/test/negative.yaml
diff --git a/...ner_with_public_access/test/positive.yaml → ...is_publicly_accessible/test/positive.yaml b/...ner_with_public_access/test/positive.yaml → ...is_publicly_accessible/test/positive.yaml
diff --git a/...ansible/azure/storage_container_is_publicly_accessible/test/positive_expected_result.json b/...ansible/azure/storage_container_is_publicly_accessible/test/positive_expected_result.json
@@ -0,0 +1,12 @@
+[
+  {
+    "queryName": "Storage Container Is Publicly Accessible",
+    "severity": "HIGH",
+    "line": 9
+  },
+  {
+    "queryName": "Storage Container Is Publicly Accessible",
+    "severity": "HIGH",
+    "line": 17
+  }
+]
diff --git a/...s_woth_unrestricted_traffic/metadata.json → ...s_with_unrestricted_traffic/metadata.json b/...s_woth_unrestricted_traffic/metadata.json → ...s_with_unrestricted_traffic/metadata.json
diff --git a/...oups_woth_unrestricted_traffic/query.rego → ...oups_with_unrestricted_traffic/query.rego b/...oups_woth_unrestricted_traffic/query.rego → ...oups_with_unrestricted_traffic/query.rego
diff --git a/..._unrestricted_traffic/test/negative1.yaml → ..._unrestricted_traffic/test/negative1.yaml b/..._unrestricted_traffic/test/negative1.yaml → ..._unrestricted_traffic/test/negative1.yaml
diff --git a/..._unrestricted_traffic/test/negative2.json → ..._unrestricted_traffic/test/negative2.json b/..._unrestricted_traffic/test/negative2.json → ..._unrestricted_traffic/test/negative2.json
diff --git a/..._unrestricted_traffic/test/positive1.yaml → ..._unrestricted_traffic/test/positive1.yaml b/..._unrestricted_traffic/test/positive1.yaml → ..._unrestricted_traffic/test/positive1.yaml
diff --git a/..._unrestricted_traffic/test/positive2.json → ..._unrestricted_traffic/test/positive2.json b/..._unrestricted_traffic/test/positive2.json → ..._unrestricted_traffic/test/positive2.json
diff --git a/...raffic/test/positive_expected_result.json → ...raffic/test/positive_expected_result.json b/...raffic/test/positive_expected_result.json → ...raffic/test/positive_expected_result.json
diff --git a/..._volume_encrytpion_disabled/metadata.json → ..._volume_encryption_disabled/metadata.json b/..._volume_encrytpion_disabled/metadata.json → ..._volume_encryption_disabled/metadata.json
diff --git a/...ebs_volume_encrytpion_disabled/query.rego → ...ebs_volume_encryption_disabled/query.rego b/...ebs_volume_encrytpion_disabled/query.rego → ...ebs_volume_encryption_disabled/query.rego
diff --git a/...e_encrytpion_disabled/test/negative1.yaml → ...e_encryption_disabled/test/negative1.yaml b/...e_encrytpion_disabled/test/negative1.yaml → ...e_encryption_disabled/test/negative1.yaml
diff --git a/...e_encrytpion_disabled/test/negative2.json → ...e_encryption_disabled/test/negative2.json b/...e_encrytpion_disabled/test/negative2.json → ...e_encryption_disabled/test/negative2.json
diff --git a/...e_encrytpion_disabled/test/positive1.yaml → ...e_encryption_disabled/test/positive1.yaml b/...e_encrytpion_disabled/test/positive1.yaml → ...e_encryption_disabled/test/positive1.yaml
diff --git a/...e_encrytpion_disabled/test/positive2.yaml → ...e_encryption_disabled/test/positive2.yaml b/...e_encrytpion_disabled/test/positive2.yaml → ...e_encryption_disabled/test/positive2.yaml
diff --git a/...e_encrytpion_disabled/test/positive3.json → ...e_encryption_disabled/test/positive3.json b/...e_encrytpion_disabled/test/positive3.json → ...e_encryption_disabled/test/positive3.json
diff --git a/...e_encrytpion_disabled/test/positive4.json → ...e_encryption_disabled/test/positive4.json b/...e_encrytpion_disabled/test/positive4.json → ...e_encryption_disabled/test/positive4.json
diff --git a/...sabled/test/positive_expected_result.json → ...sabled/test/positive_expected_result.json b/...sabled/test/positive_expected_result.json → ...sabled/test/positive_expected_result.json
diff --git a/..._not_encrypted_with_kms_cmk/metadata.json → ...udFormation/efs_without_kms/metadata.json b/..._not_encrypted_with_kms_cmk/metadata.json → ...udFormation/efs_without_kms/metadata.json
diff --git a/...efs_not_encrypted_with_kms_cmk/query.rego → ...cloudFormation/efs_without_kms/query.rego b/...efs_not_encrypted_with_kms_cmk/query.rego → ...cloudFormation/efs_without_kms/query.rego
diff --git a/...ncrypted_with_kms_cmk/test/negative1.yaml → ...ation/efs_without_kms/test/negative1.yaml b/...ncrypted_with_kms_cmk/test/negative1.yaml → ...ation/efs_without_kms/test/negative1.yaml
diff --git a/...ncrypted_with_kms_cmk/test/negative2.json → ...ation/efs_without_kms/test/negative2.json b/...ncrypted_with_kms_cmk/test/negative2.json → ...ation/efs_without_kms/test/negative2.json
diff --git a/...ncrypted_with_kms_cmk/test/positive1.yaml → ...ation/efs_without_kms/test/positive1.yaml b/...ncrypted_with_kms_cmk/test/positive1.yaml → ...ation/efs_without_kms/test/positive1.yaml
diff --git a/...ncrypted_with_kms_cmk/test/positive2.json → ...ation/efs_without_kms/test/positive2.json b/...ncrypted_with_kms_cmk/test/positive2.json → ...ation/efs_without_kms/test/positive2.json
diff --git a/...ms_cmk/test/positive_expected_result.json → ...ut_kms/test/positive_expected_result.json b/...ms_cmk/test/positive_expected_result.json → ...ut_kms/test/positive_expected_result.json
diff --git a/assets/queries/cloudFormation/kms_key_with_vulnerable_policy/metadata.json b/assets/queries/cloudFormation/kms_key_with_vulnerable_policy/metadata.json
@@ -2,7 +2,7 @@
   "id": "da905474-7454-43c0-b8d2-5756ab951aba",
   "queryName": "KMS Key With Vulnerable Policy",
   "severity": "HIGH",
-  "category": "Networking and Firewall",
+  "category": "Insecure Configurations",
   "descriptionText": "Checks if the policy is vulnerable and needs updating",
   "descriptionUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keypolicy",
   "platform": "CloudFormation"

diff --git a/assets/queries/cloudFormation/redshift_publicly_accessible/metadata.json b/assets/queries/cloudFormation/redshift_publicly_accessible/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "bdf8dcb4-75df-4370-92c4-606e4ae6c4d3",
   "queryName": "Redshift Publicly Accessible",
-  "severity": "MEDIUM",
+  "severity": "HIGH",
   "category": "Insecure Configurations",
   "descriptionText": "AWS Redshift Clusters must not be publicly accessible, which means the attribute 'PubliclyAccessible' must be set to false",
   "descriptionUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html",
   "platform": "CloudFormation"
-}
+}
diff --git a/...ts/queries/cloudFormation/redshift_publicly_accessible/test/positive_expected_result.json b/...ts/queries/cloudFormation/redshift_publicly_accessible/test/positive_expected_result.json
@@ -1,26 +1,26 @@
 [
   {
     "queryName": "Redshift Publicly Accessible",
-    "severity": "MEDIUM",
+    "severity": "HIGH",
     "line": 4,
     "fileName": "positive1.yaml"
   },
   {
     "queryName": "Redshift Publicly Accessible",
-    "severity": "MEDIUM",
+    "severity": "HIGH",
     "line": 17,
     "fileName": "positive1.yaml"
   },
   {
     "queryName": "Redshift Publicly Accessible",
-    "severity": "MEDIUM",
+    "severity": "HIGH",
     "line": 5,
     "fileName": "positive2.json"
   },
   {
     "queryName": "Redshift Publicly Accessible",
-    "severity": "MEDIUM",
+    "severity": "HIGH",
     "line": 30,
     "fileName": "positive2.json"
   }
-]
+]