Skip to content

feat: enforce CloudFront OAC on S3 bucket #5

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

Open
xczimi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: enforce CloudFront OAC on S3 bucket #5

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions infrastructure/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ output "s3_bucket_name" {
value = aws_s3_bucket.main.bucket
}

output "s3_bucket_website_endpoint" {
description = "Website endpoint of the S3 bucket"
value = aws_s3_bucket_website_configuration.main.website_endpoint
}

output "cloudfront_distribution_id" {
description = "CloudFront distribution ID"
value = aws_cloudfront_distribution.main.id
Expand Down
37 changes: 16 additions & 21 deletions infrastructure/s3.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@ resource "aws_s3_bucket" "main" {
bucket = local.domain_name
}

resource "aws_s3_bucket_website_configuration" "main" {
bucket = aws_s3_bucket.main.id

index_document {
suffix = "index.html"
}

error_document {
key = "404.html"
}
}

resource "aws_s3_bucket_versioning" "main" {
bucket = aws_s3_bucket.main.id
versioning_configuration {
Expand All @@ -35,10 +23,10 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "main" {
resource "aws_s3_bucket_public_access_block" "main" {
bucket = aws_s3_bucket.main.id

block_public_acls = false
block_public_policy = false
ignore_public_acls = false
restrict_public_buckets = false
block_public_acls = true
block_public_policy = true
ignore_public_acls = true
restrict_public_buckets = true
}

resource "aws_s3_bucket_policy" "main" {
Expand All @@ -49,11 +37,18 @@ resource "aws_s3_bucket_policy" "main" {
Version = "2012-10-17"
Statement = [
{
Sid = "PublicReadGetObject"
Effect = "Allow"
Principal = "*"
Action = "s3:GetObject"
Resource = "${aws_s3_bucket.main.arn}/*"
Sid = "AllowCloudFrontServicePrincipal"
Effect = "Allow"
Principal = {
Service = "cloudfront.amazonaws.com"
}
Action = "s3:GetObject"
Resource = "${aws_s3_bucket.main.arn}/*"
Condition = {
StringEquals = {
"AWS:SourceArn" = aws_cloudfront_distribution.main.arn
}
}
}
]
})
Expand Down