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.

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(iam): SamlConsolePrincipal returns incorrect url in GovCloud and ISO regions #28704

Merged
merged 6 commits into from
Jan 24, 2024

Conversation

badmintoncryer
Copy link
Contributor

@badmintoncryer badmintoncryer commented Jan 13, 2024

This PR addresses the issue where the SAML federation principal is hardcoded with URLs specific to standard AWS and China partitions, causing failures in GovCloud, Iso, and Iso-b partitions. The provided solution dynamically sets the SAML sign-on URL based on the partition.

-       'SAML:aud': cdk.Aws.PARTITION==='aws-cn'? 'https://signin.amazonaws.cn/saml': 'https://signin.aws.amazon.com/saml',
+       'SAML:aud': RegionInfo.get(samlProvider.stack.region).samlSignOnUrl ?? 'https://signin.aws.amazon.com/saml',
export const PARTITION_SAML_SIGN_ON_URL: Record<Partition, string> = {
  [Partition.Default]: 'https://signin.aws.amazon.com/saml',
  [Partition.Cn]: 'https://signin.amazonaws.cn/saml',
  [Partition.UsGov]: 'https://signin.amazonaws-us-gov.com/saml',
  [Partition.UsIso]: 'https://signin.c2shome.ic.gov/saml',
  [Partition.UsIsoB]: 'https://signin.sc2shome.sgov.gov/saml',
};

Closes #25723.


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

@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p2 labels Jan 13, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team January 13, 2024 16:04
@github-actions github-actions bot added the valued-contributor [Pilot] contributed between 6-12 PRs to the CDK label Jan 13, 2024
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@badmintoncryer
Copy link
Contributor Author

Exemption Request

This revision will only apply to regions in China, GovCloud, and ISO partitions, and not to regions in the standard partition where integration tests are conducted. Therefore, I believe that there is no need to create new integration tests for this change.

@aws-cdk-automation aws-cdk-automation added pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels Jan 13, 2024
@badmintoncryer badmintoncryer changed the title fix(iam): SamlConsolePrincipal returns incorrect url in GovCloud and ADC regions fix(iam): SamlConsolePrincipal returns incorrect url in GovCloud and ISO regions Jan 14, 2024
Copy link
Contributor

@laurelmay laurelmay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this fix! This should be super useful for users in these partitions.

@aws-cdk-automation aws-cdk-automation added pr/needs-maintainer-review This PR needs a review from a Core Team Member and removed pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels Jan 15, 2024
@ConnorRobertson ConnorRobertson self-assigned this Jan 24, 2024
@ConnorRobertson ConnorRobertson added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Jan 24, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review January 24, 2024 17:51

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 728127f
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@ConnorRobertson
Copy link
Contributor

ConnorRobertson commented Jan 24, 2024

This looks good to me thanks for your contribution @badmintoncryer

Copy link
Contributor

mergify bot commented Jan 24, 2024

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

@mergify mergify bot merged commit c1f2abb into aws:main Jan 24, 2024
10 checks passed
@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jan 24, 2024
@badmintoncryer badmintoncryer deleted the 25804-saml branch January 24, 2024 19:08
penniman26 pushed a commit to penniman26/aws-cdk that referenced this pull request Jan 25, 2024
…ISO regions (aws#28704)

This PR addresses the issue where the SAML federation principal is hardcoded with URLs specific to standard AWS and China partitions, causing failures in GovCloud, Iso, and Iso-b partitions. The provided solution dynamically sets the SAML sign-on URL based on the partition.

```diff
-       'SAML:aud': cdk.Aws.PARTITION==='aws-cn'? 'https://signin.amazonaws.cn/saml': 'https://signin.aws.amazon.com/saml',
+       'SAML:aud': RegionInfo.get(samlProvider.stack.region).samlSignOnUrl ?? 'https://signin.aws.amazon.com/saml',
```

```ts
export const PARTITION_SAML_SIGN_ON_URL: Record<Partition, string> = {
  [Partition.Default]: 'https://signin.aws.amazon.com/saml',
  [Partition.Cn]: 'https://signin.amazonaws.cn/saml',
  [Partition.UsGov]: 'https://signin.amazonaws-us-gov.com/saml',
  [Partition.UsIso]: 'https://signin.c2shome.ic.gov/saml',
  [Partition.UsIsoB]: 'https://signin.sc2shome.sgov.gov/saml',
};
```



Closes aws#25723.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
SankyRed pushed a commit that referenced this pull request Feb 8, 2024
…ISO regions (#28704)

This PR addresses the issue where the SAML federation principal is hardcoded with URLs specific to standard AWS and China partitions, causing failures in GovCloud, Iso, and Iso-b partitions. The provided solution dynamically sets the SAML sign-on URL based on the partition.

```diff
-       'SAML:aud': cdk.Aws.PARTITION==='aws-cn'? 'https://signin.amazonaws.cn/saml': 'https://signin.aws.amazon.com/saml',
+       'SAML:aud': RegionInfo.get(samlProvider.stack.region).samlSignOnUrl ?? 'https://signin.aws.amazon.com/saml',
```

```ts
export const PARTITION_SAML_SIGN_ON_URL: Record<Partition, string> = {
  [Partition.Default]: 'https://signin.aws.amazon.com/saml',
  [Partition.Cn]: 'https://signin.amazonaws.cn/saml',
  [Partition.UsGov]: 'https://signin.amazonaws-us-gov.com/saml',
  [Partition.UsIso]: 'https://signin.c2shome.ic.gov/saml',
  [Partition.UsIsoB]: 'https://signin.sc2shome.sgov.gov/saml',
};
```



Closes #25723.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. effort/small Small work item – less than a day of effort p2 pr-linter/exempt-integ-test The PR linter will not require integ test changes pr-linter/exemption-requested The contributor has requested an exemption to the PR Linter feedback. valued-contributor [Pilot] contributed between 6-12 PRs to the CDK
Projects
None yet
Development

Successfully merging this pull request may close these issues.

iam: SamlConsolePrincipal does not work for GovCloud or ADC regions
4 participants