Skip to content

fix(pipelines): CodeBuild Action role can be assumed by too many identities #25316

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

Merged
rix0rrr merged 3 commits into from
Apr 26, 2023
Merged

fix(pipelines): CodeBuild Action role can be assumed by too many identities #25316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e54dd92
fix(pipelines): CodeBuild Action role is too permissive
rix0rrr Apr 26, 2023
edd3610
Snapshots
rix0rrr Apr 26, 2023
94ce8c8
Merge branch 'main' into huijbers/pipelines-action-role
rix0rrr Apr 26, 2023
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
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/pipelines/lib/codepipeline/codepipeline-action-factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as cb from '../../../aws-codebuild';
import * as cp from '../../../aws-codepipeline';
import { Construct } from 'constructs';
import { ArtifactMap } from './artifact-map';
import { CodeBuildOptions, CodePipeline } from './codepipeline';
import { StackOutputsMap } from './stack-outputs-map';
import * as cb from '../../../aws-codebuild';
import * as cp from '../../../aws-codepipeline';

/**
* Options for the `CodePipelineActionFactory.produce()` method.
Expand Down
8 changes: 3 additions & 5 deletions packages/aws-cdk-lib/pipelines/lib/codepipeline/private/codebuild-factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as fs from 'fs';
import * as path from 'path';
import { Construct, IDependable, Node } from 'constructs';
import { mergeBuildSpecs } from './buildspecs';
import * as codebuild from '../../../../aws-codebuild';
import * as codepipeline from '../../../../aws-codepipeline';
import * as codepipeline_actions from '../../../../aws-codepipeline-actions';
import * as ec2 from '../../../../aws-ec2';
import * as iam from '../../../../aws-iam';
import { Stack, Token } from '../../../../core';
import { Construct, IDependable, Node } from 'constructs';
import { mergeBuildSpecs } from './buildspecs';
import { FileSetLocation, ShellStep, StackOutputReference } from '../../blueprint';
import { StepOutput } from '../../helpers-internal/step-output';
import { cloudAssemblyBuildSpecDir, obtainScope } from '../../private/construct-internals';
Expand Down Expand Up @@ -338,9 +338,7 @@ export class CodeBuildFactory implements ICodePipelineActionFactory {
const actionRole = this.props.actionRole
?? options.pipeline.node.tryFindChild(actionRoleCid) as iam.IRole
?? new iam.Role(options.pipeline, actionRoleCid, {
assumedBy: new iam.PrincipalWithConditions(new iam.AccountRootPrincipal(), {
Bool: { 'aws:ViaAWSService': iam.ServicePrincipal.servicePrincipalName('codepipeline.amazonaws.com') },
}),
assumedBy: options.pipeline.pipeline.role,
});

stage.addAction(new codepipeline_actions.CodeBuildAction({
Expand Down
7 changes: 1 addition & 6 deletions packages/aws-cdk-lib/pipelines/test/codepipeline/codepipeline.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,7 @@ test('CodeBuild action role has the right AssumeRolePolicyDocument', () => {
{
Action: 'sts:AssumeRole',
Principal: {
AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::123pipeline:root']] },
},
Condition: {
Bool: {
'aws:ViaAWSService': 'codepipeline.amazonaws.com',
},
AWS: { 'Fn::GetAtt': ['CdkPipelineRoleC09C4D44', 'Arn'] },
},
},
],
Expand Down