Skip to content

Use a cloudfront function to inject the origin key #229

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

Merged
merged 7 commits into from
Aug 2, 2025
Merged

Use a cloudfront function to inject the origin key #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0424937
use a cloudfront function to invoke the origin key
devksingh4 Aug 2, 2025
c907c21
remove comment
devksingh4 Aug 2, 2025
2ba2c15
remove variable definition
devksingh4 Aug 2, 2025
6a408e1
Revert "remove variable definition"
devksingh4 Aug 2, 2025
a245fa2
whitespace
devksingh4 Aug 2, 2025
ada1914
test what happens when the origin verify key changes
devksingh4 Aug 2, 2025
13aeee4
use 16 char token
devksingh4 Aug 2, 2025
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
2 changes: 1 addition & 1 deletion terraform/envs/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ module "dynamo" {
}

resource "random_password" "origin_verify_key" {
length = 20
length = 16
special = false
keepers = {
force_recreation = formatdate("DD-MMM-YYYY", plantimestamp())
Expand Down
2 changes: 1 addition & 1 deletion terraform/envs/qa/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module "dynamo" {
}

resource "random_password" "origin_verify_key" {
length = 20
length = 16
special = false
keepers = {
force_recreation = formatdate("DD-MMM-YYYY", plantimestamp())
Expand Down
37 changes: 29 additions & 8 deletions terraform/modules/frontend/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ resource "aws_cloudfront_distribution" "app_cloudfront_distribution" {
origin_protocol_policy = "https-only"
origin_ssl_protocols = ["TLSv1", "TLSv1.1", "TLSv1.2"]
}
custom_header {
name = "X-Origin-Verify"
value = var.OriginVerifyKey
}
}
default_root_object = "index.html"
aliases = [var.CorePublicDomain]
Expand Down Expand Up @@ -140,6 +136,10 @@ resource "aws_cloudfront_distribution" "app_cloudfront_distribution" {
cache_policy_id = aws_cloudfront_cache_policy.headers_no_cookies.id
origin_request_policy_id = "b689b0a8-53d0-40ab-baf2-68738e2966ac"
compress = true
function_association {
event_type = "viewer-request"
function_arn = aws_cloudfront_function.origin_key_injection.arn
}
}
ordered_cache_behavior {
path_pattern = "/api/v1/organizations"
Expand All @@ -150,6 +150,10 @@ resource "aws_cloudfront_distribution" "app_cloudfront_distribution" {
cache_policy_id = "658327ea-f89d-4fab-a63d-7e88639e58f6"
origin_request_policy_id = "b689b0a8-53d0-40ab-baf2-68738e2966ac"
compress = true
function_association {
event_type = "viewer-request"
function_arn = aws_cloudfront_function.origin_key_injection.arn
}
}
ordered_cache_behavior {
path_pattern = "/api/*"
Expand All @@ -160,6 +164,10 @@ resource "aws_cloudfront_distribution" "app_cloudfront_distribution" {
cache_policy_id = aws_cloudfront_cache_policy.no_cache.id
origin_request_policy_id = "b689b0a8-53d0-40ab-baf2-68738e2966ac"
compress = true
function_association {
event_type = "viewer-request"
function_arn = aws_cloudfront_function.origin_key_injection.arn
}
}
price_class = "PriceClass_100"
}
Expand All @@ -176,10 +184,6 @@ resource "aws_cloudfront_distribution" "ical_cloudfront_distribution" {
origin_protocol_policy = "https-only"
origin_ssl_protocols = ["TLSv1", "TLSv1.1", "TLSv1.2"]
}
custom_header {
name = "X-Origin-Verify"
value = var.OriginVerifyKey
}
}
aliases = [var.IcalPublicDomain]
enabled = true
Expand All @@ -192,6 +196,10 @@ resource "aws_cloudfront_distribution" "ical_cloudfront_distribution" {
cached_methods = ["GET", "HEAD"]
cache_policy_id = aws_cloudfront_cache_policy.headers_no_cookies.id
origin_request_policy_id = "b689b0a8-53d0-40ab-baf2-68738e2966ac"
function_association {
event_type = "viewer-request"
function_arn = aws_cloudfront_function.origin_key_injection.arn
}
}
viewer_certificate {
acm_certificate_arn = var.CoreCertificateArn
Expand All @@ -206,6 +214,19 @@ resource "aws_cloudfront_distribution" "ical_cloudfront_distribution" {
price_class = "PriceClass_100"
}

resource "aws_cloudfront_function" "origin_key_injection" {
name = "${var.ProjectId}-origin-verification-injection"
comment = "Injects origin verification key into requests"
runtime = "cloudfront-js-2.0"
code = <<EOT
function handler(event) {
var request = event.request;
request.headers['x-origin-verify'] = { value: "${var.OriginVerifyKey}" };
return request;
}
EOT
}

resource "aws_cloudfront_function" "core_frontend_redirect" {
name = "${var.ProjectId}-spa-rewrite"
comment = "Handles SPA routing by rewriting URIs to index.html"
Expand Down
Loading