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 role ARN comparison for user ID strict check #669

Merged
merged 1 commit into from
Dec 9, 2023

Conversation

DanielCKennedy
Copy link
Contributor

@DanielCKennedy DanielCKennedy commented Dec 9, 2023

What this PR does / why we need it:

Fixes UserID strict ARN comparison for roles by comparing mapped arn against the identity's canonical arn (role representation) rather than the identity's arn (assume role format). Additionally strips the role path off of the dynamic file role mapping for this check since assumed roles don't have path info.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 9, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @DanielCKennedy. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 9, 2023
@nnmin-aws
Copy link
Contributor

/test

@k8s-ci-robot
Copy link
Contributor

@nnmin-aws: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-aws-iam-authenticator-e2e
  • /test pull-aws-iam-authenticator-e2e-kind
  • /test pull-aws-iam-authenticator-integration
  • /test pull-aws-iam-authenticator-unit

Use /test all to run all jobs.

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nnmin-aws
Copy link
Contributor

/test all

@nckturner
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 9, 2023
@nnmin-aws
Copy link
Contributor

/retest

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 9, 2023
@@ -66,7 +67,8 @@ func (m *DynamicFileMapper) match(token *token.Identity, mappedARN, mappedUserID
// If ARN is provided, ARN must be validated along with UserID. This avoids having to
// support IAM user name/ARN changes. Without preventing this the mapping would look
// invalid but still work and auditing would be difficult/impossible.
if mappedARN != "" && token.ARN != mappedARN {
strippedArn, _ := arn.StripPath(mappedARN)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a // TODO: that says something along the lines of: this should potentially be moved to canonicalize or somehow shared by other mappers because it could fix the path issue but needs to be tested with other mappers first, e.g. in a cluster with existing custom resources for the CRD mapper.

@nckturner
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 9, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DanielCKennedy, nckturner

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2023
@k8s-ci-robot
Copy link
Contributor

@DanielCKennedy: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-aws-iam-authenticator-e2e e91d159 link true /test pull-aws-iam-authenticator-e2e

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@nckturner nckturner merged commit 8309d67 into kubernetes-sigs:master Dec 9, 2023
6 of 8 checks passed
DanielCKennedy added a commit to DanielCKennedy/aws-iam-authenticator that referenced this pull request Dec 9, 2023
DanielCKennedy added a commit to DanielCKennedy/aws-iam-authenticator that referenced this pull request Dec 9, 2023
k8s-ci-robot added a commit that referenced this pull request Dec 9, 2023
Fix role ARN comparison for user ID strict check (#669)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants