Merge pull request #72 from ONS-Innovation/credential-refactor-and-key-rotation

hadiqur · web-flow · commit f81f3934d75a · 2026-03-03T13:51:45.000Z
KEH 1706 &amp; 1708: Credential Refactor and Key Rotation
diff --git a/.checkov.yml b/.checkov.yml
@@ -25,3 +25,12 @@ skip-check:
   # It is not needed here since our Lambda functions use container
   # images over uploading .zip files for layers.
   - CKV_AWS_272
+
+  # AWS-managed key encryption is sufficient and CMK not required for this service
+  - CKV_AWS_149
+
+  # IAM user required for local development
+  - CKV_AWS_273
+
+  # Key rotation is already provisioned by external module
+  - CKV2_AWS_57
diff --git a/.trivyignore b/.trivyignore
@@ -9,4 +9,11 @@ AVD-AWS-0017
 AVD-AWS-0104
 
 # Ignore wildcarded resource in IAM policy
-AVD-AWS-0057
+AVD-AWS-0057
+
+# MFA enforcement on IAM group is not applicable as group is used for
+# programmatic access via access keys, not console login
+AVD-AWS-0123
+
+# AWS-managed key encryption is sufficient and CMK not required
+AVD-AWS-0098
diff --git a/docs/technical_documentation/configuration.md b/docs/technical_documentation/configuration.md
@@ -11,7 +11,7 @@ The `config.json` file contains the following:
   "features": {
     "show_log_locally": false,
     "write_data_locally": false
-  },
+  }
 }
 ```
 
@@ -40,7 +40,7 @@ When testing locally, you might set the `config.json` file as follows:
   "features": {
     "show_log_locally": true,
     "write_data_locally": true
-  },
+  }
 }
 ```
 
@@ -53,7 +53,7 @@ When deploying to AWS, the `config.json` file should be set as follows:
   "features": {
     "show_log_locally": false,
     "write_data_locally": false
-  },
+  }
 }
 ```
 
diff --git a/kics.config b/kics.config
@@ -10,3 +10,9 @@ exclude-queries:
 
   # Sensitive Port Exposed to Private Network (This is fine due to VPC)
   - 92fe237e-074c-4262-81a4-2077acb928c1
+
+  # AWS-managed key encryption is sufficient and CMK not required for this service
+  - a2f548f2-188c-4fff-b172-e9a6acb216bd
+
+  # Prevent user group no membership false positive
+  - fc101ca7-c9dd-4198-a1eb-0fbe92e80044
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,9 +13,9 @@ github-api-toolkit = {git = "https://github.com/ONS-Innovation/github-api-packag
 requests = "^2.32.3"
 botocore = "^1.40.2"
 certifi = "^2025.8.3"
-cffi = "^1.17.1"
+cffi = ">=2.0.0"
 charset-normalizer = "^3.4.2"
-cryptography = "^45.0.5"
+cryptography = "^46.0.5"
 idna = "^3.10"
 jmespath = "^1.0.1"
 pycparser = "^2.22"
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -137,4 +137,60 @@ resource "aws_iam_role_policy_attachment" "eventbridge_policy" {
 resource "aws_cloudwatch_log_group" "loggroup" {
   name              = "/aws/lambda/${aws_lambda_function.lambda_function.function_name}"
   retention_in_days = var.log_retention_days
+}
+
+# IAM User Group
+resource "aws_iam_group" "group" {
+  name = "${var.env_name}-${var.lambda_name}-user-group"
+  path = "/"
+}
+
+resource "aws_iam_group_policy_attachment" "group_vpc_permissions_attachment" {
+  group      = aws_iam_group.group.name
+  policy_arn = aws_iam_policy.vpc_permissions.arn
+}
+
+resource "aws_iam_group_policy_attachment" "group_lambda_logging_attachment" {
+  group      = aws_iam_group.group.name
+  policy_arn = aws_iam_policy.lambda_logging.arn
+}
+
+resource "aws_iam_group_policy_attachment" "group_lambda_s3_policy_attachment" {
+  group      = aws_iam_group.group.name
+  policy_arn = aws_iam_policy.lambda_s3_policy.arn
+}
+
+resource "aws_iam_group_policy_attachment" "group_lambda_secret_manager_policy_attachment" {
+  group      = aws_iam_group.group.name
+  policy_arn = aws_iam_policy.lambda_secret_manager_policy.arn
+}
+
+resource "aws_iam_group_policy_attachment" "group_lambda_eventbridge_policy_attachment" {
+  group      = aws_iam_group.group.name
+  policy_arn = aws_iam_policy.lambda_eventbridge_policy.arn
+}
+
+# IAM User
+resource "aws_iam_user" "user" {
+  name = "${var.env_name}-${var.lambda_name}"
+  path = "/"
+}
+
+# Assign IAM User to group
+resource "aws_iam_user_group_membership" "user_group_attach" {
+  user = aws_iam_user.user.name
+
+  groups = [
+    aws_iam_group.group.name
+  ]
+}
+
+# IAM Key Rotation Module
+module "iam_key_rotation" {
+  source = "git::https://github.com/ONS-Innovation/keh-aws-iam-key-rotation.git?ref=v0.1.0"
+
+  iam_username          = aws_iam_user.user.name
+  access_key_secret_arn = aws_secretsmanager_secret.access_key.arn
+  secret_key_secret_arn = aws_secretsmanager_secret.secret_key.arn
+  rotation_in_days      = 90
 }
diff --git a/terraform/secrets.tf b/terraform/secrets.tf
@@ -0,0 +1,14 @@
+# Secrets for rotated IAM user access keys
+resource "aws_secretsmanager_secret" "access_key" {
+  name                           = "${var.env_name}-${var.lambda_name}-access-key"
+  description                    = "Access Key ID for copilot usage lambda IAM user"
+  recovery_window_in_days        = 0    // Secret will be deleted immediately
+  force_overwrite_replica_secret = true // Allow overwriting the secret in case of changes
+}
+
+resource "aws_secretsmanager_secret" "secret_key" {
+  name                           = "${var.env_name}-${var.lambda_name}-secret-key"
+  description                    = "Secret Access Key for copilot usage lambda IAM user"
+  recovery_window_in_days        = 0    // Secret will be deleted immediately
+  force_overwrite_replica_secret = true // Allow overwriting the secret in case of changes
+}
