Skip to content
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

fix(terraform): fix check CKV2_AZURE_8 #3554

Merged
merged 2 commits into from
Sep 22, 2022
Merged

fix(terraform): fix check CKV2_AZURE_8 #3554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57aa365
fix of check CKV2_AZURE_8
marynaKK Sep 22, 2022
8123af0
improved as Anton suggested
marynaKK Sep 22, 2022
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
89 changes: 60 additions & 29 deletions checkov/terraform/checks/graph_checks/azure/StorageContainerActivityLogsNotPublic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,69 @@ metadata:
id: "CKV2_AZURE_8"
category: "LOGGING"
definition:
and:
- cond_type: filter
attribute: resource_type
value:
- azurerm_storage_account
operator: within
- cond_type: connection
resource_types:
- azurerm_monitor_activity_log_alert
connected_resource_types:
- azurerm_storage_account
operator: exists
- cond_type: attribute
resource_types:
- azurerm_monitor_activity_log_alert
attribute: criteria.resource_id
operator: exists
- or:
- cond_type: attribute
or:
- and:
- cond_type: filter
attribute: resource_type
value:
- azurerm_storage_container
operator: within

- cond_type: connection
resource_types:
- azurerm_storage_container
connected_resource_types:
- azurerm_storage_account
operator: exists

- or:
- cond_type: connection
resource_types:
- azurerm_storage_account
connected_resource_types:
- azurerm_monitor_activity_log_alert
attribute: enabled
operator: not_exists

- and:
- cond_type: connection
resource_types:
- azurerm_storage_account
connected_resource_types:
- azurerm_monitor_activity_log_alert
operator: exists

- cond_type: attribute
resource_types:
- azurerm_monitor_activity_log_alert
attribute: enabled
operator: equals
value: false

- and:
- cond_type: filter
attribute: resource_type
value:
- azurerm_storage_container
operator: within

- cond_type: connection
resource_types:
- azurerm_storage_account
connected_resource_types:
- azurerm_storage_container
- azurerm_monitor_activity_log_alert
operator: exists

- or:
nimrodkor marked this conversation as resolved.
Show resolved Hide resolved
- cond_type: attribute
resource_types:
- azurerm_monitor_activity_log_alert
attribute: enabled
- azurerm_storage_container
attribute: container_access_type
operator: not_exists

- cond_type: attribute
resource_types:
- azurerm_storage_container
attribute: container_access_type
operator: equals
value: true
- cond_type: connection
resource_types:
- azurerm_storage_container
connected_resource_types:
- azurerm_storage_account
operator: exists
value: private
13 changes: 10 additions & 3 deletions tests/terraform/graph/checks/resources/StorageContainerActivityLogsNotPublic/expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
pass:
- "azurerm_storage_account.ok_account_1"
- "azurerm_storage_account.ok_account_2"
- "azurerm_storage_container.ok_container_log_enabled_by_default"
- "azurerm_storage_container.ok_container_log_enabled"
- "azurerm_storage_container.ok_container_log_disabled"
- "azurerm_storage_container.ok_container_log_enabled_by_default_2"
- "azurerm_storage_container.ok_container_log_enabled_2"
- "azurerm_storage_container.ok_container_log_disabled_2"
- "azurerm_storage_container.ok_container_log_disabled_3"
- "azurerm_storage_container.ok_container_4"
fail:
- "azurerm_storage_account.not_ok_account"
- "azurerm_storage_container.not_ok_container_log_enabled_by_default"
- "azurerm_storage_container.not_ok_container_log_enabled"
122 changes: 95 additions & 27 deletions tests/terraform/graph/checks/resources/StorageContainerActivityLogsNotPublic/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
resource "azurerm_storage_container" "ok_container_1" {
# -------------------------------------------------------------------- #
# default in azurerm_monitor_activity_log_alert is logging enabled
resource "azurerm_storage_container" "ok_container_log_enabled_by_default" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_1.name
container_access_type = "private"
}

resource "azurerm_storage_container" "ok_container_2" {
resource "azurerm_storage_container" "ok_container_log_enabled_by_default_2" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_2.name
container_access_type = "private"
storage_account_name = azurerm_storage_account.ok_account_1.name
}

resource "azurerm_storage_container" "not_ok_container" {
resource "azurerm_storage_container" "not_ok_container_log_enabled_by_default" {
name = "vhds"
storage_account_name = azurerm_storage_account.not_ok_account.name
container_access_type = "private"
storage_account_name = azurerm_storage_account.ok_account_1.name
container_access_type = "blob"
}

resource "azurerm_storage_account" "ok_account_1" {
Expand All @@ -24,22 +25,6 @@ resource "azurerm_storage_account" "ok_account_1" {
account_replication_type = "GRS"
}

resource "azurerm_storage_account" "ok_account_2" {
name = "examplesa"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
account_tier = "Standard"
account_replication_type = "GRS"
}

resource "azurerm_storage_account" "not_ok_account" {
name = "examplesa"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
account_tier = "Standard"
account_replication_type = "GRS"
}

resource "azurerm_monitor_activity_log_alert" "ok_monitor_activity_log_alert_1" {
name = "example-activitylogalert"
resource_group_name = azurerm_resource_group.main.name
Expand All @@ -52,7 +37,6 @@ resource "azurerm_monitor_activity_log_alert" "ok_monitor_activity_log_alert_1"
category = "Recommendation"
}


action {
action_group_id = azurerm_monitor_action_group.main.id

Expand All @@ -62,6 +46,33 @@ resource "azurerm_monitor_activity_log_alert" "ok_monitor_activity_log_alert_1"
}
}

# -------------------------------------------------------------------- #
# if log is enabled explicitly
resource "azurerm_storage_container" "ok_container_log_enabled" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_2.name
container_access_type = "private"
}

resource "azurerm_storage_container" "ok_container_log_enabled_2" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_2.name
}

resource "azurerm_storage_container" "not_ok_container_log_enabled" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_2.name
container_access_type = "blob"
}

resource "azurerm_storage_account" "ok_account_2" {
name = "examplesa"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
account_tier = "Standard"
account_replication_type = "GRS"
}

resource "azurerm_monitor_activity_log_alert" "ok_monitor_activity_log_alert_2" {
name = "example-activitylogalert"
resource_group_name = azurerm_resource_group.main.name
Expand All @@ -75,7 +86,6 @@ resource "azurerm_monitor_activity_log_alert" "ok_monitor_activity_log_alert_2"
category = "Recommendation"
}


action {
action_group_id = azurerm_monitor_action_group.main.id

Expand All @@ -85,15 +95,43 @@ resource "azurerm_monitor_activity_log_alert" "ok_monitor_activity_log_alert_2"
}
}

resource "azurerm_monitor_activity_log_alert" "not_ok_monitor_activity_log_alert" {
# -------------------------------------------------------------------- #
# logging disabled - doesn't care if container private or not

resource "azurerm_storage_container" "ok_container_log_disabled_3" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_3.name
container_access_type = "blob"
}

resource "azurerm_storage_container" "ok_container_log_disabled" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_3.name
container_access_type = "private"
}

resource "azurerm_storage_container" "ok_container_log_disabled_2" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_3.name
}

resource "azurerm_storage_account" "ok_account_3" {
name = "examplesa"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
account_tier = "Standard"
account_replication_type = "GRS"
}

resource "azurerm_monitor_activity_log_alert" "not_enabled_monitor_activity_log_alert" {
name = "example-activitylogalert"
resource_group_name = azurerm_resource_group.main.name
scopes = [azurerm_resource_group.main.id]
description = "This alert will monitor a specific storage account updates."
enabled = false

criteria {
resource_id = azurerm_storage_account.not_ok_account.id
resource_id = azurerm_storage_account.ok_account_3.id
operation_name = "Microsoft.Storage/storageAccounts/write"
category = "Recommendation"
}
Expand All @@ -105,4 +143,34 @@ resource "azurerm_monitor_activity_log_alert" "not_ok_monitor_activity_log_alert
from = "terraform"
}
}
}

# -------------------------------------------------------------------- #
# container with no connection to logging at all - all good

resource "azurerm_storage_container" "ok_container_4" {
name = "vhds"
storage_account_name = azurerm_storage_account.ok_account_4.name
container_access_type = "blob"
}

resource "azurerm_storage_account" "ok_account_4" {
name = "examplesa"
resource_group_name = azurerm_resource_group.main.name
location = azurerm_resource_group.main.location
account_tier = "Standard"
account_replication_type = "GRS"
}

# -------------------------------------------------------------------- #
# other resources
resource "azurerm_resource_group" "main" {
name = "okLegacyExample-resources"
location = "West Europe"
}

resource "azurerm_monitor_action_group" "main" {
name = "CriticalAlertsAction"
resource_group_name = azurerm_resource_group.main.name
short_name = "p0action"
}