fix(codepipeline): incorrect cross-account permissions with StepFunct ionInvokeAction #25850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ionInvokeAction When the StateMachine being invoked by CodePipeline is not in the same account/region as the CodePipeline, the `DescribeExecutions` permission was granted on the incorrect account/region pair (that of the pipeline, and not that of the StateMachine), due to the transforming of the state machine's ARN into a state machine execution ARN pattern not copying the account & region of the original ARN.
RomainMuller
added
contribution/core
|
|
RomainMuller
commented
Jun 5, 2023
Comment on lines
+104
to
+113
| [ | ||
| 'arn:', | ||
| { 'Fn::Select': [1, arnParts] }, | ||
| ':states:', | ||
| { 'Fn::Select': [3, arnParts] }, | ||
| ':', | ||
| { 'Fn::Select': [4, arnParts] }, | ||
| ':execution:', | ||
| { 'Fn::Select': [6, arnParts] }, | ||
| ':*', |
There was a problem hiding this comment.
This assertion has changed due to the change in how the executions ARN is now computed "correctly".
RomainMuller
commented
Jun 5, 2023
Comment on lines
+127
to
148
| test('Allows the pipeline to describe this stepfunction execution (across accounts & regions)', () => { | ||
| const stack = new Stack(undefined, undefined, { env: { account: '11111111111', region: 'us-east-1' } }); | ||
|
|
||
| minimalPipeline(stack, '999999999999', 'bermuda-triangle-1337'); | ||
|
|
||
| // The permissions are defined by the cross-account stack here... | ||
| const cfnStack = Stage.of(stack)?.synth().stacks.find(({ stackName }) => stackName === 'Default-support-999999999999'); | ||
| expect(cfnStack).toBeDefined(); | ||
|
|
||
| Template.fromJSON(cfnStack!.template).hasResourceProperties('AWS::IAM::Policy', { | ||
| PolicyDocument: { | ||
| Statement: [ | ||
| {}, | ||
| { | ||
| Action: 'states:DescribeExecution', | ||
| Resource: 'arn:aws:states:bermuda-triangle-1337:999999999999:execution:SimpleStateMachine:*', | ||
| Effect: 'Allow', | ||
| }, | ||
| ], | ||
| }, | ||
| }); | ||
| }); |
There was a problem hiding this comment.
This test case is new.
RomainMuller
commented
Jun 5, 2023
Comment on lines
8
to
+9
| describe('StepFunctions Invoke Action', () => { | ||
| describe('StepFunctions Invoke Action', () => { | ||
| test('Verify stepfunction configuration properties are set to specific values', () => { | ||
| const stack = new Stack(); | ||
|
|
||
| // when | ||
| minimalPipeline(stack); | ||
|
|
||
| // then | ||
| Template.fromStack(stack).hasResourceProperties('AWS::CodePipeline::Pipeline', Match.objectLike({ | ||
| Stages: [ | ||
| // Must have a source stage | ||
| { | ||
| Actions: [ | ||
| { | ||
| ActionTypeId: { | ||
| Category: 'Source', | ||
| Owner: 'AWS', | ||
| Provider: 'S3', | ||
| Version: '1', | ||
| }, | ||
| Configuration: { | ||
| S3Bucket: { | ||
| Ref: 'MyBucketF68F3FF0', | ||
| }, | ||
| S3ObjectKey: 'some/path/to', | ||
| }, | ||
| test('Verify stepfunction configuration properties are set to specific values', () => { |
There was a problem hiding this comment.
The describe block was duplicated, so I removed the duplicate... This caused a bunch of indent changes down there, so I've commented on what's "really" changed here so reviewers can focus on that.
Naumel
approved these changes
Jun 5, 2023
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the StateMachine being invoked by CodePipeline is not in the same account/region as the CodePipeline, the
DescribeExecutionspermission was granted on the incorrect account/region pair (that of the pipeline, and not that of the StateMachine), due to the transforming of the state machine's ARN into a state machine execution ARN pattern not copying the account & region of the original ARN.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license