Skip to content

Forward all viewer headers/cookies/query strings on uncached CloudFront routes #11697

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
nbudin merged 1 commit into from
Jun 14, 2026
Merged

Forward all viewer headers/cookies/query strings on uncached CloudFront routes #11697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 10 additions & 38 deletions terraform/modules/cloudfront_intercode/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,41 +25,13 @@ locals {
# Cache / origin-request policies
# ---------------------------------------------------------------------------

# Forward the viewer Host header so Intercode can resolve the convention.
resource "aws_cloudfront_origin_request_policy" "forward_host" {
name = "${var.name}-forward-host"
# Forward all viewer headers, cookies, and query strings to the Rails origin.
resource "aws_cloudfront_origin_request_policy" "forward_all" {
name = "${var.name}-forward-all"

cookies_config { cookie_behavior = "none" }
query_strings_config { query_string_behavior = "none" }

headers_config {
header_behavior = "whitelist"
headers {
items = ["Host"]
}
}
}

# Like forward_host, but also passes the HttpOnly refresh-token cookie so
# /oauth_session/* endpoints can read it on the Rails side.
resource "aws_cloudfront_origin_request_policy" "forward_host_with_refresh_cookie" {
name = "${var.name}-forward-host-refresh-cookie"

cookies_config {
cookie_behavior = "whitelist"
cookies {
items = ["__Host-intercode_refresh"]
}
}

query_strings_config { query_string_behavior = "none" }

headers_config {
header_behavior = "whitelist"
headers {
items = ["Host"]
}
}
cookies_config { cookie_behavior = "allViewer" }
query_strings_config { query_string_behavior = "allViewer" }
headers_config { header_behavior = "allViewer" }
}

# /og-shell: forward Host + the `path` query param so each path caches
Expand Down Expand Up @@ -205,7 +177,7 @@ resource "aws_cloudfront_distribution" "this" {
cached_methods = ["GET", "HEAD"]
compress = true
cache_policy_id = aws_cloudfront_cache_policy.no_cache.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_host_with_refresh_cookie.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_all.id
viewer_protocol_policy = "redirect-to-https"
}

Expand Down Expand Up @@ -242,7 +214,7 @@ resource "aws_cloudfront_distribution" "this" {
cached_methods = ["GET", "HEAD"]
compress = true
cache_policy_id = aws_cloudfront_cache_policy.no_cache.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_host.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_all.id
viewer_protocol_policy = "redirect-to-https"
}
}
Expand All @@ -255,7 +227,7 @@ resource "aws_cloudfront_distribution" "this" {
cached_methods = ["GET", "HEAD"]
compress = true
cache_policy_id = aws_cloudfront_cache_policy.cdn_spa_shell.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_host.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_all.id
viewer_protocol_policy = "redirect-to-https"
}

Expand All @@ -278,7 +250,7 @@ resource "aws_cloudfront_distribution" "this" {
cached_methods = ["GET", "HEAD"]
compress = true
cache_policy_id = aws_cloudfront_cache_policy.cdn_spa_shell.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_host.id
origin_request_policy_id = aws_cloudfront_origin_request_policy.forward_all.id
viewer_protocol_policy = "redirect-to-https"

lambda_function_association {
Expand Down
Loading