Use wildcard in KMS key policy instead of referencing Distribution to avoid circular dependency #31227
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -18,7 +18,8 @@ export interface S3StaticWebsiteOriginProps extends HttpOriginProps { | |
| export class S3StaticWebsiteOrigin extends HttpOrigin { | ||
| constructor(props: S3StaticWebsiteOriginProps) { | ||
| super(props.bucket.bucketWebsiteDomainName, { | ||
| // S3 only supports HTTP for website buckets. See https://docs.aws.amazon.com/AmazonS3/latest/userguide/WebsiteEndpoints.html | ||
| protocolPolicy: cloudfront.OriginProtocolPolicy.HTTP_ONLY, | ||
| ...props, | ||
| }); | ||
| } | ||
|
|
||
This file contains 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 |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| import { Annotations, Template } from '../../assertions'; | ||
| import * as cloudfront from '../../aws-cloudfront/index'; | ||
| import * as origins from '../../aws-cloudfront-origins'; | ||
| import * as kms from '../../aws-kms'; | ||
| import * as s3 from '../../aws-s3/index'; | ||
| import { App, Duration, Fn, Stack } from '../../core'; | ||
|
|
||
| describe('S3BucketOrigin', () => { | ||
| describe('withOriginAccessControl', () => { | ||
|
|
@@ -165,6 +166,224 @@ describe('S3BucketOrigin', () => { | |
| }); | ||
| }); | ||
|
|
||
| describe('when using bucket with KMS Customer Managed key', () => { | ||
| it('should match expected template resource and warn user about wildcard key policy', () => { | ||
| const stack = new Stack(); | ||
| const kmsKey = new kms.Key(stack, 'myKey'); | ||
| const bucket = new s3.Bucket(stack, 'myEncryptedBucket', { | ||
| encryption: s3.BucketEncryption.KMS, | ||
| encryptionKey: kmsKey, | ||
| objectOwnership: s3.ObjectOwnership.BUCKET_OWNER_ENFORCED, | ||
| }); | ||
| new cloudfront.Distribution(stack, 'MyDistributionA', { | ||
| defaultBehavior: { origin: origins.S3BucketOrigin.withOriginAccessControl(bucket) }, | ||
| }); | ||
| const template = Template.fromStack(stack); | ||
|
|
||
| expect(template.toJSON().Resources).toEqual({ | ||
| myKey441A1E73: { | ||
| Type: 'AWS::KMS::Key', | ||
| Properties: { | ||
| KeyPolicy: { | ||
| Statement: [ | ||
| { | ||
| Action: 'kms:*', | ||
| Effect: 'Allow', | ||
| Principal: { | ||
| AWS: { | ||
| 'Fn::Join': [ | ||
| '', | ||
| [ | ||
| 'arn:', | ||
| { | ||
| Ref: 'AWS::Partition', | ||
| }, | ||
| ':iam::', | ||
| { | ||
| Ref: 'AWS::AccountId', | ||
| }, | ||
| ':root', | ||
| ], | ||
| ], | ||
| }, | ||
| }, | ||
| Resource: '*', | ||
| }, | ||
| { | ||
| Action: 'kms:Decrypt', | ||
| Condition: { | ||
| ArnLike: { | ||
| 'AWS:SourceArn': { | ||
| 'Fn::Join': [ | ||
| '', | ||
| [ | ||
| 'arn:', | ||
| { | ||
| Ref: 'AWS::Partition', | ||
| }, | ||
| ':cloudfront::', | ||
| { | ||
| Ref: 'AWS::AccountId', | ||
| }, | ||
| ':distribution/*', | ||
| ], | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| Effect: 'Allow', | ||
| Principal: { | ||
| Service: 'cloudfront.amazonaws.com', | ||
| }, | ||
| Resource: '*', | ||
| }, | ||
| ], | ||
| Version: '2012-10-17', | ||
| }, | ||
| }, | ||
| UpdateReplacePolicy: 'Retain', | ||
| DeletionPolicy: 'Retain', | ||
| }, | ||
| myEncryptedBucket939A51C0: { | ||
| Type: 'AWS::S3::Bucket', | ||
| Properties: { | ||
| BucketEncryption: { | ||
| ServerSideEncryptionConfiguration: [ | ||
| { | ||
| ServerSideEncryptionByDefault: { | ||
| KMSMasterKeyID: { | ||
| 'Fn::GetAtt': [ | ||
| 'myKey441A1E73', | ||
| 'Arn', | ||
| ], | ||
| }, | ||
| SSEAlgorithm: 'aws:kms', | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| OwnershipControls: { | ||
| Rules: [ | ||
| { | ||
| ObjectOwnership: 'BucketOwnerEnforced', | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| UpdateReplacePolicy: 'Retain', | ||
| DeletionPolicy: 'Retain', | ||
| }, | ||
| myEncryptedBucketPolicyF516140B: { | ||
| Type: 'AWS::S3::BucketPolicy', | ||
| Properties: { | ||
| Bucket: { | ||
| Ref: 'myEncryptedBucket939A51C0', | ||
| }, | ||
| PolicyDocument: { | ||
| Statement: [ | ||
| { | ||
| Action: 's3:GetObject', | ||
| Condition: { | ||
| StringEquals: { | ||
| 'AWS:SourceArn': { | ||
| 'Fn::Join': [ | ||
| '', | ||
| [ | ||
| 'arn:', | ||
| { | ||
| Ref: 'AWS::Partition', | ||
| }, | ||
| ':cloudfront::', | ||
| { | ||
| Ref: 'AWS::AccountId', | ||
| }, | ||
| ':distribution/', | ||
| { | ||
| Ref: 'MyDistributionA2150CE0F', | ||
| }, | ||
| ], | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| Effect: 'Allow', | ||
| Principal: { | ||
| Service: 'cloudfront.amazonaws.com', | ||
| }, | ||
| Resource: { | ||
| 'Fn::Join': [ | ||
| '', | ||
| [ | ||
| { | ||
| 'Fn::GetAtt': [ | ||
| 'myEncryptedBucket939A51C0', | ||
| 'Arn', | ||
| ], | ||
| }, | ||
| '/*', | ||
| ], | ||
| ], | ||
| }, | ||
| }, | ||
| ], | ||
| Version: '2012-10-17', | ||
| }, | ||
| }, | ||
| }, | ||
| MyDistributionAOrigin1S3OriginAccessControlE2649D73: { | ||
| Type: 'AWS::CloudFront::OriginAccessControl', | ||
| Properties: { | ||
| OriginAccessControlConfig: { | ||
| Name: 'MyDistributionAOrigin1S3OriginAccessControl2859DD54', | ||
| OriginAccessControlOriginType: 's3', | ||
| SigningBehavior: 'always', | ||
| SigningProtocol: 'sigv4', | ||
| }, | ||
| }, | ||
| }, | ||
| MyDistributionA2150CE0F: { | ||
| Type: 'AWS::CloudFront::Distribution', | ||
| Properties: { | ||
| DistributionConfig: { | ||
| DefaultCacheBehavior: { | ||
| CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6', | ||
| Compress: true, | ||
| TargetOriginId: 'MyDistributionAOrigin11BE8FF8C', | ||
| ViewerProtocolPolicy: 'allow-all', | ||
| }, | ||
| Enabled: true, | ||
| HttpVersion: 'http2', | ||
| IPV6Enabled: true, | ||
| Origins: [ | ||
| { | ||
| DomainName: { | ||
| 'Fn::GetAtt': [ | ||
| 'myEncryptedBucket939A51C0', | ||
| 'RegionalDomainName', | ||
| ], | ||
| }, | ||
| Id: 'MyDistributionAOrigin11BE8FF8C', | ||
| OriginAccessControlId: { | ||
| 'Fn::GetAtt': [ | ||
| 'MyDistributionAOrigin1S3OriginAccessControlE2649D73', | ||
| 'Id', | ||
| ], | ||
| }, | ||
| S3OriginConfig: { | ||
| OriginAccessIdentity: '', | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| Annotations.fromStack(stack).hasWarning('/Default', | ||
| 'Using wildcard to match all Distribution IDs in Key policy condition.\n' + | ||
| 'To further scope down the policy, see the "Using OAC for a SSE-KMS encrypted S3 origin" section in the module README. [ack: @aws-cdk/aws-cloudfront-origins:wildcardKeyPolicy]'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('when attaching to a multiple distribution', () => { | ||
| let stack: Stack; | ||
| let bucket: s3.Bucket; | ||
|
|
||
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.
Removed this because turns out
bucket.bucketNameis always unresolved as it returns CFN reference to the bucket (i.e.!Ref bucket). It is set here.