luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

vault: register zero lease entries with the expiration manager

Browse source 
/cc @armon - would appreciate a review on this one
This commit is contained in:
Mitchell Hashimoto 2015-03-31 21:01:12 -07:00
parent b5e4e4bf25
commit 2c9ebecda7
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vault/core.go
View file

@ -250,10 +250,7 @@ func (c *Core) handleRequest(req *logical.Request) (*logical.Response, error) {
resp, err := c.router.Route(req)
// If there is a secret, we must register it with the expiration manager.
//
// TODO(mitchellh): what about secrets with a lease of 0, do we still
// record them so they're revoked during unmount?
if resp != nil && resp.Secret != nil && resp.Secret.Lease > 0 {
if resp != nil && resp.Secret != nil {
vaultID, err := c.expiration.Register(req, resp)
if err != nil {
c.logger.Printf(

31
vault/expiration.go
View file

@ -110,6 +110,11 @@ func (m *ExpirationManager) Restore() error {
continue
}
// If there is no expiry time, don't do anything
if le.ExpireTime.IsZero() {
continue
}
// Determine the remaining time to expiration
expires := le.ExpireTime.Sub(time.Now().UTC())
if expires <= 0 {
@ -239,10 +244,14 @@ func (m *ExpirationManager) Renew(vaultID string, increment time.Duration) (*log
resp.Secret.VaultID = vaultID
// Update the lease entry
var expireTime time.Time
leaseTotal := resp.Secret.Lease + resp.Secret.LeaseGracePeriod
if resp.Secret.Lease > 0 {
expireTime = time.Now().UTC().Add(leaseTotal)
}
le.Data = resp.Data
le.Secret = resp.Secret
le.ExpireTime = time.Now().UTC().Add(leaseTotal)
le.ExpireTime = expireTime
if err := m.persistEntry(le); err != nil {
return nil, err
}
@ -275,13 +284,17 @@ func (m *ExpirationManager) Register(req *logical.Request, resp *logical.Respons
// Create a lease entry
now := time.Now().UTC()
leaseTotal := resp.Secret.Lease + resp.Secret.LeaseGracePeriod
var expireTime time.Time
if resp.Secret.Lease > 0 {
expireTime = now.Add(leaseTotal)
}
le := leaseEntry{
VaultID: path.Join(req.Path, generateUUID()),
Path: req.Path,
Data: resp.Data,
Secret: resp.Secret,
IssueTime: now,
ExpireTime: now.Add(leaseTotal),
ExpireTime: expireTime,
}
// Encode the entry
@ -289,12 +302,14 @@ func (m *ExpirationManager) Register(req *logical.Request, resp *logical.Respons
return "", err
}
// Setup revocation timer
m.pendingLock.Lock()
m.pending[le.VaultID] = time.AfterFunc(leaseTotal, func() {
m.expireID(le.VaultID)
})
m.pendingLock.Unlock()
// Setup revocation timer if there is a lease
if !expireTime.IsZero() {
m.pendingLock.Lock()
m.pending[le.VaultID] = time.AfterFunc(leaseTotal, func() {
m.expireID(le.VaultID)
})
m.pendingLock.Unlock()
}
// Done
return le.VaultID, nil