Skip to content

fix(terraform): scope CloudWatch S3 policy alarm query #8055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omribz156 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −10
Open

fix(terraform): scope CloudWatch S3 policy alarm query #8055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions assets/queries/terraform/aws/cloudwatch_s3_policy_change_alarm_missing/query.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ expressionArr := [
#{ ($.eventSource = \"s3.amazonaws.com\") && (($.eventName = PutBucketAcl) || ($.eventName = PutBucketPolicy) || ($.eventName = PutBucketCors) || ($.eventName = PutBucketLifecycle) || ($.eventName = PutBucketReplication) || ($.eventName = DeleteBucketPolicy) || ($.eventName = DeleteBucketCors) || ($.eventName = DeleteBucketLifecycle) || ($.eventName = DeleteBucketReplication)) }
CxPolicy[result] {
doc := input.document[i]
_ := doc.resource.aws_cloudwatch_log_metric_filter[name]
filterResource := doc.resource.aws_cloudwatch_log_metric_filter[name]
is_s3_policy_change_filter(filterResource)


count([alarm | alarm := doc.resource.aws_cloudwatch_metric_alarm[_]; contains(alarm.metric_name, name)]) == 0

result := {
Expand All @@ -75,6 +75,10 @@ CxPolicy[result] {
}
}

is_s3_policy_change_filter(filter) {
contains(filter.pattern, "s3.amazonaws.com")
}


check_expression_missing(filter) {
filter._kics_filter_expr._op == "&&"
Expand All @@ -90,6 +94,7 @@ CxPolicy[result] {
resources := doc.resource.aws_cloudwatch_log_metric_filter

resourceNames := [resourceName | [path, value] := walk(resources);
is_s3_policy_change_filter(value);
filter := common_lib.json_unmarshal(value.pattern);
not check_expression_missing(filter);
resourceName := path[count(path)-1]
Expand All @@ -107,4 +112,4 @@ CxPolicy[result] {
"keyActualValue": "aws_cloudwatch_log_metric_filter with wrong pattern",
"searchLine": common_lib.build_search_line(["resource","aws_cloudwatch_log_metric_filter", resourceName, "pattern"], []),
}
}
}
12 changes: 12 additions & 0 deletions assets/queries/terraform/aws/cloudwatch_s3_policy_change_alarm_missing/test/negative1.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,15 @@ resource "aws_cloudwatch_metric_alarm" "cis_no_mfa_console_signin_cw_alarm" {
alarm_actions = [aws_sns_topic.CIS_Alerts_SNS_Topic.arn]
insufficient_data_actions = []
}

resource "aws_cloudwatch_log_metric_filter" "custom_application_metric_filter" {
name = "CustomApplicationMetric"
pattern = "[MYTEXT]"
log_group_name = aws_cloudwatch_log_group.Application_CloudWatch_LogsGroup.name

metric_transformation {
name = "CustomApplicationMetric"
namespace = "Application_Metric_Alarm_Namespace"
value = "1"
}
}
8 changes: 1 addition & 7 deletions ...erraform/aws/cloudwatch_s3_policy_change_alarm_missing/test/positive_expected_result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"line": 3,
"fileName": "positive1.tf"
},
{
"queryName": "CloudWatch S3 policy Change Alarm Missing",
"severity": "MEDIUM",
"line": 30,
"fileName": "positive1.tf"
},
{
"queryName": "CloudWatch S3 policy Change Alarm Missing",
"severity": "MEDIUM",
Expand Down Expand Up @@ -44,7 +38,7 @@
{
"queryName": "CloudWatch S3 policy Change Alarm Missing",
"severity": "MEDIUM",
"line": 31,
"line": 4,
"fileName": "positive5.tf"
}
]
Loading