Skip to content
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

Jump to bottom

don't create leases for AWS STS secrets #15869

Merged
merged 6 commits into from
Oct 28, 2022
Merged

don't create leases for AWS STS secrets #15869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1feb17b
don't create leases for AWS STS secrets
bhowe34 Jun 8, 2022
97e3b60
use number of seconds for ttl instead of time.Duration
bhowe34 Jun 9, 2022
4635c9d
add changelog
bhowe34 Jun 9, 2022
4a071c7
Merge branch 'main' into bhowe34/aws-sts-no-lease
bhowe34 Aug 10, 2022
a1efdd8
Merge remote-tracking branch 'origin/main' into bhowe34/aws-sts-no-lease
bhowe34 Oct 24, 2022
69ee93e
don't create leases for aws federation tokens
bhowe34 Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 19 additions & 35 deletions builtin/logical/aws/secret_access_keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,23 +155,15 @@ func (b *backend) getFederationToken(ctx context.Context, s logical.Storage,
return logical.ErrorResponse("Error generating STS keys: %s", err), awsutil.CheckAWSError(err)
}

resp := b.Secret(secretAccessKeyType).Response(map[string]interface{}{
"access_key": *tokenResp.Credentials.AccessKeyId,
"secret_key": *tokenResp.Credentials.SecretAccessKey,
"security_token": *tokenResp.Credentials.SessionToken,
}, map[string]interface{}{
"username": username,
"policy": policy,
"is_sts": true,
})

// Set the secret TTL to appropriately match the expiration of the token
resp.Secret.TTL = tokenResp.Credentials.Expiration.Sub(time.Now())

// STS are purposefully short-lived and aren't renewable
resp.Secret.Renewable = false

return resp, nil
// STS credentials cannot be revoked so do not create a lease
return &logical.Response{
Data: map[string]interface{}{
"access_key": *tokenResp.Credentials.AccessKeyId,
"secret_key": *tokenResp.Credentials.SecretAccessKey,
"security_token": *tokenResp.Credentials.SessionToken,
"ttl": uint64(tokenResp.Credentials.Expiration.Sub(time.Now()).Seconds()),
},
}, nil
}

func (b *backend) assumeRole(ctx context.Context, s logical.Storage,
Expand Down Expand Up @@ -238,24 +230,16 @@ func (b *backend) assumeRole(ctx context.Context, s logical.Storage,
return logical.ErrorResponse("Error assuming role: %s", err), awsutil.CheckAWSError(err)
}

resp := b.Secret(secretAccessKeyType).Response(map[string]interface{}{
"access_key": *tokenResp.Credentials.AccessKeyId,
"secret_key": *tokenResp.Credentials.SecretAccessKey,
"security_token": *tokenResp.Credentials.SessionToken,
"arn": *tokenResp.AssumedRoleUser.Arn,
}, map[string]interface{}{
"username": roleSessionName,
"policy": roleArn,
"is_sts": true,
})

// Set the secret TTL to appropriately match the expiration of the token
resp.Secret.TTL = tokenResp.Credentials.Expiration.Sub(time.Now())

// STS are purposefully short-lived and aren't renewable
resp.Secret.Renewable = false

return resp, nil
// STS credentials cannot be revoked so do not create a lease
return &logical.Response{
Data: map[string]interface{}{
"access_key": *tokenResp.Credentials.AccessKeyId,
"secret_key": *tokenResp.Credentials.SecretAccessKey,
"security_token": *tokenResp.Credentials.SessionToken,
"arn": *tokenResp.AssumedRoleUser.Arn,
"ttl": uint64(tokenResp.Credentials.Expiration.Sub(time.Now()).Seconds()),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compatible with api.Secret.TokenTTL()

},
}, nil
}

func readConfig(ctx context.Context, storage logical.Storage) (rootConfig, error) {
Expand Down
3 changes: 3 additions & 0 deletions changelog/15869.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:change
secrets/aws: do not create leases for non-renewable/non-revocable STS credentials to reduce storage calls
```