Skip to content

fix(login): skip ParseAWSAccounts when RoleARN is configured #1528

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

Open
alisade wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −5
Open

fix(login): skip ParseAWSAccounts when RoleARN is configured #1528

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
11 changes: 6 additions & 5 deletions cmd/saml2aws/commands/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,14 @@ func selectAwsRole(samlAssertion string, account *cfg.IDPAccount) (*saml2aws.AWS
func resolveRole(awsRoles []*saml2aws.AWSRole, samlAssertion string, account *cfg.IDPAccount) (*saml2aws.AWSRole, error) {
var role = new(saml2aws.AWSRole)

if len(awsRoles) == 0 {
return nil, errors.New("No roles available.")
}
if account.RoleARN != "" {
return saml2aws.LocateRole(awsRoles, account.RoleARN)
}
if len(awsRoles) == 1 {
if account.RoleARN != "" {
return saml2aws.LocateRole(awsRoles, account.RoleARN)
}
return awsRoles[0], nil
} else if len(awsRoles) == 0 {
return nil, errors.New("No roles available.")
}

samlAssertionData, err := b64.StdEncoding.DecodeString(samlAssertion)
Expand Down