Skip to content
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

Unit test for using escape hatch to scope down Key Policy #31246

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Unit test for using escape hatch to scope down Key Policy #31246

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d1f326
unit test using escape hatch to scope down OAC Key policy permission
samson-keung Aug 28, 2024
06b471a
liniting fix
samson-keung Aug 28, 2024
e146ecf
revert accidentally deleted doc string
samson-keung Aug 29, 2024
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
84 changes: 81 additions & 3 deletions packages/aws-cdk-lib/aws-cloudfront-origins/test/s3-bucket-origin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,83 @@ describe('S3BucketOrigin', () => {
'a wildcard is used to match all Distribution IDs in Key policy condition.\n' +
'To further scope down the policy for best security practices, see the "Using OAC for a SSE-KMS encrypted S3 origin" section in the module README. [ack: @aws-cdk/aws-cloudfront-origins:wildcardKeyPolicyForOac]');
});

it('should allow users to use escape hatch to scope down KMS key policy to specific distribution id', () => {
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) },
});

// assuming user now know the Distribution ID and want to use escape hatch to scope down the key policy
const distributionId = 'SomeDistributionId';
const finalKeyPolicy = {
Statement: [
{
Action: 'kms:*',
Effect: 'Allow',
Principal: {
AWS: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':iam::',
{
Ref: 'AWS::AccountId',
},
':root',
],
],
},
},
Resource: '*',
},
{
Action: 'kms:Decrypt',
Condition: {
StringLike: {
'AWS:SourceArn': {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':cloudfront::',
{
Ref: 'AWS::AccountId',
},
`:distribution/${distributionId}`,
],
],
},
},
},
Effect: 'Allow',
Principal: {
Service: 'cloudfront.amazonaws.com',
},
Resource: '*',
},
],
Version: '2012-10-17',
};
(kmsKey.node.defaultChild as kms.CfnKey).keyPolicy = finalKeyPolicy;

Template.fromStack(stack).hasResourceProperties('AWS::KMS::Key', {
KeyPolicy: finalKeyPolicy,
});
});
});

describe('when attaching to a multiple distribution', () => {
Expand Down Expand Up @@ -686,14 +763,15 @@ describe('S3BucketOrigin', () => {
});
});
});

describe('when specifying READ, WRITE, and DELETE origin access levels', () => {
it('should add the correct permissions to bucket policy', () => {
const stack = new Stack();
const bucket = new s3.Bucket(stack, 'MyBucket');
const origin = origins.S3BucketOrigin.withOriginAccessControl(bucket, {
originAccessLevels: [cloudfront.AccessLevel.READ, cloudfront.AccessLevel.WRITE, cloudfront.AccessLevel.DELETE],
});
const distribution = new cloudfront.Distribution(stack, 'MyDistribution', {
new cloudfront.Distribution(stack, 'MyDistribution', {
defaultBehavior: { origin },
});
Template.fromStack(stack).hasResourceProperties('AWS::S3::BucketPolicy', {
Expand Down Expand Up @@ -750,8 +828,8 @@ describe('S3BucketOrigin', () => {
],
},
});
})
})
});
});
});

describe('withOriginAccessIdentity', () => {
Expand Down
Loading