@aws-solutions-constructs/aws-cloudfront-s3 2.62.0 → 2.64.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +20 -7
- package/lib/index.js +2 -2
- package/package.json +8 -8
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js +4 -4
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.e97825c838d70ceb13ba2f6223a7d94ed35687b70bfb224a0b9128e698e3f28e/index.js +129 -0
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.assets.json +5 -5
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.template.json +16 -1
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/tree.json +70 -70
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js +4 -4
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.assets.json +2 -2
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.template.json +15 -0
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/tree.json +42 -42
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js +3 -3
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.e97825c838d70ceb13ba2f6223a7d94ed35687b70bfb224a0b9128e698e3f28e/index.js +129 -0
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3-cmk-provided-as-bucket-prop.assets.json +5 -5
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3-cmk-provided-as-bucket-prop.template.json +16 -1
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/tree.json +68 -68
- package/test/integ.cfts3-custom-headers.js +3 -3
- package/test/integ.cfts3-custom-headers.js.snapshot/cfts3-custom-headers.assets.json +2 -2
- package/test/integ.cfts3-custom-headers.js.snapshot/cfts3-custom-headers.template.json +15 -0
- package/test/integ.cfts3-custom-headers.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-custom-headers.js.snapshot/tree.json +46 -46
- package/test/integ.cfts3-custom-originPath.js +3 -3
- package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3-custom-originPath.assets.json +2 -2
- package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3-custom-originPath.template.json +15 -0
- package/test/integ.cfts3-custom-originPath.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-custom-originPath.js.snapshot/tree.json +44 -44
- package/test/integ.cfts3-customLoggingBuckets.js +3 -3
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3-customLoggingBuckets.assets.json +2 -2
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3-customLoggingBuckets.template.json +15 -0
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-customLoggingBuckets.js.snapshot/tree.json +44 -44
- package/test/integ.cfts3-existing-bucket.js +2 -2
- package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3-existing-bucket.assets.json +2 -2
- package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3-existing-bucket.template.json +15 -0
- package/test/integ.cfts3-existing-bucket.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-existing-bucket.js.snapshot/tree.json +48 -48
- package/test/integ.cfts3-no-arguments.js +2 -2
- package/test/integ.cfts3-no-arguments.js.snapshot/cfts3-no-arguments.assets.json +2 -2
- package/test/integ.cfts3-no-arguments.js.snapshot/cfts3-no-arguments.template.json +15 -0
- package/test/integ.cfts3-no-arguments.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-no-arguments.js.snapshot/tree.json +44 -44
- package/test/integ.cfts3-no-logging.js +2 -2
- package/test/integ.cfts3-no-logging.js.snapshot/cfts3-no-logging.assets.json +2 -2
- package/test/integ.cfts3-no-logging.js.snapshot/cfts3-no-logging.template.json +15 -0
- package/test/integ.cfts3-no-logging.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-no-logging.js.snapshot/tree.json +26 -26
- package/test/integ.cfts3-no-security-headers.js +3 -3
- package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3-no-security-headers.assets.json +2 -2
- package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3-no-security-headers.template.json +15 -0
- package/test/integ.cfts3-no-security-headers.js.snapshot/manifest.json +1 -1
- package/test/integ.cfts3-no-security-headers.js.snapshot/tree.json +42 -42
- package/test/test.cloudfront-s3.test.js +3 -3
- package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.4a4b024f310aca2784b69bcb790e9ccaef785e9ad5d1b73624144f88c4465b4f/index.js +0 -127
- package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.4a4b024f310aca2784b69bcb790e9ccaef785e9ad5d1b73624144f88c4465b4f/index.js +0 -127
- /package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/{asset.4a4b024f310aca2784b69bcb790e9ccaef785e9ad5d1b73624144f88c4465b4f → asset.e97825c838d70ceb13ba2f6223a7d94ed35687b70bfb224a0b9128e698e3f28e}/index.d.ts +0 -0
- /package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/{asset.4a4b024f310aca2784b69bcb790e9ccaef785e9ad5d1b73624144f88c4465b4f → asset.e97825c838d70ceb13ba2f6223a7d94ed35687b70bfb224a0b9128e698e3f28e}/index.d.ts +0 -0
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/**
|
|
3
|
-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
|
|
6
|
-
* with the License. A copy of the License is located at
|
|
7
|
-
*
|
|
8
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
-
*
|
|
10
|
-
* or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
|
|
11
|
-
* OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
|
|
12
|
-
* and limitations under the License.
|
|
13
|
-
*/
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.updateKeyPolicy = exports.handler = void 0;
|
|
16
|
-
const client_kms_1 = require("@aws-sdk/client-kms");
|
|
17
|
-
const kmsClient = new client_kms_1.KMSClient();
|
|
18
|
-
exports.handler = async (event, context) => {
|
|
19
|
-
let status = 'SUCCESS';
|
|
20
|
-
let responseData = {};
|
|
21
|
-
if (event.RequestType === 'Create' || event.RequestType === 'Update') {
|
|
22
|
-
try {
|
|
23
|
-
const kmsKeyId = event.ResourceProperties.KmsKeyId;
|
|
24
|
-
const cloudFrontDistributionId = event.ResourceProperties.CloudFrontDistributionId;
|
|
25
|
-
const accountId = event.ResourceProperties.AccountId;
|
|
26
|
-
const region = process.env.AWS_REGION;
|
|
27
|
-
const describeKeyCommandResponse = await kmsClient.send(new client_kms_1.DescribeKeyCommand({
|
|
28
|
-
KeyId: kmsKeyId
|
|
29
|
-
}));
|
|
30
|
-
if (describeKeyCommandResponse.KeyMetadata?.KeyManager === client_kms_1.KeyManagerType.AWS) {
|
|
31
|
-
return {
|
|
32
|
-
Status: 'SUCCESS',
|
|
33
|
-
Reason: 'An AWS managed key was provided, no action needed from the custom resource, exiting now.',
|
|
34
|
-
PhysicalResourceId: event.PhysicalResourceId ?? context.logStreamName,
|
|
35
|
-
StackId: event.StackId,
|
|
36
|
-
RequestId: event.RequestId,
|
|
37
|
-
LogicalResourceId: event.LogicalResourceId,
|
|
38
|
-
Data: 'An AWS managed key was provided, no action needed from the custom resource, exiting now.',
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
// The PolicyName is specified as "default" below because that is the only valid name as
|
|
42
|
-
// written in the documentation for @aws-sdk/client-kms.GetKeyPolicyCommandInput:
|
|
43
|
-
// https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-kms/Interface/GetKeyPolicyCommandInput/
|
|
44
|
-
const getKeyPolicyCommandResponse = await kmsClient.send(new client_kms_1.GetKeyPolicyCommand({
|
|
45
|
-
KeyId: kmsKeyId,
|
|
46
|
-
PolicyName: 'default'
|
|
47
|
-
}));
|
|
48
|
-
if (!getKeyPolicyCommandResponse.Policy) {
|
|
49
|
-
return {
|
|
50
|
-
Status: 'FAILED',
|
|
51
|
-
Reason: 'An error occurred while retrieving the key policy.',
|
|
52
|
-
PhysicalResourceId: event.PhysicalResourceId ?? context.logStreamName,
|
|
53
|
-
StackId: event.StackId,
|
|
54
|
-
RequestId: event.RequestId,
|
|
55
|
-
LogicalResourceId: event.LogicalResourceId,
|
|
56
|
-
Data: 'An error occurred while retrieving the key policy.',
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
// Define the updated key policy to allow CloudFront access
|
|
60
|
-
const keyPolicy = JSON.parse(getKeyPolicyCommandResponse?.Policy);
|
|
61
|
-
const keyPolicyStatement = {
|
|
62
|
-
Sid: 'Grant-CloudFront-Distribution-Key-Usage',
|
|
63
|
-
Effect: 'Allow',
|
|
64
|
-
Principal: {
|
|
65
|
-
Service: 'cloudfront.amazonaws.com',
|
|
66
|
-
},
|
|
67
|
-
Action: [
|
|
68
|
-
'kms:Decrypt',
|
|
69
|
-
'kms:Encrypt',
|
|
70
|
-
'kms:GenerateDataKey*',
|
|
71
|
-
'kms:ReEncrypt*'
|
|
72
|
-
],
|
|
73
|
-
Resource: `arn:aws:kms:${region}:${accountId}:key/${kmsKeyId}`,
|
|
74
|
-
Condition: {
|
|
75
|
-
StringEquals: {
|
|
76
|
-
'AWS:SourceArn': `arn:aws:cloudfront::${accountId}:distribution/${cloudFrontDistributionId}`
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
};
|
|
80
|
-
const updatedKeyPolicy = exports.updateKeyPolicy(keyPolicy, keyPolicyStatement);
|
|
81
|
-
await kmsClient.send(new client_kms_1.PutKeyPolicyCommand({
|
|
82
|
-
KeyId: kmsKeyId,
|
|
83
|
-
Policy: JSON.stringify(updatedKeyPolicy),
|
|
84
|
-
PolicyName: 'default'
|
|
85
|
-
}));
|
|
86
|
-
}
|
|
87
|
-
catch (err) {
|
|
88
|
-
status = 'FAILED';
|
|
89
|
-
responseData = {
|
|
90
|
-
Error: JSON.stringify(err)
|
|
91
|
-
};
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
return {
|
|
95
|
-
Status: status,
|
|
96
|
-
Reason: JSON.stringify(responseData),
|
|
97
|
-
PhysicalResourceId: event.PhysicalResourceId ?? context.logStreamName,
|
|
98
|
-
StackId: event.StackId,
|
|
99
|
-
RequestId: event.RequestId,
|
|
100
|
-
LogicalResourceId: event.LogicalResourceId,
|
|
101
|
-
Data: responseData,
|
|
102
|
-
};
|
|
103
|
-
};
|
|
104
|
-
/**
|
|
105
|
-
* Updates a provided key policy with a provided key policy statement. First checks whether the provided key policy statement
|
|
106
|
-
* already exists. If an existing key policy is found with a matching sid, the provided key policy will overwrite the existing
|
|
107
|
-
* key policy. If no matching key policy is found, the provided key policy will be appended onto the array of policy statements.
|
|
108
|
-
* @param keyPolicy - the JSON.parse'd result of the otherwise stringified key policy.
|
|
109
|
-
* @param keyPolicyStatement - the key policy statement to be added to the key policy.
|
|
110
|
-
* @returns keyPolicy - the updated key policy.
|
|
111
|
-
*/
|
|
112
|
-
exports.updateKeyPolicy = (keyPolicy, keyPolicyStatement) => {
|
|
113
|
-
// Check to see if a duplicate key policy exists by matching on the sid. This is to prevent duplicate key policies
|
|
114
|
-
// from being added/updated in response to a stack being updated one or more times after initial creation.
|
|
115
|
-
const existingKeyPolicyIndex = keyPolicy.Statement.findIndex((statement) => statement.Sid === keyPolicyStatement.Sid);
|
|
116
|
-
// If a match is found, overwrite the key policy statement...
|
|
117
|
-
// Otherwise, push the new key policy to the array of statements
|
|
118
|
-
if (existingKeyPolicyIndex > -1) {
|
|
119
|
-
keyPolicy.Statement[existingKeyPolicyIndex] = keyPolicyStatement;
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
keyPolicy.Statement.push(keyPolicyStatement);
|
|
123
|
-
}
|
|
124
|
-
// Return the result
|
|
125
|
-
return keyPolicy;
|
|
126
|
-
};
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport { KMSClient, GetKeyPolicyCommand, DescribeKeyCommand, PutKeyPolicyCommand, KeyManagerType } from \"@aws-sdk/client-kms\";\n\nconst kmsClient = new KMSClient();\n\nexport const handler = async (event: any, context: any) => {\n\n  let status = 'SUCCESS';\n  let responseData = {};\n\n  if (event.RequestType === 'Create' || event.RequestType === 'Update') {\n\n    try {\n      const kmsKeyId = event.ResourceProperties.KmsKeyId;\n      const cloudFrontDistributionId = event.ResourceProperties.CloudFrontDistributionId;\n      const accountId = event.ResourceProperties.AccountId;\n      const region = process.env.AWS_REGION;\n\n      const describeKeyCommandResponse = await kmsClient.send(new DescribeKeyCommand({\n        KeyId: kmsKeyId\n      }));\n\n      if (describeKeyCommandResponse.KeyMetadata?.KeyManager === KeyManagerType.AWS) {\n        return {\n          Status: 'SUCCESS',\n          Reason: 'An AWS managed key was provided, no action needed from the custom resource, exiting now.',\n          PhysicalResourceId: event.PhysicalResourceId ?? context.logStreamName,\n          StackId: event.StackId,\n          RequestId: event.RequestId,\n          LogicalResourceId: event.LogicalResourceId,\n          Data: 'An AWS managed key was provided, no action needed from the custom resource, exiting now.',\n        };\n      }\n\n      // The PolicyName is specified as \"default\" below because that is the only valid name as\n      // written in the documentation for @aws-sdk/client-kms.GetKeyPolicyCommandInput:\n      // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-kms/Interface/GetKeyPolicyCommandInput/\n      const getKeyPolicyCommandResponse = await kmsClient.send(new GetKeyPolicyCommand({\n        KeyId: kmsKeyId,\n        PolicyName: 'default'\n      }));\n\n      if (!getKeyPolicyCommandResponse.Policy) {\n        return {\n          Status: 'FAILED',\n          Reason: 'An error occurred while retrieving the key policy.',\n          PhysicalResourceId: event.PhysicalResourceId ?? context.logStreamName,\n          StackId: event.StackId,\n          RequestId: event.RequestId,\n          LogicalResourceId: event.LogicalResourceId,\n          Data: 'An error occurred while retrieving the key policy.',\n        };\n      }\n\n      // Define the updated key policy to allow CloudFront access\n      const keyPolicy = JSON.parse(getKeyPolicyCommandResponse?.Policy);\n      const keyPolicyStatement = {\n        Sid: 'Grant-CloudFront-Distribution-Key-Usage',\n        Effect: 'Allow',\n        Principal: {\n          Service: 'cloudfront.amazonaws.com',\n        },\n        Action: [\n          'kms:Decrypt',\n          'kms:Encrypt',\n          'kms:GenerateDataKey*',\n          'kms:ReEncrypt*'\n        ],\n        Resource: `arn:aws:kms:${region}:${accountId}:key/${kmsKeyId}`,\n        Condition: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:aws:cloudfront::${accountId}:distribution/${cloudFrontDistributionId}`\n          }\n        }\n      };\n      const updatedKeyPolicy = updateKeyPolicy(keyPolicy, keyPolicyStatement);\n\n      await kmsClient.send(new PutKeyPolicyCommand({\n        KeyId: kmsKeyId,\n        Policy: JSON.stringify(updatedKeyPolicy),\n        PolicyName: 'default'\n      }));\n    } catch (err) {\n      status = 'FAILED';\n      responseData = {\n        Error: JSON.stringify(err)\n      };\n    }\n  }\n\n  return {\n    Status: status,\n    Reason: JSON.stringify(responseData),\n    PhysicalResourceId: event.PhysicalResourceId ?? context.logStreamName,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    LogicalResourceId: event.LogicalResourceId,\n    Data: responseData,\n  };\n};\n\n/**\n * Updates a provided key policy with a provided key policy statement. First checks whether the provided key policy statement\n * already exists. If an existing key policy is found with a matching sid, the provided key policy will overwrite the existing\n * key policy. If no matching key policy is found, the provided key policy will be appended onto the array of policy statements.\n * @param keyPolicy - the JSON.parse'd result of the otherwise stringified key policy.\n * @param keyPolicyStatement - the key policy statement to be added to the key policy.\n * @returns keyPolicy - the updated key policy.\n */\nexport const updateKeyPolicy = (keyPolicy: any, keyPolicyStatement: any) => {\n  // Check to see if a duplicate key policy exists by matching on the sid. This is to prevent duplicate key policies\n  // from being added/updated in response to a stack being updated one or more times after initial creation.\n  const existingKeyPolicyIndex = keyPolicy.Statement.findIndex((statement: any) => statement.Sid === keyPolicyStatement.Sid);\n  // If a match is found, overwrite the key policy statement...\n  // Otherwise, push the new key policy to the array of statements\n  if (existingKeyPolicyIndex > -1) {\n    keyPolicy.Statement[existingKeyPolicyIndex] = keyPolicyStatement;\n  } else {\n    keyPolicy.Statement.push(keyPolicyStatement);\n  }\n  // Return the result\n  return keyPolicy;\n};\n"]}
|
|
File without changes
|