generated from NHSDigital/nhs-notify-repository-template
-
Notifications
You must be signed in to change notification settings - Fork 3
Feature/cmm 13767 store virus scanned pdfs #192
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.
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
nhsd-angel-pastor
wants to merge
2
commits into
main
Choose a base branch
from
feature/CMM-13767_store_virus_scanned_pdfs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
infrastructure/terraform/components/dl/cloudwatch_event_rule_guardduty_scan_result.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| resource "aws_cloudwatch_event_rule" "guardduty_scan_result" { | ||
| name = "${local.csi}-guardduty_scan_result" | ||
| description = "guardduty Scan Result event rule" | ||
| event_bus_name = var.default_cloudwatch_event_bus_name | ||
| event_pattern = jsonencode({ | ||
| "source": ["aws.guardduty"] | ||
| "detail" : { | ||
| "resourceType": ["S3_OBJECT"], | ||
| "s3ObjectDetails": { | ||
| "bucketName": [ local.unscanned_files_bucket ], | ||
| "objectKey": [{ "prefix": "${local.csi}/" }] | ||
| } | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| resource "aws_cloudwatch_event_target" "guardduty_scan_result_move_scanned_files" { | ||
| rule = aws_cloudwatch_event_rule.guardduty_scan_result.name | ||
| arn = module.sqs_move_scanned_files.sqs_queue_arn | ||
| event_bus_name = var.default_cloudwatch_event_bus_name | ||
| } |
10 changes: 10 additions & 0 deletions
10
...tructure/terraform/components/dl/lambda_event_source_mapping_move_scanned_files_lambda.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| resource "aws_lambda_event_source_mapping" "move_scanned_files_lambda" { | ||
| event_source_arn = module.sqs_move_scanned_files.sqs_queue_arn | ||
| function_name = module.move_scanned_files.function_arn | ||
| batch_size = var.queue_batch_size | ||
| maximum_batching_window_in_seconds = var.queue_batch_window_seconds | ||
|
|
||
| function_response_types = [ | ||
| "ReportBatchItemFailures" | ||
| ] | ||
| } |
150 changes: 150 additions & 0 deletions
150
infrastructure/terraform/components/dl/module_lambda_move_scanned_files.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| module "move_scanned_files" { | ||
| source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip" | ||
|
|
||
| function_name = "move-scanned-files" | ||
| description = "A function that handles GuardDuty Malware Protection Object Scan Result and depending on the result moves objects from the unscanned bucket to the file safe or quarantined bucket. " | ||
|
|
||
| aws_account_id = var.aws_account_id | ||
| component = local.component | ||
| environment = var.environment | ||
| project = var.project | ||
| region = var.region | ||
| group = var.group | ||
|
|
||
| log_retention_in_days = var.log_retention_in_days | ||
| kms_key_arn = module.kms.key_arn | ||
|
|
||
| iam_policy_document = { | ||
| body = data.aws_iam_policy_document.move_scanned_files.json | ||
| } | ||
|
|
||
| function_s3_bucket = local.acct.s3_buckets["lambda_function_artefacts"]["id"] | ||
| function_code_base_path = local.aws_lambda_functions_dir_path | ||
| function_code_dir = "move-scanned-files-lambda/dist" | ||
| function_include_common = true | ||
| handler_function_name = "handler" | ||
| runtime = "nodejs22.x" | ||
| memory = 128 | ||
| timeout = 60 | ||
| log_level = var.log_level | ||
|
|
||
| force_lambda_code_deploy = var.force_lambda_code_deploy | ||
| enable_lambda_insights = false | ||
|
|
||
| log_destination_arn = local.log_destination_arn | ||
| log_subscription_role_arn = local.acct.log_subscription_role_arn | ||
|
|
||
| lambda_env_vars = { | ||
| "EVENT_PUBLISHER_EVENT_BUS_ARN" = aws_cloudwatch_event_bus.main.arn | ||
| "EVENT_PUBLISHER_DLQ_URL" = module.sqs_event_publisher_errors.sqs_queue_url | ||
| "ENVIRONMENT" = var.environment | ||
| "KEY_PREFIX_UNSCANNED_FILES" = local.csi | ||
| "UNSCANNED_FILE_S3_BUCKET_NAME" = local.unscanned_files_bucket | ||
| "SAFE_FILE_S3_BUCKET_NAME" = module.s3bucket_file_safe.bucket | ||
| "QUARANTINE_FILE_S3_BUCKET_NAME" = module.s3bucket_file_quarantine.bucket | ||
| } | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "move_scanned_files" { | ||
| statement { | ||
| sid = "KMSPermissions" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "kms:Encrypt", | ||
| "kms:Decrypt", | ||
| "kms:GenerateDataKey", | ||
| ] | ||
|
|
||
| resources = [ | ||
| module.kms.key_arn, | ||
| ] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "SQSPermissionsFileScannerMoveScannedFiles" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "sqs:ReceiveMessage", | ||
| "sqs:DeleteMessage", | ||
| "sqs:GetQueueAttributes", | ||
| "sqs:GetQueueUrl", | ||
| ] | ||
|
|
||
| resources = [ | ||
| module.sqs_move_scanned_files.sqs_queue_arn, | ||
| ] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "PutEvents" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "events:PutEvents", | ||
| ] | ||
|
|
||
| resources = [ | ||
| aws_cloudwatch_event_bus.main.arn, | ||
| ] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "SQSPermissionsDLQ" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "sqs:SendMessage", | ||
| "sqs:SendMessageBatch", | ||
| ] | ||
|
|
||
| resources = [ | ||
| module.sqs_event_publisher_errors.sqs_queue_arn, | ||
| ] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "PermissionsToUnscannedBucket" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3:GetObject", | ||
| "s3:GetObjectTagging", | ||
| "s3:DeleteObject", | ||
| ] | ||
|
|
||
| resources = [ | ||
| "arn:aws:s3:::${local.unscanned_files_bucket}/*", | ||
| ] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "PermissionsToSafeFileBucket" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3:PutObject", | ||
| "s3:PutObjectTagging", | ||
| ] | ||
|
|
||
| resources = [ | ||
| "${module.s3bucket_file_safe.arn}/*" | ||
| ] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "PermissionsToQuarantineFileBucket" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3:PutObject", | ||
| "s3:PutObjectTagging", | ||
| ] | ||
|
|
||
| resources = [ | ||
| "${module.s3bucket_file_quarantine.arn}/*" | ||
| ] | ||
| } | ||
|
|
||
| } |
85 changes: 85 additions & 0 deletions
85
infrastructure/terraform/components/dl/module_s3bucket_file_quarantine.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| module "s3bucket_file_quarantine" { | ||
| source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-s3bucket.zip" | ||
|
|
||
| name = "file-quarantine" | ||
|
|
||
| aws_account_id = var.aws_account_id | ||
| region = var.region | ||
| project = var.project | ||
| environment = var.environment | ||
| component = local.component | ||
|
|
||
| kms_key_arn = module.kms.key_arn | ||
|
|
||
| policy_documents = [data.aws_iam_policy_document.s3bucket_file_quarantine.json] | ||
|
|
||
| force_destroy = var.force_destroy | ||
|
|
||
| lifecycle_rules = [ | ||
| { | ||
| enabled = true | ||
|
|
||
| expiration = { | ||
| days = "90" | ||
| } | ||
|
|
||
| noncurrent_version_transition = [ | ||
| { | ||
| noncurrent_days = "30" | ||
| storage_class = "STANDARD_IA" | ||
| } | ||
| ] | ||
|
|
||
| noncurrent_version_expiration = { | ||
| noncurrent_days = "90" | ||
| } | ||
|
|
||
| abort_incomplete_multipart_upload = { | ||
| days = "1" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "s3bucket_file_quarantine" { | ||
| statement { | ||
| sid = "AllowManagedAccountsToList" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3:ListBucket", | ||
| ] | ||
|
|
||
| resources = [ | ||
| module.s3bucket_file_quarantine.arn, | ||
| ] | ||
|
|
||
| principals { | ||
| type = "AWS" | ||
| identifiers = [ | ||
| "arn:aws:iam::${var.aws_account_id}:root" | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| statement { | ||
| sid = "AllowManagedAccountsToGetPut" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3:GetObject", | ||
| "s3:PutObject", | ||
| ] | ||
|
|
||
| resources = [ | ||
| "${module.s3bucket_file_quarantine.arn}/*", | ||
| ] | ||
|
|
||
| principals { | ||
| type = "AWS" | ||
| identifiers = [ | ||
| "arn:aws:iam::${var.aws_account_id}:root" | ||
| ] | ||
| } | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
infrastructure/terraform/components/dl/module_sqs_move_scanned_files.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| module "sqs_move_scanned_files" { | ||
| source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip" | ||
|
|
||
| aws_account_id = var.aws_account_id | ||
| component = local.component | ||
| environment = var.environment | ||
| project = var.project | ||
| region = var.region | ||
| name = "move-scanned-files" | ||
|
|
||
| sqs_kms_key_arn = module.kms.key_arn | ||
|
|
||
| visibility_timeout_seconds = 60 | ||
|
|
||
| create_dlq = true | ||
|
|
||
| sqs_policy_overload = data.aws_iam_policy_document.sqs_move_scanned_files.json | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "sqs_move_scanned_files" { | ||
| statement { | ||
| sid = "AllowEventBridgeToSendMessage" | ||
| effect = "Allow" | ||
|
|
||
| principals { | ||
| type = "Service" | ||
| identifiers = ["events.amazonaws.com"] | ||
| } | ||
|
|
||
| actions = [ | ||
| "sqs:SendMessage" | ||
| ] | ||
|
|
||
| resources = [ | ||
| "arn:aws:sqs:${var.region}:${var.aws_account_id}:${local.csi}-move-scanned-files-queue" | ||
| ] | ||
|
|
||
| condition { | ||
| test = "ArnLike" | ||
| variable = "aws:SourceArn" | ||
| values = [ "arn:aws:events:${var.region}:${var.aws_account_id}:event-bus/${var.default_cloudwatch_event_bus_name}" ] | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { baseJestConfig } from '../../jest.config.base'; | ||
|
|
||
| const config = baseJestConfig; | ||
|
|
||
| export default config; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "dependencies": { | ||
| "aws-lambda": "^1.0.7", | ||
| "axios": "^1.13.2", | ||
| "digital-letters-events": "^0.0.1", | ||
| "utils": "^0.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@tsconfig/node22": "^22.0.2", | ||
| "@types/aws-lambda": "^8.10.155", | ||
| "@types/jest": "^29.5.14", | ||
| "jest": "^29.7.0", | ||
| "jest-mock-extended": "^3.0.7", | ||
| "typescript": "^5.9.3" | ||
| }, | ||
| "name": "nhs-notify-digital-move-scanned-files-lambda", | ||
| "private": true, | ||
| "scripts": { | ||
| "lambda-build": "rm -rf dist && npx esbuild --bundle --minify --sourcemap --target=es2020 --platform=node --loader:.node=file --entry-names=[name] --outdir=dist src/index.ts", | ||
| "lint": "eslint .", | ||
| "lint:fix": "eslint . --fix", | ||
| "test:unit": "jest", | ||
| "typecheck": "tsc --noEmit" | ||
| }, | ||
| "version": "0.0.1" | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the events are coming from the "default" bus, which I referred as "default", so I don't have an ARN. I'll check with platform to see if there is something else we can put in here.