Skip to content

Commit

Permalink
Query name unification (Checkmarx#2630)
Browse files Browse the repository at this point in the history
  • Loading branch information
@joaomartinscx
joaomartinscx authored Mar 31, 2021
1 parent 47454a5 commit 5356bf1
Show file tree
Hide file tree
Showing 44 changed files with 137 additions and 137 deletions.
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/access_key_not_rotated_within_90_days/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "800fa019-49dd-421b-9042-7331fdd83fa2",
"queryName": "Access Key Is Not Rotated Within 90 Days",
"queryName": "High Access Key Rotation Period",
"severity": "MEDIUM",
"category": "Best Practices",
"descriptionText": "Check if there is a rule that enforces access keys to be rotated within 90 days.",
Expand Down
4 changes: 2 additions & 2 deletions ...s/cloudFormation/access_key_not_rotated_within_90_days/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[
{
"queryName": "Access Key Is Not Rotated Within 90 Days",
"queryName": "High Access Key Rotation Period",
"severity": "MEDIUM",
"line": 7,
"fileName": "positive1.yaml"
},
{
"fileName": "positive2.json",
"queryName": "Access Key Is Not Rotated Within 90 Days",
"queryName": "High Access Key Rotation Period",
"severity": "MEDIUM",
"line": 8
}
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/cmks_rotation_disabled/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "1c07bfaf-663c-4f6f-b22b-8e2d481e4df5",
"queryName": "CMKs Rotation Disabled",
"queryName": "CMK Rotation Disabled",
"severity": "HIGH",
"category": "Observability",
"descriptionText": "Customer Master Keys (CMK) must have rotation enabled, which means the attribute 'EnableKeyRotation' must be set to 'true' when the key is enabled.",
Expand Down
8 changes: 4 additions & 4 deletions assets/queries/cloudFormation/cmks_rotation_disabled/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[
{
"queryName": "CMKs Rotation Disabled",
"queryName": "CMK Rotation Disabled",
"severity": "HIGH",
"line": 5,
"fileName": "positive1.yaml"
},
{
"fileName": "positive1.yaml",
"queryName": "CMKs Rotation Disabled",
"queryName": "CMK Rotation Disabled",
"severity": "HIGH",
"line": 31
},
{
"fileName": "positive2.json",
"queryName": "CMKs Rotation Disabled",
"queryName": "CMK Rotation Disabled",
"severity": "HIGH",
"line": 5
},
{
"queryName": "CMKs Rotation Disabled",
"queryName": "CMK Rotation Disabled",
"severity": "HIGH",
"line": 49,
"fileName": "positive2.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/docdb_cluster_master_password_in_plaintext/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "39423ce4-9011-46cd-b6b1-009edcd9385d",
"queryName": "DocDB cluster master password in plaintext",
"queryName": "DocDB Cluster Master Password In Plaintext",
"severity": "MEDIUM",
"category": "Secret Management",
"descriptionText": "DocDB DB Cluster master user password must not be in a plain text string or referenced in a parameter as a default value.",
Expand Down
12 changes: 6 additions & 6 deletions ...udFormation/docdb_cluster_master_password_in_plaintext/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"severity": "MEDIUM",
"line": 5,
"fileName": "positive2.yaml",
"queryName": "DocDB cluster master password in plaintext"
"queryName": "DocDB Cluster Master Password In Plaintext"
},
{
"queryName": "DocDB cluster master password in plaintext",
"queryName": "DocDB Cluster Master Password In Plaintext",
"severity": "MEDIUM",
"line": 12,
"fileName": "positive1.yaml"
},
{
"queryName": "DocDB cluster master password in plaintext",
"queryName": "DocDB Cluster Master Password In Plaintext",
"severity": "MEDIUM",
"line": 12,
"fileName": "positive3.yaml"
Expand All @@ -21,16 +21,16 @@
"severity": "MEDIUM",
"line": 17,
"fileName": "positive4.json",
"queryName": "DocDB cluster master password in plaintext"
"queryName": "DocDB Cluster Master Password In Plaintext"
},
{
"queryName": "DocDB cluster master password in plaintext",
"queryName": "DocDB Cluster Master Password In Plaintext",
"severity": "MEDIUM",
"line": 6,
"fileName": "positive5.json"
},
{
"queryName": "DocDB cluster master password in plaintext",
"queryName": "DocDB Cluster Master Password In Plaintext",
"severity": "MEDIUM",
"line": 18,
"fileName": "positive6.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/dynamodb_with_aws_owned_cmk/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "c8dee387-a2e6-4a73-a942-183c975549ac",
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH",
"category": "Encryption",
"descriptionText": "AWS DynamoDb should be encrypted using AWS Managed CMK, instead of AWS-owned CMK. To verify this, SSEEnabled must be verified if false for AWS-owned CMK or true for AWS-Managed CMK. Default value is false.",
Expand Down
16 changes: 8 additions & 8 deletions assets/queries/cloudFormation/dynamodb_with_aws_owned_cmk/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
{
"line": 4,
"fileName": "positive1.yaml",
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH"
},
{
"line": 4,
"fileName": "positive4.yaml",
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH"
},
{
"fileName": "positive2.yaml",
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH",
"line": 4
},
{
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH",
"line": 4,
"fileName": "positive3.yaml"
},
{
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH",
"line": 5,
"fileName": "positive5.json"
},
{
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH",
"line": 5,
"fileName": "positive6.json"
Expand All @@ -39,10 +39,10 @@
"severity": "HIGH",
"line": 4,
"fileName": "positive7.json",
"queryName": "DynamoDB with AWS Owned CMK"
"queryName": "DynamoDB With Aws Owned CMK"
},
{
"queryName": "DynamoDB with AWS Owned CMK",
"queryName": "DynamoDB With Aws Owned CMK",
"severity": "HIGH",
"line": 5,
"fileName": "positive8.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/dynamodb_with_table_billing_mode_not_recommended/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "c333e906-8d8b-4275-b999-78b6318f8dc6",
"queryName": "DynamoDB With Table Billing Mode Not Recommended",
"queryName": "DynamoDB With Not Recommented Table Billing Mode",
"severity": "LOW",
"category": "Build Process",
"descriptionText": "Checks if DynamoDB Table Billing Mode is set to either PAY_PER_REQUEST or PROVISIONED",
Expand Down
4 changes: 2 additions & 2 deletions ...ation/dynamodb_with_table_billing_mode_not_recommended/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[
{
"queryName": "DynamoDB With Table Billing Mode Not Recommended",
"queryName": "DynamoDB With Not Recommented Table Billing Mode",
"severity": "LOW",
"line": 13,
"fileName": "positive1.yaml"
},
{
"queryName": "DynamoDB With Table Billing Mode Not Recommended",
"queryName": "DynamoDB With Not Recommented Table Billing Mode",
"severity": "LOW",
"line": 16,
"fileName": "positive2.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/ec2_network_acl_overlapping_ports/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "77b6f1e2-bde4-4a6a-ae7e-a40659ff1576",
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"category": "Networking and Firewall",
"descriptionText": "NetworkACL Entries are reusing or overlapping ports which may create ineffective rules",
Expand Down
24 changes: 12 additions & 12 deletions ...eries/cloudFormation/ec2_network_acl_overlapping_ports/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
[
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 78,
"fileName": "positive1.yaml"
},
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 90,
"fileName": "positive1.yaml"
},
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 18,
"fileName": "positive1.yaml"
},
{
"fileName": "positive1.yaml",
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 30
},
{
"severity": "HIGH",
"line": 42,
"fileName": "positive1.yaml",
"queryName": "EC2 network ACL overlapping ports"
"queryName": "EC2 Network ACL Overlapping Ports"
},
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 54,
"fileName": "positive1.yaml"
},
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 73,
"fileName": "positive2.json"
},
{
"line": 116,
"fileName": "positive2.json",
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH"
},
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 22,
"fileName": "positive2.json"
},
{
"line": 82,
"fileName": "positive2.json",
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH"
},
{
"line": 105,
"fileName": "positive2.json",
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH"
},
{
"queryName": "EC2 network ACL overlapping ports",
"queryName": "EC2 Network ACL Overlapping Ports",
"severity": "HIGH",
"line": 38,
"fileName": "positive2.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/elasticache_with_disabled_at_rest_encryption/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "e4ee3903-9225-4b6a-bdfb-e62dbadef821",
"queryName": "ElastiCache with disabled at Rest Encryption",
"queryName": "ElastiCache With Disabled at Rest Encryption",
"severity": "HIGH",
"category": "Encryption",
"descriptionText": "Ensure AWS ElastiCache Redis clusters have encryption for data at rest enabled",
Expand Down
8 changes: 4 additions & 4 deletions ...Formation/elasticache_with_disabled_at_rest_encryption/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
{
"line": 10,
"fileName": "positive1.yaml",
"queryName": "ElastiCache with disabled at Rest Encryption",
"queryName": "ElastiCache With Disabled at Rest Encryption",
"severity": "HIGH"
},
{
"severity": "HIGH",
"line": 8,
"fileName": "positive2.yaml",
"queryName": "ElastiCache with disabled at Rest Encryption"
"queryName": "ElastiCache With Disabled at Rest Encryption"
},
{
"queryName": "ElastiCache with disabled at Rest Encryption",
"queryName": "ElastiCache With Disabled at Rest Encryption",
"severity": "HIGH",
"line": 19,
"fileName": "positive3.json"
},
{
"queryName": "ElastiCache with disabled at Rest Encryption",
"queryName": "ElastiCache With Disabled at Rest Encryption",
"severity": "HIGH",
"line": 7,
"fileName": "positive4.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/elasticache_with_disabled_transit_encryption/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "3b02569b-fc6f-4153-b3a3-ba91022fed68",
"queryName": "ElastiCache with disabled Transit Encryption",
"queryName": "ElastiCache With Disabled Transit Encryption",
"severity": "HIGH",
"category": "Encryption",
"descriptionText": "Ensure AWS ElastiCache Redis clusters have encryption for data at transit enabled",
Expand Down
8 changes: 4 additions & 4 deletions ...Formation/elasticache_with_disabled_transit_encryption/test/positive_expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[
{
"fileName": "positive2.yaml",
"queryName": "ElastiCache with disabled Transit Encryption",
"queryName": "ElastiCache With Disabled Transit Encryption",
"severity": "HIGH",
"line": 26
},
{
"severity": "HIGH",
"line": 6,
"fileName": "positive1.yaml",
"queryName": "ElastiCache with disabled Transit Encryption"
"queryName": "ElastiCache With Disabled Transit Encryption"
},
{
"line": 4,
"fileName": "positive3.json",
"queryName": "ElastiCache with disabled Transit Encryption",
"queryName": "ElastiCache With Disabled Transit Encryption",
"severity": "HIGH"
},
{
"queryName": "ElastiCache with disabled Transit Encryption",
"queryName": "ElastiCache With Disabled Transit Encryption",
"severity": "HIGH",
"line": 18,
"fileName": "positive4.json"
Expand Down
2 changes: 1 addition & 1 deletion assets/queries/cloudFormation/emr_security_configuration_encryptions_enabled/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "5b033ec8-f079-4323-b5c8-99d4620433a9",
"queryName": "EMR Security Configuration Encryptions Enabled",
"queryName": "EMR Security Configuration Encryption Disabled",
"severity": "MEDIUM",
"category": "Encryption",
"descriptionText": "EMR SecurityConfiguration should enable and properly configure encryption at rest and in transit.",
Expand Down
Loading

0 comments on commit 5356bf1

Please sign in to comment.