Skip to content

fix: add fallback when session duration exceeds role's MaxSessionDura… #1515

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
shyamnalluri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: add fallback when session duration exceeds role's MaxSessionDura… #1515

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
21 changes: 20 additions & 1 deletion cmd/saml2aws/commands/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sts"
"github.com/pkg/errors"
Expand Down Expand Up @@ -393,7 +394,25 @@ func loginToStsUsingRole(account *cfg.IDPAccount, role *saml2aws.AWSRole, samlAs

resp, err := svc.AssumeRoleWithSAML(params)
if err != nil {
return nil, errors.Wrap(err, "Error retrieving STS credentials using SAML.")
// Check if the error is due to exceeding MaxSessionDuration
if awsErr, ok := err.(awserr.Error); ok {
if awsErr.Code() == "ValidationError" && strings.Contains(awsErr.Message(), "MaxSessionDuration") {
log.Printf("Warning: Requested session duration (%d seconds) exceeds the role's MaxSessionDuration.", account.SessionDuration)
log.Println("Retrying with role's default/maximum session duration...")

// Retry without DurationSeconds - AWS will use the role's MaxSessionDuration
params.DurationSeconds = nil
resp, err = svc.AssumeRoleWithSAML(params)
if err != nil {
return nil, errors.Wrap(err, "Error retrieving STS credentials using SAML (retry with default duration).")
}
log.Println("Successfully obtained credentials with role's maximum session duration.")
} else {
return nil, errors.Wrap(err, "Error retrieving STS credentials using SAML.")
}
} else {
return nil, errors.Wrap(err, "Error retrieving STS credentials using SAML.")
}
}

return &awsconfig.AWSCredentials{
Expand Down