Removed suffix from Log types (#4)

panther-labs · Jan 21, 2020 · 39ee57b · 39ee57b
1 parent 7d0ef49
commit 39ee57b
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 75 deletions.
diff --git a/analysis/rules/cis/aws_cloudtrail_modified.yml b/analysis/rules/cis/aws_cloudtrail_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.CloudTrailModified
 DisplayName: CloudTrail Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: CloudTrail Was Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -62,7 +62,7 @@ Tests:
       }
   -
     Name: CloudTrail Was Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_config_service_modified.yml b/analysis/rules/cis/aws_config_service_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.ConfigServiceModified
 DisplayName: AWS Config Service Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: https://aws.amazon.com/config/
 Tests:
   -
     Name: Config Recorder Stopped
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -61,7 +61,7 @@ Tests:
       }
   -
     Name: Config Recorder Started
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_console_login_failed.yml b/analysis/rules/cis/aws_console_login_failed.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.ConsoleLoginFailed
 DisplayName: Failed Console Login
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: Failed Login
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -51,7 +51,7 @@ Tests:
       }
   -
     Name: Successful Login
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {
@@ -84,7 +84,7 @@ Tests:
       }
   -
     Name: Non Login Event
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_console_login_without_mfa.yml b/analysis/rules/cis/aws_console_login_without_mfa.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.ConsoleLoginWithoutMFA
 DisplayName: Logins Without MFA
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: No MFA
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -51,7 +51,7 @@ Tests:
       }
   -
     Name: Yes MFA 
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {
@@ -84,7 +84,7 @@ Tests:
       }
   -
     Name: No MFA but Login Failed
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_ec2_gateway_modified.yml b/analysis/rules/cis/aws_ec2_gateway_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.EC2GatewayModified
 DisplayName: EC2 Network Gateway Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: Network Gateway Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -64,7 +64,7 @@ Tests:
       }
   -
     Name: Network Gateway Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_ec2_network_acl_modified.yml b/analysis/rules/cis/aws_ec2_network_acl_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.EC2NetworkACLModified
 DisplayName: EC2 Network ACL Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: Network ACL Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -70,7 +70,7 @@ Tests:
       }
   -
     Name: Network ACL Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_ec2_route_table_modified.yml b/analysis/rules/cis/aws_ec2_route_table_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.EC2RouteTableModified
 DisplayName: EC2 Route Table Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: Route Table Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -65,7 +65,7 @@ Tests:
       }
   -
     Name: Route Table Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_ec2_security_group_modified.yml b/analysis/rules/cis/aws_ec2_security_group_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.EC2SecurityGroupModified
 DisplayName: EC2 Security Group Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: Security Group Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -84,7 +84,7 @@ Tests:
       }
   -
     Name: Security Group Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_ec2_vpc_modified.yml b/analysis/rules/cis/aws_ec2_vpc_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.EC2VPCModified
 DisplayName: EC2 VPC Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: VPC Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -87,7 +87,7 @@ Tests:
       }
   -
     Name: VPC Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_iam_policy_modified.yml b/analysis/rules/cis/aws_iam_policy_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.IAMPolicyModified
 DisplayName: IAM Policy Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: IAM Policy Change
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -61,7 +61,7 @@ Tests:
       }
   -
     Name: Not IAM Policy Change
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_kms_cmk_loss.yml b/analysis/rules/cis/aws_kms_cmk_loss.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.KMSCustomerManagedKeyLoss
 DisplayName: Potential KMS CMK Loss
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: KMS Key Disabled
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -68,7 +68,7 @@ Tests:
       }
   -
     Name: KMS Key Scheduled For Deletion
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -123,7 +123,7 @@ Tests:
       }
   -
     Name: KMS Key Non Deletion Event
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_root_activity.yml b/analysis/rules/cis/aws_root_activity.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.RootActivity
 DisplayName: Root Account Activity
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-user.html
 Tests:
   -
     Name: Root Activity
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -69,7 +69,7 @@ Tests:
       }
   -
     Name: IAMUser Activity
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {

diff --git a/analysis/rules/cis/aws_s3_bucket_policy_modified.yml b/analysis/rules/cis/aws_s3_bucket_policy_modified.yml
@@ -4,7 +4,7 @@ PolicyID: AWS.CloudTrail.S3BucketPolicyModified
 DisplayName: AWS S3 Bucket Policy Modified
 Enabled: true
 ResourceTypes:
-  - AWS.CloudTrail.Log
+  - AWS.CloudTrail
 Tags:
   - AWS
   - CIS
@@ -18,7 +18,7 @@ Reference: reference.link
 Tests:
   -
     Name: S3 Bucket Policy Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: true
     Resource:
       {
@@ -74,7 +74,7 @@ Tests:
       }
   -
     Name: S3 Bucket Policy Not Modified
-    ResourceType: AWS.CloudTrail.Log
+    ResourceType: AWS.CloudTrail
     ExpectedResult: false
     Resource:
       {