Use s3 to verify bucket ownership during get resource state#586
Merged
Conversation
chrisqm-dev
reviewed
May 20, 2026
Replace the GetBucketEncryption + HeadBucket pair with a single HeadBucket call that passes ExpectedBucketOwner=<caller account>. This is the only S3 API behavior that distinguishes 'I own this bucket' from 'this bucket is publicly readable but owned by someone else' -- HeadBucket alone returns 200 for public cross-account buckets like commoncrawl, which would let CCAPI's S3 read handler return their properties. Translate 403 (cross-account or wrong owner) and 404 (does not exist) into ResourceNotFoundException so callers handle them through the same path as any other CCAPI not-found result. Wrong-region still returns a distinct error string so the user can correct the region. Other errors (network, credentials, throttling, 5xx) propagate unchanged instead of being mislabeled as ownership failures. Add STSClient support to AwsClient so S3Service can resolve the caller account ID via sts:GetCallerIdentity. The two S3 permissions used (s3:ListBucket via HeadBucket) are already part of the AWS::S3::Bucket read handler permission set, so this adds no new permission burden.
chrisqm-dev
approved these changes
May 21, 2026
vzhan00
approved these changes
May 21, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.