fix arn comparison for IAM ARN #674
Merged
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
k8s-ci-robot
added
the
cncf-cla: yes
|
/ok-to-test |
k8s-ci-robot
added
ok-to-test
nnmin-aws
force-pushed
the
nnmin-fix2
branch
2 times, most recently
from
afc28b6
to
61b6ec4
Compare
k8s-ci-robot
added
size/S
nnmin-aws
force-pushed
the
nnmin-fix2
branch
2 times, most recently
from
67fd86a
to
8e336e5
Compare
nnmin-aws
changed the title
nckturner
reviewed
Dec 10, 2023
| @@ -46,31 +47,35 @@ func (m *DynamicFileMapper) Map(identity *token.Identity) (*config.IdentityMappi | |||
| } | |||
|
|
|||
| if roleMapping, err := m.RoleMapping(key); err == nil { | |||
| if err := m.match(identity, roleMapping.RoleARN, roleMapping.UserId); err != nil { | |||
| if err := m.match(canonicalARN, roleMapping.RoleARN); err != nil { | |||
There was a problem hiding this comment.
So should we remove the match call for role since only user ARNs can change?
There was a problem hiding this comment.
thank you for the comments! yeah we can refactor it in future
nckturner
reviewed
Dec 10, 2023
pkg/mapper/dynamicfile/mapper.go
Outdated
| if m.userIDStrict { | ||
| // 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. | ||
| strippedArn, _ := arn.StripPath(mappedARN) | ||
| if strippedArn != "" && token.CanonicalARN != strings.ToLower(strippedArn) { | ||
| // compare arn additionally for IAM user if principalId is used in mapping |
There was a problem hiding this comment.
This comment is just restating the text above, I dont think it needs to be added.
There was a problem hiding this comment.
thank you for the comments! yeah we can refactor it in future
nnmin-aws
force-pushed
the
nnmin-fix2
branch
from
8e336e5
to
50a3dd9
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nckturner, nnmin-aws 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 |
k8s-ci-robot
added
the
approved
|
/merge |
|
/retest |
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.
What this PR does / why we need it:
this PR fix the issue in PR 669. The original fix doesn't work.
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 #