Skip to content

fix: retrieve IAM user explicitly in credentials rotation #925

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
jbbarth wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

fix: retrieve IAM user explicitly in credentials rotation #925

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
15 changes: 12 additions & 3 deletions pkg/granted/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,16 @@ var RotateCredentialsCommand = cli.Command{

iamClient := iam.NewFromConfig(cfg)

res, err := iamClient.CreateAccessKey(c.Context, &iam.CreateAccessKeyInput{})
// Retrieve the current IAM user's name to pass explicitly to IAM API calls.
// When UserName is omitted, AWS may incorrectly evaluate the resource ARN
// with a "null" prefix on the username, causing policy denials.
getUserRes, err := iamClient.GetUser(c.Context, &iam.GetUserInput{})
if err != nil {
return err
}
userName := getUserRes.User.UserName

res, err := iamClient.CreateAccessKey(c.Context, &iam.CreateAccessKeyInput{UserName: userName})
if err != nil {
return err
}
Expand All @@ -581,13 +590,13 @@ var RotateCredentialsCommand = cli.Command{
return err
}

_, err = iamClient.UpdateAccessKey(c.Context, &iam.UpdateAccessKeyInput{AccessKeyId: &t.AccessKeyID, Status: "Inactive"})
_, err = iamClient.UpdateAccessKey(c.Context, &iam.UpdateAccessKeyInput{AccessKeyId: &t.AccessKeyID, Status: "Inactive", UserName: userName})
if err != nil {
return err
}

if c.Bool("delete") {
_, err = iamClient.DeleteAccessKey(c.Context, &iam.DeleteAccessKeyInput{AccessKeyId: &t.AccessKeyID})
_, err = iamClient.DeleteAccessKey(c.Context, &iam.DeleteAccessKeyInput{AccessKeyId: &t.AccessKeyID, UserName: userName})
if err != nil {
return err
}
Expand Down