Skip to content

[v13] check for empty name part in role arn #26376

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.

Sign up for GitHub

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

Merged
GavinFrazar merged 1 commit into from
May 16, 2023
Merged

[v13] check for empty name part in role arn #26376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/utils/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ func checkRoleARN(parsed *arn.ARN) error {
if parts[0] != "role" || parsed.Service != iam.ServiceName {
return trace.BadParameter("%q is not an AWS IAM role ARN", parsed)
}
if len(parts) < 2 {
if len(parts) < 2 || len(parts[len(parts)-1]) == 0 {
return trace.BadParameter("%q is missing AWS IAM role name", parsed)
}
if err := apiawsutils.IsValidAccountID(parsed.AccountID); err != nil {
Expand Down
12 changes: 10 additions & 2 deletions lib/utils/aws/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,17 +282,25 @@ func TestParseRoleARN(t *testing.T) {
arn: "arn:aws:iam::123456789012:user/test-user",
wantErrContains: "not an AWS IAM role",
},
"iam role arn is missing role name": {
"iam role arn is missing role name section": {
arn: "arn:aws:iam::123456789012:role",
wantErrContains: "missing AWS IAM role name",
},
"iam role arn is missing role name": {
arn: "arn:aws:iam::123456789012:role/",
wantErrContains: "missing AWS IAM role name",
},
"service role arn is missing role name": {
arn: "arn:aws:iam::123456789012:role/aws-service-role/redshift.amazonaws.com/",
wantErrContains: "missing AWS IAM role name",
},
}

for name, tt := range tests {
t.Run(name, func(t *testing.T) {
got, err := ParseRoleARN(tt.arn)
if tt.wantErrContains != "" {
require.Error(t, err, err.Error())
require.Error(t, err)
require.ErrorContains(t, err, tt.wantErrContains)
return
}
Expand Down