73112c49fb
* logical/aws: Harden WAL entry creation If AWS IAM user creation failed in any way, the WAL corresponding to the IAM user would get left around and Vault would try to roll it back. However, because the user never existed, the rollback failed. Thus, the WAL would essentially get "stuck" and Vault would continually attempt to roll it back, failing every time. A similar situation could arise if the IAM user that Vault created got deleted out of band, or if Vault deleted it but was unable to write the lease revocation back to storage (e.g., a storage failure). This attempts to harden it in two ways. One is by deleting the WAL log entry if the IAM user creation fails. However, the WAL deletion could still fail, and this wouldn't help where the user is deleted out of band, so second, consider the user rolled back if the user just doesn't exist, under certain circumstances. Fixes #5190 * Fix segfault in expiration unit tests TestExpiration_Tidy was passing in a leaseEntry that had a nil Secret, which then caused a segfault as the changes to revokeEntry didn't check whether Secret was nil; this is probably unlikely to occur in real life, but good to be extra cautious. * Fix potential segfault Missed the else... * Respond to PR feedback
54 lines
1.5 KiB
Go
54 lines
1.5 KiB
Go
package logical
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
// LeaseOptions is an embeddable struct to capture common lease
|
|
// settings between a Secret and Auth
|
|
type LeaseOptions struct {
|
|
// TTL is the duration that this secret is valid for. Vault
|
|
// will automatically revoke it after the duration.
|
|
TTL time.Duration `json:"lease"`
|
|
|
|
// MaxTTL is the maximum duration that this secret is valid for.
|
|
MaxTTL time.Duration `json:"max_ttl"`
|
|
|
|
// Renewable, if true, means that this secret can be renewed.
|
|
Renewable bool `json:"renewable"`
|
|
|
|
// Increment will be the lease increment that the user requested.
|
|
// This is only available on a Renew operation and has no effect
|
|
// when returning a response.
|
|
Increment time.Duration `json:"-"`
|
|
|
|
// IssueTime is the time of issue for the original lease. This is
|
|
// only available on Renew and Revoke operations and has no effect when returning
|
|
// a response. It can be used to enforce maximum lease periods by
|
|
// a logical backend.
|
|
IssueTime time.Time `json:"-"`
|
|
}
|
|
|
|
// LeaseEnabled checks if leasing is enabled
|
|
func (l *LeaseOptions) LeaseEnabled() bool {
|
|
return l.TTL > 0
|
|
}
|
|
|
|
// LeaseTotal is the lease duration with a guard against a negative TTL
|
|
func (l *LeaseOptions) LeaseTotal() time.Duration {
|
|
if l.TTL <= 0 {
|
|
return 0
|
|
}
|
|
|
|
return l.TTL
|
|
}
|
|
|
|
// ExpirationTime computes the time until expiration including the grace period
|
|
func (l *LeaseOptions) ExpirationTime() time.Time {
|
|
var expireTime time.Time
|
|
if l.LeaseEnabled() {
|
|
expireTime = time.Now().Add(l.LeaseTotal())
|
|
}
|
|
return expireTime
|
|
}
|