diff --git a/envs/prod/imports.tf b/envs/prod/imports.tf index 22cd6df..332ac5c 100644 --- a/envs/prod/imports.tf +++ b/envs/prod/imports.tf @@ -65,3 +65,43 @@ import { to = module.audit_logging_encryption.aws_cloudtrail.management_events id = "arn:aws:cloudtrail:${var.region}:${var.account_id}:trail/management-events" } + +import { + to = module.iam_auth.aws_iam_role.flow_logs + id = "VPCFlowLogs-Cloudwatch-nw-flowlogs" +} + +import { + to = module.iam_auth.aws_iam_policy.flow_logs + id = "arn:aws:iam::${var.account_id}:policy/service-role/VPCFlowLogs-CloudWatch-Policy-1764421371627" +} + +import { + to = module.iam_auth.aws_iam_role_policy_attachment.flow_logs + id = "VPCFlowLogs-Cloudwatch-nw-flowlogs/arn:aws:iam::${var.account_id}:policy/service-role/VPCFlowLogs-CloudWatch-Policy-1764421371627" +} + +import { + to = module.iam_auth.aws_iam_user.vault + id = "vault" +} + +import { + to = module.iam_auth.aws_iam_user_policy.kms_vault + id = "vault:KMS-Vault" +} + +import { + to = module.iam_auth.aws_iam_user.vault_iam_create + id = "vault-iam-create" +} + +import { + to = module.iam_auth.aws_iam_user_policy.vault_iam + id = "vault-iam-create:Vault-IAM-Policy" +} + +import { + to = module.iam_auth.aws_iam_user_policy.sts_route53 + id = "vault-iam-create:sts-route53" +} diff --git a/envs/prod/main.tf b/envs/prod/main.tf index c356b22..65208b8 100644 --- a/envs/prod/main.tf +++ b/envs/prod/main.tf @@ -34,3 +34,25 @@ module "audit_logging_encryption" { billing_alarm_name = "awsbilling-AWS-Service-Charges-total" billing_alarm_action_arns = ["arn:aws:sns:us-east-1:${var.account_id}:NotifyMe"] } + +module "iam_auth" { + source = "../../modules/iam_auth" + + region = var.region + account_id = var.account_id + name_prefix = var.name_prefix + + names = { + flow_logs_role = "VPCFlowLogs-Cloudwatch-nw-flowlogs" + flow_logs_policy = "VPCFlowLogs-CloudWatch-Policy-1764421371627" + vault_user = "vault" + kms_vault_policy = "KMS-Vault" + vault_iam_create_user = "vault-iam-create" + vault_iam_policy = "Vault-IAM-Policy" + sts_route53_policy = "sts-route53" + route53_role = "route53" + vault_managed_user_stem = "vault-" + } + + vault_kms_resource_arns = module.audit_logging_encryption.vault_kms_resource_arns +} diff --git a/modules/audit_logging_encryption/locals.tf b/modules/audit_logging_encryption/locals.tf index d433c70..12cf201 100644 --- a/modules/audit_logging_encryption/locals.tf +++ b/modules/audit_logging_encryption/locals.tf @@ -9,7 +9,8 @@ locals { { for key, bucket in aws_s3_bucket.unprotected : key => bucket.id }, ) - vault_kms_key_id = var.protect_from_destroy ? aws_kms_key.vault_protected[0].key_id : aws_kms_key.vault_unprotected[0].key_id + vault_kms_key_id = var.protect_from_destroy ? aws_kms_key.vault_protected[0].key_id : aws_kms_key.vault_unprotected[0].key_id + vault_kms_key_arn = var.protect_from_destroy ? aws_kms_key.vault_protected[0].arn : aws_kms_key.vault_unprotected[0].arn trail_arn = "arn:aws:cloudtrail:${var.region}:${var.account_id}:trail/${var.trail_name}" diff --git a/modules/audit_logging_encryption/outputs.tf b/modules/audit_logging_encryption/outputs.tf new file mode 100644 index 0000000..4a7b5e8 --- /dev/null +++ b/modules/audit_logging_encryption/outputs.tf @@ -0,0 +1,7 @@ +output "vault_kms_resource_arns" { + description = "ARNs of the managed Vault KMS key and alias for dependent IAM policies." + value = [ + local.vault_kms_key_arn, + aws_kms_alias.vault.arn, + ] +} diff --git a/modules/iam_auth/flow_logs.tf b/modules/iam_auth/flow_logs.tf new file mode 100644 index 0000000..0f5f047 --- /dev/null +++ b/modules/iam_auth/flow_logs.tf @@ -0,0 +1,69 @@ +resource "aws_iam_role" "flow_logs" { + name = local.flow_logs_role_name + path = "/service-role/" + max_session_duration = 3600 + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [{ + Effect = "Allow" + Principal = { + Service = "vpc-flow-logs.amazonaws.com" + } + Action = "sts:AssumeRole" + Condition = { + StringEquals = { + "aws:SourceAccount" = var.account_id + } + ArnLike = { + "aws:SourceArn" = "arn:aws:ec2:${var.region}:${var.account_id}:vpc-flow-log/*" + } + } + }] + }) + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_policy" "flow_logs" { + name = local.flow_logs_policy_name + path = "/service-role/" + + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Effect = "Allow" + Action = [ + "logs:CreateLogStream", + "logs:PutLogEvents", + ] + Resource = "arn:aws:logs:${var.region}:${var.account_id}:log-group:*:log-stream:*" + }, + { + Effect = "Allow" + Action = [ + "logs:DescribeLogStreams", + "logs:CreateLogGroup", + ] + Resource = "arn:aws:logs:${var.region}:${var.account_id}:log-group:*" + }, + { + Effect = "Allow" + Action = "logs:DescribeLogGroups" + Resource = "*" + }, + ] + }) + + lifecycle { + prevent_destroy = true + } +} + +resource "aws_iam_role_policy_attachment" "flow_logs" { + role = aws_iam_role.flow_logs.name + policy_arn = aws_iam_policy.flow_logs.arn +} diff --git a/modules/iam_auth/locals.tf b/modules/iam_auth/locals.tf new file mode 100644 index 0000000..6e9041f --- /dev/null +++ b/modules/iam_auth/locals.tf @@ -0,0 +1,12 @@ +locals { + flow_logs_role_name = coalesce(var.names.flow_logs_role, "${var.name_prefix}-vpc-flow-logs") + flow_logs_policy_name = coalesce(var.names.flow_logs_policy, "${var.name_prefix}-vpc-flow-logs-cloudwatch") + + vault_user_name = coalesce(var.names.vault_user, "${var.name_prefix}-vault") + kms_vault_policy_name = coalesce(var.names.kms_vault_policy, "${var.name_prefix}-KMS-Vault") + vault_iam_create_user_name = coalesce(var.names.vault_iam_create_user, "${var.name_prefix}-vault-iam-create") + vault_iam_policy_name = coalesce(var.names.vault_iam_policy, "${var.name_prefix}-Vault-IAM-Policy") + sts_route53_policy_name = coalesce(var.names.sts_route53_policy, "${var.name_prefix}-sts-route53") + route53_role_name = coalesce(var.names.route53_role, "${var.name_prefix}-route53") + vault_managed_user_stem = coalesce(var.names.vault_managed_user_stem, "${var.name_prefix}-vault-") +} diff --git a/modules/iam_auth/users.tf b/modules/iam_auth/users.tf new file mode 100644 index 0000000..d526a4f --- /dev/null +++ b/modules/iam_auth/users.tf @@ -0,0 +1,107 @@ +resource "aws_iam_user" "vault" { + name = local.vault_user_name + path = "/" + force_destroy = false + + lifecycle { + prevent_destroy = true + # Existing tag keys contain access key IDs and are intentionally unmanaged. + ignore_changes = [tags] + } +} + +resource "aws_iam_user_policy" "kms_vault" { + name = local.kms_vault_policy_name + user = aws_iam_user.vault.name + + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Sid = "VisualEditor0" + Effect = "Allow" + Action = [ + "kms:DescribeCustomKeyStores", + "kms:ListKeys", + "kms:DeleteCustomKeyStore", + "kms:GenerateRandom", + "kms:UpdateCustomKeyStore", + "kms:ListAliases", + "kms:DisconnectCustomKeyStore", + "kms:CreateKey", + "kms:ConnectCustomKeyStore", + "kms:CreateCustomKeyStore", + "kms:DescribeKey", + ] + Resource = "*" + }, + { + Sid = "VisualEditor1" + Effect = "Allow" + Action = "kms:*" + Resource = var.vault_kms_resource_arns + }, + ] + }) +} + +resource "aws_iam_user" "vault_iam_create" { + name = local.vault_iam_create_user_name + path = "/" + force_destroy = false + + lifecycle { + prevent_destroy = true + # Existing tag keys contain access key IDs and are intentionally unmanaged. + ignore_changes = [tags] + } +} + +resource "aws_iam_user_policy" "vault_iam" { + name = local.vault_iam_policy_name + user = aws_iam_user.vault_iam_create.name + + policy = jsonencode({ + Version = "2012-10-17" + Statement = [{ + Effect = "Allow" + Action = [ + "iam:AttachUserPolicy", + "iam:CreateAccessKey", + "iam:CreateUser", + "iam:DeleteAccessKey", + "iam:DeleteUser", + "iam:DeleteUserPolicy", + "iam:DetachUserPolicy", + "iam:GetUser", + "iam:ListAccessKeys", + "iam:ListAttachedUserPolicies", + "iam:ListGroupsForUser", + "iam:ListUserPolicies", + "iam:PutUserPolicy", + "iam:AddUserToGroup", + "iam:RemoveUserFromGroup", + "iam:TagUser", + ] + Resource = [ + "arn:aws:iam::${var.account_id}:user/${local.vault_managed_user_stem}*", + "arn:aws:iam::${var.account_id}:user/${local.vault_iam_create_user_name}", + ] + }] + }) +} + +resource "aws_iam_user_policy" "sts_route53" { + name = local.sts_route53_policy_name + user = aws_iam_user.vault_iam_create.name + + # The referenced role does not currently exist. Preserve the existing policy unchanged. + policy = jsonencode({ + Version = "2012-10-17" + Statement = [{ + Action = ["sts:AssumeRole"] + Effect = "Allow" + Resource = ["arn:aws:iam::${var.account_id}:role/${local.route53_role_name}"] + }] + }) +} diff --git a/modules/iam_auth/variables.tf b/modules/iam_auth/variables.tf new file mode 100644 index 0000000..81e780c --- /dev/null +++ b/modules/iam_auth/variables.tf @@ -0,0 +1,35 @@ +variable "region" { + description = "AWS region referenced by regional IAM policy conditions and resources." + type = string +} + +variable "account_id" { + description = "AWS account ID used to construct IAM policy ARNs." + type = string +} + +variable "name_prefix" { + description = "Prefix used for isolated copies when explicit production names are omitted." + type = string +} + +variable "names" { + description = "Optional existing production names. Omitted values are derived from name_prefix." + type = object({ + flow_logs_role = optional(string) + flow_logs_policy = optional(string) + vault_user = optional(string) + kms_vault_policy = optional(string) + vault_iam_create_user = optional(string) + vault_iam_policy = optional(string) + sts_route53_policy = optional(string) + route53_role = optional(string) + vault_managed_user_stem = optional(string) + }) + default = {} +} + +variable "vault_kms_resource_arns" { + description = "KMS key and alias ARNs used by the existing Vault IAM user policy." + type = list(string) +} diff --git a/modules/iam_auth/versions.tf b/modules/iam_auth/versions.tf new file mode 100644 index 0000000..3d89ea3 --- /dev/null +++ b/modules/iam_auth/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_version = "= 1.17.2" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 6.73" + } + } +}