feat: disallow cross account asset publishing in some scenarios by iliapolo · Pull Request #31623 · aws/aws-cdk

iliapolo · 2024-10-02T16:09:02Z

Issue # (if applicable)

Closes #.

Reason for this change

Description of changes

Description of how you validated changes

Checklist

My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

aws-cdk-automation

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

iliapolo · 2024-10-02T16:48:05Z

For whoever ends up picking this PR up: hopefully there are just a couple of methods to implements:

aws-cdk/packages/aws-cdk/lib/api/deployments.ts

Lines 676 to 680 in 3a930fb

    
           private stagingBucketInToolkitStack(): boolean { 
        
             // determine if the staging bucket exists in the 
        
             // bootstrap stack (user might have removed it in case of a custom bootstrap template) 
        
             throw new Error('TODO'); 
        
           }

aws-cdk/packages/aws-cdk/lib/api/deployments.ts

Lines 682 to 685 in 3a930fb

    
           private bootstrapVersion(): number { 
        
             // grab the current bootstrap stack version from the customer account 
        
             throw new Error('TODO'); 
        
           }

HBobertz · 2024-10-10T01:09:36Z

packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md

    "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": true,
    "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": true,
-    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true
+    "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": true,


This was automatically done as part of the build 🤷‍♂️

packages/aws-cdk/lib/api/util/checks.ts

rix0rrr · 2024-10-10T13:26:31Z

packages/aws-cdk/lib/api/util/checks.ts

+    // Check if we can retrieve the bucketName from the output
+    const bucketNameOutput = response.Stacks[0].Outputs?.find(
+      output => output.OutputKey === 'BucketName',
+    );


Use the logical ID of the resource (DescribeStackResources).

packages/aws-cdk/lib/api/util/checks.ts

Co-authored-by: Rico Hermans <rix0rrr@gmail.com>

rix0rrr · 2024-10-11T08:09:22Z

packages/aws-cdk/lib/api/deploy-stack.ts

    options.overrideTemplate);
+  let bootstrapStackName: string | undefined;
+  try {
+    bootstrapStackName = (await options.envResources.lookupToolkit()).stackName;


This performs a lookupToolkit, which returns ToolkitInfo, which has most of the information already.

Why can't the logic live there?

I actually tried that first, but it started getting a bit ugly because that's an abstract class and we have a "we don't exist yet" version of that class, which kept breaking tests and was difficult to mock properly. So I just said screw it and refactored the change into functional util, which was much easier to test and mock.

HBobertz · 2024-10-12T18:22:19Z

Due to the nature of the change this is essentially not integ-testable so we will not be adding an integ test for this. Added pr-linter/exempt-test flag

HBobertz · 2024-10-12T20:40:39Z

Recreated the vulnerability. Got this exception when my bootstrap version is less than 21:

TempAppStack: fail: ❗❗ UNEXPECTED BUCKET OWNER DETECTED ❗❗ 
        
              We've detected that the S3 bucket cdk-hnb659fds-assets-446584840139-us-east-1 was 
              originally created in account 446584840139 as part of the CloudFormation stack CDKToolkit, 
              but now resides in a different AWS account. To prevent cross-account asset bucket access of your 
              deployments, CDK will stop now.

              If this situation is intentional and you own the AWS account that the bucket has moved to, remove the 
              resource named StagingBucket from the template of CloudFormation stack CDKToolkit and try again. 
              
              If this situation is not intentional, we strongly recommend auditing your account to make sure all 
              resources are configured the way you expect them [1]. For questions or concerns, please contact 
              AWS Support [2]. 
              
              [1] https://repost.aws/knowledge-center/potential-account-compromise
              
              [2] https://aws.amazon.com/support

And no such failure when our bootstrap version has been updated

This deployment will make potentially sensitive changes according to your current security approval level (--require-approval broadening).
Please confirm you intend to make the following modifications:

IAM Statement Changes
┌───┬─────────────────────────────────┬────────┬────────────────┬──────────────────────────────┬───────────┐
│   │ Resource                        │ Effect │ Action         │ Principal                    │ Condition │
├───┼─────────────────────────────────┼────────┼────────────────┼──────────────────────────────┼───────────┤
│ + │ ${rootFunction/ServiceRole.Arn} │ Allow  │ sts:AssumeRole │ Service:lambda.amazonaws.com │           │
└───┴─────────────────────────────────┴────────┴────────────────┴──────────────────────────────┴───────────┘
IAM Policy Changes
┌───┬─────────────────────────────┬────────────────────────────────────────────────────────────────────────────────┐
│   │ Resource                    │ Managed Policy ARN                                                             │
├───┼─────────────────────────────┼────────────────────────────────────────────────────────────────────────────────┤
│ + │ ${rootFunction/ServiceRole} │ arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole │

Which is the intended functionality

aws-cdk-automation · 2024-10-12T20:51:14Z

➡️ PR build request submitted to test-main-pipeline ⬅️

A maintainer must now check the pipeline and add the pr-linter/cli-integ-tested label once the pipeline succeeds.

HBobertz · 2024-10-12T20:55:30Z

I also added readme change since this isn't really a feat, more like a security fix but I'm keeping what eli designated the pr as. If we want readme changes feel free to request changes or remove the flag

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

mergify · 2024-10-14T14:23:50Z

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-cdk-automation · 2024-10-14T14:54:18Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
Commit ID: 3952ee5
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

mergify · 2024-10-14T14:54:44Z

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).

github-actions · 2024-10-14T14:55:00Z

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

mid work

3a930fb

aws-cdk-automation requested a review from a team October 2, 2024 16:09

github-actions bot added the p2 label Oct 2, 2024

mergify bot added the contribution/core This is a PR that came from AWS. label Oct 2, 2024

iliapolo had a problem deploying to test-pipeline October 2, 2024 16:09 — with GitHub Actions Failure

aws-cdk-automation previously requested changes Oct 2, 2024

View reviewed changes

aws-cdk-automation added the pr/needs-cli-test-run This PR needs CLI tests run against it. label Oct 2, 2024

mrgrain changed the title ~~feat: disallow cross account asset publishing is some scenarios~~ feat: disallow cross account asset publishing in some scenarios Oct 3, 2024

rix0rrr self-assigned this Oct 3, 2024

jiayiwang7 assigned HBobertz and unassigned rix0rrr Oct 9, 2024

add checks for bucket

06c1c82

HBobertz had a problem deploying to test-pipeline October 9, 2024 23:49 — with GitHub Actions Failure

fix tests

9e3dc8b

HBobertz temporarily deployed to test-pipeline October 10, 2024 01:05 — with GitHub Actions Inactive

HBobertz reviewed Oct 10, 2024

View reviewed changes

proper use of crossAccount function

f8740ce

HBobertz temporarily deployed to test-pipeline October 10, 2024 01:27 — with GitHub Actions Inactive

rix0rrr requested changes Oct 10, 2024

View reviewed changes

HBobertz and others added 2 commits October 10, 2024 15:09

Update packages/aws-cdk/lib/api/util/checks.ts

1f54aca

Co-authored-by: Rico Hermans <rix0rrr@gmail.com>

Update packages/aws-cdk/lib/api/util/checks.ts

4c36a8d

Co-authored-by: Rico Hermans <rix0rrr@gmail.com>

HBobertz had a problem deploying to test-pipeline October 10, 2024 19:11 — with GitHub Actions Failure

HBobertz added 2 commits October 10, 2024 15:42

make checking bootstrap stack info better

76f58c9

update bucketname check

e115dc5

HBobertz had a problem deploying to test-pipeline October 10, 2024 19:44 — with GitHub Actions Failure

better bucketname checks

d2a931a

HBobertz temporarily deployed to test-pipeline October 10, 2024 20:49 — with GitHub Actions Inactive

HBobertz added pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested and removed pr/needs-cli-test-run This PR needs CLI tests run against it. labels Oct 10, 2024

Merge branch 'main' into epolon/maybe-allow-cross-account-publishing

3ae5856

HBobertz had a problem deploying to test-pipeline October 11, 2024 02:28 — with GitHub Actions Failure

remove unnecessary check

1fdf045

HBobertz had a problem deploying to test-pipeline October 11, 2024 03:44 — with GitHub Actions Failure

add unit tests

24b5edc

HBobertz had a problem deploying to test-pipeline October 11, 2024 03:57 — with GitHub Actions Failure

rix0rrr requested changes Oct 11, 2024

View reviewed changes

HBobertz added the pr-linter/exempt-test The PR linter will not require test changes label Oct 12, 2024

Merge branch 'main' into epolon/maybe-allow-cross-account-publishing

05b002d

HBobertz marked this pull request as ready for review October 12, 2024 20:49

HBobertz temporarily deployed to test-pipeline October 12, 2024 20:50 — with GitHub Actions Inactive

HBobertz added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Oct 12, 2024

HBobertz requested a review from rix0rrr October 12, 2024 20:52

HBobertz added pr-linter/exempt-readme The PR linter will not require README changes and removed pr-linter/exempt-test The PR linter will not require test changes labels Oct 12, 2024

rix0rrr approved these changes Oct 14, 2024

View reviewed changes

Merge branch 'main' into epolon/maybe-allow-cross-account-publishing

3952ee5

mergify bot had a problem deploying to test-pipeline October 14, 2024 14:26 Failure

mergify bot merged commit edd031d into main Oct 14, 2024

mergify bot deleted the epolon/maybe-allow-cross-account-publishing branch October 14, 2024 14:54

github-actions bot locked as resolved and limited conversation to collaborators Oct 14, 2024

Conversation

iliapolo commented Oct 2, 2024

Issue # (if applicable)

Reason for this change

Description of changes

Description of how you validated changes

Checklist

Uh oh!

aws-cdk-automation left a comment

Choose a reason for hiding this comment

Uh oh!

iliapolo commented Oct 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HBobertz Oct 10, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

rix0rrr Oct 10, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

rix0rrr Oct 11, 2024

Choose a reason for hiding this comment

Uh oh!

HBobertz Oct 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HBobertz commented Oct 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HBobertz commented Oct 12, 2024

Uh oh!

aws-cdk-automation commented Oct 12, 2024

Uh oh!

HBobertz commented Oct 12, 2024

Uh oh!

mergify bot commented Oct 14, 2024

Uh oh!

aws-cdk-automation commented Oct 14, 2024

AWS CodeBuild CI Report

Uh oh!

mergify bot commented Oct 14, 2024

Uh oh!

github-actions bot commented Oct 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

iliapolo commented Oct 2, 2024 •

edited

Loading

HBobertz Oct 11, 2024 •

edited

Loading

HBobertz commented Oct 12, 2024 •

edited

Loading