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(codepipeline): CloudFormation deployment role always gets pipeline bucket and key permissions #5190

Merged
merged 1 commit into from
Nov 26, 2019
Merged

fix(codepipeline): CloudFormation deployment role always gets pipeline bucket and key permissions #5190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 46 additions & 0 deletions packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,52 @@
"Version": "2012-10-17"
}
}
},
"CodePipelineDeployChangeSetRoleDefaultPolicy289820BE": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*"
],
"Effect": "Allow",
"Resource": [
{
"Fn::GetAtt": [
"ArtifactBucket7410C9EF",
"Arn"
]
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"ArtifactBucket7410C9EF",
"Arn"
]
},
"/*"
]
]
}
]
}
],
"Version": "2012-10-17"
},
"PolicyName": "CodePipelineDeployChangeSetRoleDefaultPolicy289820BE",
"Roles": [
{
"Ref": "CodePipelineDeployChangeSetRoleF9F2B343"
}
]
}
}
}
}
86 changes: 86 additions & 0 deletions packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,49 @@ export = nodeunit.testCase({
PolicyDocument: {
Version: '2012-10-17',
Statement: [
{
Action: [
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*",
],
Effect: "Allow",
Resource: [
{
"Fn::GetAtt": [
"CodePipelineArtifactsBucketF1E925CF",
"Arn",
],
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"CodePipelineArtifactsBucketF1E925CF",
"Arn",
],
},
"/*",
],
],
},
],
},
{
Action: [
"kms:Decrypt",
"kms:DescribeKey",
],
Effect: "Allow",
Resource: {
"Fn::GetAtt": [
"CodePipelineArtifactsBucketEncryptionKey85407CB4",
"Arn",
],
},
},
{
Action: '*',
Effect: 'Allow',
Expand Down Expand Up @@ -272,6 +315,49 @@ export = nodeunit.testCase({
PolicyDocument: {
Version: '2012-10-17',
Statement: [
{
Action: [
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*",
],
Effect: "Allow",
Resource: [
{
"Fn::GetAtt": [
"CodePipelineArtifactsBucketF1E925CF",
"Arn",
],
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"CodePipelineArtifactsBucketF1E925CF",
"Arn",
],
},
"/*"
],
],
},
],
},
{
Action: [
"kms:Decrypt",
"kms:DescribeKey",
],
Effect: "Allow",
Resource: {
"Fn::GetAtt": [
"CodePipelineArtifactsBucketEncryptionKey85407CB4",
"Arn",
],
},
},
{
Action: [
'ec2:AuthorizeSecurityGroupEgress',
Expand Down
13 changes: 7 additions & 6 deletions packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,18 +278,19 @@ abstract class CloudFormationDeployAction extends CloudFormationAction {
assumedBy: new iam.ServicePrincipal('cloudformation.amazonaws.com'),
roleName: cdk.PhysicalName.GENERATE_IF_NEEDED,
});

// the deployment role might need read access to the pipeline's bucket
// (for example, if it's deploying a Lambda function),
// and since this is cross-account, even admin permissions won't be enough -
// the pipeline's bucket must trust this role
options.bucket.grantRead(this._deploymentRole);
} else {
this._deploymentRole = new iam.Role(scope, 'Role', {
assumedBy: new iam.ServicePrincipal('cloudformation.amazonaws.com')
});
}

// the deployment role might need read access to the pipeline's bucket
// (for example, if it's deploying a Lambda function),
// and even if it has admin permissions, it won't be enough,
// as it needs to be added to the key's resource policy
// (and the bucket's, if the access is cross-account)
options.bucket.grantRead(this._deploymentRole);

if (this.props2.adminPermissions) {
this._deploymentRole.addToPolicy(new iam.PolicyStatement({
actions: ['*'],
Expand Down
21 changes: 18 additions & 3 deletions ...-cdk/aws-codepipeline-actions/test/cloudformation/test.cloudformation-pipeline-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect, haveResource, haveResourceLike } from '@aws-cdk/assert';
import { expect, haveResourceLike } from '@aws-cdk/assert';
import { CloudFormationCapabilities } from '@aws-cdk/aws-cloudformation';
import codebuild = require('@aws-cdk/aws-codebuild');
import codecommit = require('@aws-cdk/aws-codecommit');
Expand Down Expand Up @@ -200,7 +200,7 @@ export = {

},

'fullPermissions leads to admin role and full IAM capabilities'(test: Test) {
'fullPermissions leads to admin role and full IAM capabilities with pipeline bucket+key read permissions'(test: Test) {
// GIVEN
const stack = new TestFixture();

Expand Down Expand Up @@ -238,10 +238,25 @@ export = {
}));

// THEN: Role is created with full permissions
expect(stack).to(haveResource('AWS::IAM::Policy', {
expect(stack).to(haveResourceLike('AWS::IAM::Policy', {
PolicyDocument: {
Version: '2012-10-17',
Statement: [
{
"Action": [
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*",
],
"Effect": "Allow",
},
{
"Action": [
"kms:Decrypt",
"kms:DescribeKey",
],
"Effect": "Allow",
},
{
Action: "*",
Effect: 'Allow',
Expand Down
59 changes: 59 additions & 0 deletions ...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 @@ -86,6 +86,22 @@
},
"Resource": "*"
},
{
"Action": [
"kms:Decrypt",
"kms:DescribeKey"
],
"Effect": "Allow",
"Principal": {
"AWS": {
"Fn::GetAtt": [
"PipelineDeployPrepareChangesRoleD28C853C",
"Arn"
]
}
},
"Resource": "*"
},
{
"Action": [
"kms:Decrypt",
Expand Down Expand Up @@ -681,6 +697,49 @@
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*"
],
"Effect": "Allow",
"Resource": [
{
"Fn::GetAtt": [
"PipelineArtifactsBucket22248F97",
"Arn"
]
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"PipelineArtifactsBucket22248F97",
"Arn"
]
},
"/*"
]
]
}
]
},
{
"Action": [
"kms:Decrypt",
"kms:DescribeKey"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"PipelineArtifactsBucketEncryptionKey01D58D69",
"Arn"
]
}
},
{
"Action": "*",
"Effect": "Allow",
Expand Down
59 changes: 59 additions & 0 deletions ...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 @@ -173,6 +173,22 @@
},
"Resource": "*"
},
{
"Action": [
"kms:Decrypt",
"kms:DescribeKey"
],
"Effect": "Allow",
"Principal": {
"AWS": {
"Fn::GetAtt": [
"PipelineDeployLambdaCFNDeployRole89CA1043",
"Arn"
]
}
},
"Resource": "*"
},
{
"Action": [
"kms:Decrypt",
Expand Down Expand Up @@ -1137,6 +1153,49 @@
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*"
],
"Effect": "Allow",
"Resource": [
{
"Fn::GetAtt": [
"PipelineArtifactsBucket22248F97",
"Arn"
]
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"PipelineArtifactsBucket22248F97",
"Arn"
]
},
"/*"
]
]
}
]
},
{
"Action": [
"kms:Decrypt",
"kms:DescribeKey"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"PipelineArtifactsBucketEncryptionKey01D58D69",
"Arn"
]
}
},
{
"Action": "*",
"Effect": "Allow",
Expand Down
Loading