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

[VAULT-1986] Cap AWS Token TTL based on Default Lease TTL #12026

Merged
merged 6 commits into from Jul 15, 2021
Merged

[VAULT-1986] Cap AWS Token TTL based on Default Lease TTL #12026

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0691a83
fix: cap token TTL at login time based on default lease TTL
vinay-gopalan Jul 8, 2021
72c8f66
add changelog file
vinay-gopalan Jul 8, 2021
d26ae96
patch: update warning messages to not include 'at login'
vinay-gopalan Jul 12, 2021
fee1233
patch: remove default lease capping and test
vinay-gopalan Jul 13, 2021
bc46727
update changelog
vinay-gopalan Jul 13, 2021
72162c4
patch: revert warning message
vinay-gopalan Jul 14, 2021
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
6 changes: 1 addition & 5 deletions builtin/credential/aws/path_role.go
View file
Open in desktop
Expand Up @@ -889,13 +889,9 @@ func (b *backend) pathRoleCreateUpdate(ctx context.Context, req *logical.Request
}
}

defaultLeaseTTL := b.System().DefaultLeaseTTL()
systemMaxTTL := b.System().MaxLeaseTTL()
if roleEntry.TokenTTL > defaultLeaseTTL {
resp.AddWarning(fmt.Sprintf("Given ttl of %d seconds greater than current mount/system default of %d seconds; ttl will be capped at login time", roleEntry.TokenTTL/time.Second, defaultLeaseTTL/time.Second))
}
if roleEntry.TokenMaxTTL > systemMaxTTL {
resp.AddWarning(fmt.Sprintf("Given max ttl of %d seconds greater than current mount/system default of %d seconds; max ttl will be capped at login time", roleEntry.TokenMaxTTL/time.Second, systemMaxTTL/time.Second))
resp.AddWarning(fmt.Sprintf("Given max ttl of %d seconds greater than current mount/system default of %d seconds; max ttl will be capped", roleEntry.TokenMaxTTL/time.Second, systemMaxTTL/time.Second))
}
if roleEntry.TokenMaxTTL != 0 && roleEntry.TokenMaxTTL < roleEntry.TokenTTL {
return logical.ErrorResponse("ttl should be shorter than max ttl"), nil
Expand Down
4 changes: 2 additions & 2 deletions builtin/credential/aws/path_role_test.go
View file
Open in desktop
Expand Up @@ -762,10 +762,10 @@ func TestAwsEc2_RoleDurationSeconds(t *testing.T) {
}

if resp.Data["ttl"].(int64) != 10 {
t.Fatalf("bad: period; expected: 10, actual: %d", resp.Data["ttl"])
t.Fatalf("bad: ttl; expected: 10, actual: %d", resp.Data["ttl"])
}
if resp.Data["max_ttl"].(int64) != 20 {
t.Fatalf("bad: period; expected: 20, actual: %d", resp.Data["max_ttl"])
t.Fatalf("bad: max_ttl; expected: 20, actual: %d", resp.Data["max_ttl"])
}
if resp.Data["period"].(int64) != 30 {
t.Fatalf("bad: period; expected: 30, actual: %d", resp.Data["period"])
Expand Down
3 changes: 3 additions & 0 deletions changelog/12026.txt
View file
Open in desktop
@@ -0,0 +1,3 @@
```release-note:bug
auth/aws: Remove warning stating AWS Token TTL will be capped by the Default Lease TTL.
```