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

fix(aws-kms): Incomplete KMS Resource Policy Permissions #3459

Merged
merged 23 commits into from
Jul 30, 2019
Merged

fix(aws-kms): Incomplete KMS Resource Policy Permissions #3459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9f1e5ef
merge upstream master
Apr 20, 2019
db26a7e
Merge branch 'master' of https://github.com/awslabs/aws-cdk
Apr 22, 2019
2b9f327
Merge branch 'master' of https://github.com/awslabs/aws-cdk
Apr 23, 2019
b585812
Merge branch 'aws-master'
Apr 25, 2019
c6d58b5
Merge branch 'master' of https://github.com/awslabs/aws-cdk
Apr 26, 2019
dbc7d77
Merge branch 'aws-master'
Apr 27, 2019
5f806a5
Merge branch 'master' of https://github.com/awslabs/aws-cdk
Jul 28, 2019
c26d045
delete packages no longer in main repo
Jul 29, 2019
7aa7946
fix(aws-kms): issue #3458
Jul 29, 2019
6098a40
Merge branch 'master' into IPyandy/aws-kms
Jul 29, 2019
5846c13
(fix): add additional action to expected.json
Jul 29, 2019
29d6b6b
Merge branch 'IPyandy/aws-kms' of github.com:ipyandy/aws-cdk into IPy…
Jul 29, 2019
91ce418
add action to key-sharing test as well
Jul 29, 2019
94fffa5
fix: missed s3 dependency tests
Jul 29, 2019
9c31a45
fix: resource tests that require new kms permission
Jul 29, 2019
b361d4a
Merge branch 'master' of https://github.com/awslabs/aws-cdk into aws-…
Jul 29, 2019
398e2f9
Merge branch 'aws-master' into IPyandy/aws-kms
Jul 29, 2019
da962cd
fix: rollback json formatting mistake
Jul 29, 2019
c3cbbaa
revert two more format changes
Jul 29, 2019
5426f94
reset all file in codepipeline-actions
Jul 29, 2019
bed6db1
missed one file
Jul 29, 2019
aa2077d
revert previous change to codepipeline-actions
Jul 29, 2019
8274cde
fix(decdk): issue with new KMS action permissions
Jul 29, 2019
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
3 changes: 2 additions & 1 deletion ...ges/@aws-cdk/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion ...ws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-cfn.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion ...ges/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-commit.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-events.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion ...s/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-glue/test/integ.table.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
15 changes: 10 additions & 5 deletions packages/@aws-cdk/aws-glue/test/test.table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -470,7 +471,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -678,7 +680,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -791,7 +794,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -906,7 +910,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down
15 changes: 10 additions & 5 deletions packages/@aws-cdk/aws-kinesis/test/test.stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down Expand Up @@ -215,7 +216,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down Expand Up @@ -298,7 +300,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down Expand Up @@ -435,7 +438,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down Expand Up @@ -580,7 +584,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-kms/lib/key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ export class Key extends KeyBase {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
];

this.addToResourcePolicy(new PolicyStatement({
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-kms/test/integ.key-sharing.lit.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-kms/test/integ.key.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
14 changes: 9 additions & 5 deletions packages/@aws-cdk/aws-kms/test/test.key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -104,7 +105,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -183,7 +185,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -277,7 +280,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -341,7 +345,7 @@ export = {
// This one is there by default
{
// tslint:disable-next-line:max-line-length
Action: [ "kms:Create*", "kms:Describe*", "kms:Enable*", "kms:List*", "kms:Put*", "kms:Update*", "kms:Revoke*", "kms:Disable*", "kms:Get*", "kms:Delete*", "kms:ScheduleKeyDeletion", "kms:CancelKeyDeletion" ],
Action: [ "kms:Create*", "kms:Describe*", "kms:Enable*", "kms:List*", "kms:Put*", "kms:Update*", "kms:Revoke*", "kms:Disable*", "kms:Get*", "kms:Delete*", "kms:ScheduleKeyDeletion", "kms:CancelKeyDeletion", "kms:GenerateDataKey" ],
Effect: "Allow",
Principal: { AWS: { "Fn::Join": [ "", [ "arn:", { Ref: "AWS::Partition" }, ":iam::", { Ref: "AWS::AccountId" }, ":root" ] ] } },
Resource: "*"
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ test('if the queue is encrypted with a custom kms key, the key resource policy i
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
8 changes: 5 additions & 3 deletions packages/@aws-cdk/aws-s3/test/test.bucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down Expand Up @@ -828,7 +829,7 @@ export = {
"Statement": [
{
"Action": ["kms:Create*", "kms:Describe*", "kms:Enable*", "kms:List*", "kms:Put*", "kms:Update*",
"kms:Revoke*", "kms:Disable*", "kms:Get*", "kms:Delete*", "kms:ScheduleKeyDeletion", "kms:CancelKeyDeletion"],
"kms:Revoke*", "kms:Disable*", "kms:Get*", "kms:Delete*", "kms:ScheduleKeyDeletion", "kms:CancelKeyDeletion", "kms:GenerateDataKey"],
"Effect": "Allow",
"Principal": {
"AWS": {
Expand Down Expand Up @@ -882,7 +883,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
6 changes: 4 additions & 2 deletions packages/@aws-cdk/aws-secretsmanager/test/test.secret.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down Expand Up @@ -204,7 +205,8 @@ export = {
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
Effect: "Allow",
Principal: {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-ses/test/integ.receipt.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
"kms:CancelKeyDeletion",
"kms:GenerateDataKey"
],
"Effect": "Allow",
"Principal": {
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-ses/test/test.receipt-rule-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ export = {
'kms:Get*',
'kms:Delete*',
'kms:ScheduleKeyDeletion',
'kms:CancelKeyDeletion'
'kms:CancelKeyDeletion',
"kms:GenerateDataKey"
],
Effect: 'Allow',
Principal: {
Expand Down
Loading