2015-03-12 19:44:22 +00:00
|
|
|
package vault
|
|
|
|
|
2015-03-13 17:55:54 +00:00
|
|
|
import (
|
|
|
|
"encoding/json"
|
|
|
|
"fmt"
|
2015-03-16 01:06:19 +00:00
|
|
|
"log"
|
|
|
|
"os"
|
2015-03-13 17:55:54 +00:00
|
|
|
"path"
|
2015-03-16 18:33:59 +00:00
|
|
|
"strings"
|
2015-03-13 18:31:43 +00:00
|
|
|
"sync"
|
2015-03-13 17:55:54 +00:00
|
|
|
"time"
|
2015-03-15 20:52:43 +00:00
|
|
|
|
|
|
|
"github.com/hashicorp/vault/logical"
|
2015-03-13 17:55:54 +00:00
|
|
|
)
|
2015-03-13 01:38:15 +00:00
|
|
|
|
2015-03-12 19:44:22 +00:00
|
|
|
const (
|
|
|
|
// expirationSubPath is the sub-path used for the expiration manager
|
|
|
|
// view. This is nested under the system view.
|
|
|
|
expirationSubPath = "expire/"
|
2015-03-16 18:33:59 +00:00
|
|
|
|
|
|
|
// maxRevokeAttempts limits how many revoke attempts are made
|
|
|
|
maxRevokeAttempts = 6
|
|
|
|
|
|
|
|
// revokeRetryBase is a baseline retry time
|
|
|
|
revokeRetryBase = 10 * time.Second
|
|
|
|
|
|
|
|
// minRevokeDelay is used to prevent an instant revoke on restore
|
|
|
|
minRevokeDelay = 5 * time.Second
|
2015-04-03 00:45:42 +00:00
|
|
|
|
|
|
|
// maxLeaseDuration is the maximum lease duration
|
|
|
|
maxLeaseDuration = 30 * 24 * time.Hour
|
|
|
|
|
|
|
|
// defaultLeaseDuration is the lease duration used when no lease is specified
|
|
|
|
defaultLeaseDuration = maxLeaseDuration
|
2015-03-12 19:44:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// ExpirationManager is used by the Core to manage leases. Secrets
|
|
|
|
// can provide a lease, meaning that they can be renewed or revoked.
|
|
|
|
// If a secret is not renewed in timely manner, it may be expired, and
|
|
|
|
// the ExpirationManager will handle doing automatic revocation.
|
|
|
|
type ExpirationManager struct {
|
2015-03-24 01:00:14 +00:00
|
|
|
router *Router
|
|
|
|
view *BarrierView
|
|
|
|
tokenStore *TokenStore
|
|
|
|
logger *log.Logger
|
2015-03-16 01:06:19 +00:00
|
|
|
|
|
|
|
pending map[string]*time.Timer
|
2015-03-16 18:33:59 +00:00
|
|
|
pendingLock sync.Mutex
|
2015-03-12 19:44:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewExpirationManager creates a new ExpirationManager that is backed
|
2015-03-13 01:38:15 +00:00
|
|
|
// using a given view, and uses the provided router for revocation.
|
2015-03-24 01:00:14 +00:00
|
|
|
func NewExpirationManager(router *Router, view *BarrierView, ts *TokenStore, logger *log.Logger) *ExpirationManager {
|
2015-03-16 01:06:19 +00:00
|
|
|
if logger == nil {
|
|
|
|
logger = log.New(os.Stderr, "", log.LstdFlags)
|
|
|
|
}
|
2015-03-12 19:44:22 +00:00
|
|
|
exp := &ExpirationManager{
|
2015-03-24 01:00:14 +00:00
|
|
|
router: router,
|
|
|
|
view: view,
|
|
|
|
tokenStore: ts,
|
|
|
|
logger: logger,
|
|
|
|
pending: make(map[string]*time.Timer),
|
2015-03-12 19:44:22 +00:00
|
|
|
}
|
|
|
|
return exp
|
|
|
|
}
|
|
|
|
|
|
|
|
// setupExpiration is invoked after we've loaded the mount table to
|
|
|
|
// initialize the expiration manager
|
|
|
|
func (c *Core) setupExpiration() error {
|
|
|
|
// Create a sub-view
|
|
|
|
view := c.systemView.SubView(expirationSubPath)
|
|
|
|
|
|
|
|
// Create the manager
|
2015-03-24 01:00:14 +00:00
|
|
|
mgr := NewExpirationManager(c.router, view, c.tokenStore, c.logger)
|
2015-03-12 19:44:22 +00:00
|
|
|
c.expiration = mgr
|
2015-03-13 18:20:36 +00:00
|
|
|
|
2015-04-03 18:40:08 +00:00
|
|
|
// Link the token store to this
|
|
|
|
c.tokenStore.SetExpirationManager(mgr)
|
|
|
|
|
2015-03-13 18:20:36 +00:00
|
|
|
// Restore the existing state
|
|
|
|
if err := c.expiration.Restore(); err != nil {
|
|
|
|
return fmt.Errorf("expiration state restore failed: %v", err)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// stopExpiration is used to stop the expiration manager before
|
|
|
|
// sealing the Vault.
|
|
|
|
func (c *Core) stopExpiration() error {
|
|
|
|
if err := c.expiration.Stop(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
c.expiration = nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Restore is used to recover the lease states when starting.
|
|
|
|
// This is used after starting the vault.
|
|
|
|
func (m *ExpirationManager) Restore() error {
|
2015-03-16 18:33:59 +00:00
|
|
|
m.pendingLock.Lock()
|
|
|
|
defer m.pendingLock.Unlock()
|
|
|
|
|
|
|
|
// Accumulate existing leases
|
2015-03-18 19:03:33 +00:00
|
|
|
existing, err := CollectKeys(m.view)
|
|
|
|
if err != nil {
|
2015-03-16 18:33:59 +00:00
|
|
|
return fmt.Errorf("failed to scan for leases: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Restore each key
|
|
|
|
for _, vaultID := range existing {
|
|
|
|
// Load the entry
|
|
|
|
le, err := m.loadEntry(vaultID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// If there is no entry, nothing to restore
|
|
|
|
if le == nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2015-04-01 04:01:12 +00:00
|
|
|
// If there is no expiry time, don't do anything
|
|
|
|
if le.ExpireTime.IsZero() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2015-03-16 18:33:59 +00:00
|
|
|
// Determine the remaining time to expiration
|
2015-03-16 22:11:35 +00:00
|
|
|
expires := le.ExpireTime.Sub(time.Now().UTC())
|
2015-03-16 18:33:59 +00:00
|
|
|
if expires <= 0 {
|
|
|
|
expires = minRevokeDelay
|
|
|
|
}
|
|
|
|
|
|
|
|
// Setup revocation timer
|
|
|
|
m.pending[le.VaultID] = time.AfterFunc(expires, func() {
|
|
|
|
m.expireID(le.VaultID)
|
|
|
|
})
|
|
|
|
}
|
2015-03-24 00:27:46 +00:00
|
|
|
if len(m.pending) > 0 {
|
|
|
|
m.logger.Printf("[INFO] expire: restored %d leases", len(m.pending))
|
|
|
|
}
|
2015-03-13 18:20:36 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stop is used to prevent further automatic revocations.
|
|
|
|
// This must be called before sealing the view.
|
|
|
|
func (m *ExpirationManager) Stop() error {
|
2015-03-16 01:06:19 +00:00
|
|
|
// Stop all the pending expiration timers
|
|
|
|
m.pendingLock.Lock()
|
|
|
|
for _, timer := range m.pending {
|
|
|
|
timer.Stop()
|
2015-03-13 18:31:43 +00:00
|
|
|
}
|
2015-03-16 01:06:19 +00:00
|
|
|
m.pending = make(map[string]*time.Timer)
|
|
|
|
m.pendingLock.Unlock()
|
2015-03-12 19:44:22 +00:00
|
|
|
return nil
|
|
|
|
}
|
2015-03-13 01:38:15 +00:00
|
|
|
|
|
|
|
// Revoke is used to revoke a secret named by the given vaultID
|
|
|
|
func (m *ExpirationManager) Revoke(vaultID string) error {
|
2015-03-16 18:33:59 +00:00
|
|
|
// Load the entry
|
|
|
|
le, err := m.loadEntry(vaultID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// If there is no entry, nothing to revoke
|
|
|
|
if le == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Revoke the entry
|
|
|
|
if err := m.revokeEntry(le); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete the entry
|
|
|
|
if err := m.deleteEntry(vaultID); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clear the expiration handler
|
|
|
|
m.pendingLock.Lock()
|
|
|
|
if timer, ok := m.pending[vaultID]; ok {
|
|
|
|
timer.Stop()
|
|
|
|
delete(m.pending, vaultID)
|
|
|
|
}
|
|
|
|
m.pendingLock.Unlock()
|
2015-03-13 01:38:15 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// RevokePrefix is used to revoke all secrets with a given prefix.
|
|
|
|
// The prefix maps to that of the mount table to make this simpler
|
|
|
|
// to reason about.
|
|
|
|
func (m *ExpirationManager) RevokePrefix(prefix string) error {
|
2015-03-16 21:59:37 +00:00
|
|
|
// Ensure there is a trailing slash
|
|
|
|
if !strings.HasSuffix(prefix, "/") {
|
|
|
|
prefix = prefix + "/"
|
|
|
|
}
|
|
|
|
|
2015-03-16 18:33:59 +00:00
|
|
|
// Accumulate existing leases
|
2015-03-16 21:59:37 +00:00
|
|
|
sub := m.view.SubView(prefix)
|
2015-03-18 19:03:33 +00:00
|
|
|
existing, err := CollectKeys(sub)
|
|
|
|
if err != nil {
|
2015-03-16 18:33:59 +00:00
|
|
|
return fmt.Errorf("failed to scan for leases: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Revoke all the keys
|
2015-03-16 21:59:37 +00:00
|
|
|
for idx, suffix := range existing {
|
|
|
|
vaultID := prefix + suffix
|
2015-03-16 18:33:59 +00:00
|
|
|
if err := m.Revoke(vaultID); err != nil {
|
|
|
|
return fmt.Errorf("failed to revoke '%s' (%d / %d): %v",
|
|
|
|
vaultID, idx+1, len(existing), err)
|
|
|
|
}
|
|
|
|
}
|
2015-03-13 01:38:15 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Renew is used to renew a secret using the given vaultID
|
|
|
|
// and a renew interval. The increment may be ignored.
|
2015-03-16 20:29:51 +00:00
|
|
|
func (m *ExpirationManager) Renew(vaultID string, increment time.Duration) (*logical.Response, error) {
|
2015-03-16 18:33:59 +00:00
|
|
|
// Load the entry
|
|
|
|
le, err := m.loadEntry(vaultID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// If there is no entry, cannot review
|
|
|
|
if le == nil {
|
|
|
|
return nil, fmt.Errorf("lease not found")
|
|
|
|
}
|
|
|
|
|
2015-03-16 20:29:51 +00:00
|
|
|
// Determine if the lease is expired
|
|
|
|
if le.ExpireTime.Before(time.Now().UTC()) {
|
2015-03-16 18:33:59 +00:00
|
|
|
return nil, fmt.Errorf("lease expired")
|
|
|
|
}
|
|
|
|
|
2015-03-16 20:29:51 +00:00
|
|
|
// Attempt to renew the entry
|
2015-03-16 21:59:37 +00:00
|
|
|
resp, err := m.renewEntry(le, increment)
|
2015-03-16 20:29:51 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2015-03-16 18:33:59 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 20:29:51 +00:00
|
|
|
// Fast-path if there is no lease
|
2015-03-19 22:11:42 +00:00
|
|
|
if resp == nil || resp.Secret == nil || resp.Secret.Lease == 0 {
|
2015-03-16 20:29:51 +00:00
|
|
|
return resp, nil
|
2015-03-16 18:33:59 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 20:29:51 +00:00
|
|
|
// Validate the lease
|
2015-03-19 22:11:42 +00:00
|
|
|
if err := resp.Secret.Validate(); err != nil {
|
2015-03-16 20:29:51 +00:00
|
|
|
return nil, err
|
2015-03-16 18:33:59 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 23:11:55 +00:00
|
|
|
// Attach the VaultID
|
2015-03-19 22:11:42 +00:00
|
|
|
resp.Secret.VaultID = vaultID
|
2015-03-16 23:11:55 +00:00
|
|
|
|
2015-03-16 18:33:59 +00:00
|
|
|
// Update the lease entry
|
2015-04-01 04:01:12 +00:00
|
|
|
var expireTime time.Time
|
2015-03-19 22:11:42 +00:00
|
|
|
leaseTotal := resp.Secret.Lease + resp.Secret.LeaseGracePeriod
|
2015-04-01 04:01:12 +00:00
|
|
|
if resp.Secret.Lease > 0 {
|
|
|
|
expireTime = time.Now().UTC().Add(leaseTotal)
|
|
|
|
}
|
2015-03-16 20:29:51 +00:00
|
|
|
le.Data = resp.Data
|
2015-03-19 22:11:42 +00:00
|
|
|
le.Secret = resp.Secret
|
2015-04-01 04:01:12 +00:00
|
|
|
le.ExpireTime = expireTime
|
2015-03-16 18:33:59 +00:00
|
|
|
if err := m.persistEntry(le); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the expiration time
|
|
|
|
m.pendingLock.Lock()
|
|
|
|
if timer, ok := m.pending[vaultID]; ok {
|
2015-03-17 00:09:18 +00:00
|
|
|
timer.Reset(leaseTotal)
|
2015-03-16 18:33:59 +00:00
|
|
|
}
|
|
|
|
m.pendingLock.Unlock()
|
|
|
|
|
2015-03-16 20:29:51 +00:00
|
|
|
// Return the response
|
|
|
|
return resp, nil
|
2015-03-13 01:38:15 +00:00
|
|
|
}
|
|
|
|
|
2015-04-03 18:58:10 +00:00
|
|
|
// RenewToken is used to renew a token which does not need to
|
|
|
|
// invoke a logical backend.
|
2015-04-06 23:35:39 +00:00
|
|
|
func (m *ExpirationManager) RenewToken(source string, token string) (*logical.Auth, error) {
|
2015-04-03 18:58:10 +00:00
|
|
|
// Compute the Vault ID
|
|
|
|
vaultID := path.Join(source, m.tokenStore.SaltID(token))
|
|
|
|
|
|
|
|
// Load the entry
|
|
|
|
le, err := m.loadEntry(vaultID)
|
|
|
|
if err != nil {
|
2015-04-06 23:35:39 +00:00
|
|
|
return nil, err
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// If there is no entry, cannot review
|
|
|
|
if le == nil {
|
2015-04-06 23:35:39 +00:00
|
|
|
return nil, fmt.Errorf("lease not found")
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Determine if the lease is expired
|
|
|
|
if le.ExpireTime.Before(time.Now().UTC()) {
|
2015-04-06 23:35:39 +00:00
|
|
|
return nil, fmt.Errorf("lease expired")
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Update the lease entry
|
|
|
|
var expireTime time.Time
|
|
|
|
leaseTotal := le.Auth.Lease + le.Auth.LeaseGracePeriod
|
|
|
|
if le.Auth.Lease > 0 {
|
|
|
|
expireTime = time.Now().UTC().Add(leaseTotal)
|
|
|
|
}
|
|
|
|
le.ExpireTime = expireTime
|
|
|
|
if err := m.persistEntry(le); err != nil {
|
2015-04-06 23:35:39 +00:00
|
|
|
return nil, err
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Update the expiration time
|
|
|
|
m.pendingLock.Lock()
|
|
|
|
if timer, ok := m.pending[vaultID]; ok {
|
|
|
|
timer.Reset(leaseTotal)
|
|
|
|
}
|
|
|
|
m.pendingLock.Unlock()
|
2015-04-06 23:35:39 +00:00
|
|
|
return le.Auth, nil
|
2015-04-03 18:58:10 +00:00
|
|
|
}
|
|
|
|
|
2015-03-13 01:38:15 +00:00
|
|
|
// Register is used to take a request and response with an associated
|
|
|
|
// lease. The secret gets assigned a vaultId and the management of
|
|
|
|
// of lease is assumed by the expiration manager.
|
2015-03-15 21:53:41 +00:00
|
|
|
func (m *ExpirationManager) Register(req *logical.Request, resp *logical.Response) (string, error) {
|
2015-03-19 22:11:42 +00:00
|
|
|
// Ignore if there is no leased secret
|
2015-04-01 04:04:10 +00:00
|
|
|
if resp == nil || resp.Secret == nil {
|
2015-03-13 17:55:54 +00:00
|
|
|
return "", nil
|
|
|
|
}
|
|
|
|
|
2015-03-19 22:11:42 +00:00
|
|
|
// Validate the secret
|
|
|
|
if err := resp.Secret.Validate(); err != nil {
|
2015-03-13 17:55:54 +00:00
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a lease entry
|
2015-03-13 18:37:07 +00:00
|
|
|
now := time.Now().UTC()
|
2015-03-19 22:11:42 +00:00
|
|
|
leaseTotal := resp.Secret.Lease + resp.Secret.LeaseGracePeriod
|
2015-04-01 04:01:12 +00:00
|
|
|
var expireTime time.Time
|
|
|
|
if resp.Secret.Lease > 0 {
|
|
|
|
expireTime = now.Add(leaseTotal)
|
|
|
|
}
|
2015-03-13 17:55:54 +00:00
|
|
|
le := leaseEntry{
|
2015-03-16 18:33:59 +00:00
|
|
|
VaultID: path.Join(req.Path, generateUUID()),
|
|
|
|
Path: req.Path,
|
|
|
|
Data: resp.Data,
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret: resp.Secret,
|
2015-03-16 18:33:59 +00:00
|
|
|
IssueTime: now,
|
2015-04-01 04:01:12 +00:00
|
|
|
ExpireTime: expireTime,
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 01:06:19 +00:00
|
|
|
// Encode the entry
|
|
|
|
if err := m.persistEntry(&le); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
2015-04-01 04:01:12 +00:00
|
|
|
// 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()
|
|
|
|
}
|
2015-03-16 01:06:19 +00:00
|
|
|
|
|
|
|
// Done
|
|
|
|
return le.VaultID, nil
|
|
|
|
}
|
|
|
|
|
2015-04-03 00:45:42 +00:00
|
|
|
// RegisterAuth is used to take an Auth response with an associated lease.
|
|
|
|
// The token does not get a VaultID, but the lease management is handled by
|
|
|
|
// the expiration manager.
|
|
|
|
func (m *ExpirationManager) RegisterAuth(source string, auth *logical.Auth) error {
|
2015-03-24 01:11:15 +00:00
|
|
|
// Create a lease entry
|
|
|
|
now := time.Now().UTC()
|
2015-04-03 00:45:42 +00:00
|
|
|
leaseTotal := auth.Lease + auth.LeaseGracePeriod
|
2015-03-24 01:11:15 +00:00
|
|
|
le := leaseEntry{
|
2015-04-03 00:45:42 +00:00
|
|
|
VaultID: path.Join(source, m.tokenStore.SaltID(auth.ClientToken)),
|
2015-04-03 18:58:10 +00:00
|
|
|
Auth: auth,
|
2015-04-03 00:45:42 +00:00
|
|
|
Path: source,
|
2015-03-24 01:11:15 +00:00
|
|
|
IssueTime: now,
|
|
|
|
ExpireTime: now.Add(leaseTotal),
|
|
|
|
}
|
|
|
|
|
|
|
|
// Encode the entry
|
|
|
|
if err := m.persistEntry(&le); err != nil {
|
2015-04-03 00:45:42 +00:00
|
|
|
return err
|
2015-03-24 01:11:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Setup revocation timer
|
|
|
|
m.pendingLock.Lock()
|
|
|
|
m.pending[le.VaultID] = time.AfterFunc(leaseTotal, func() {
|
|
|
|
m.expireID(le.VaultID)
|
|
|
|
})
|
|
|
|
m.pendingLock.Unlock()
|
2015-04-03 00:45:42 +00:00
|
|
|
return nil
|
2015-03-24 01:11:15 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 01:06:19 +00:00
|
|
|
// expireID is invoked when a given ID is expired
|
|
|
|
func (m *ExpirationManager) expireID(vaultID string) {
|
|
|
|
// Clear from the pending expiration
|
|
|
|
m.pendingLock.Lock()
|
|
|
|
delete(m.pending, vaultID)
|
|
|
|
m.pendingLock.Unlock()
|
|
|
|
|
2015-03-16 18:33:59 +00:00
|
|
|
for attempt := uint(0); attempt < maxRevokeAttempts; attempt++ {
|
|
|
|
err := m.Revoke(vaultID)
|
|
|
|
if err == nil {
|
|
|
|
m.logger.Printf("[INFO] expire: revoked '%s'", vaultID)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
m.logger.Printf("[ERR] expire: failed to revoke '%s': %v", vaultID, err)
|
|
|
|
time.Sleep((1 << attempt) * revokeRetryBase)
|
2015-03-16 01:06:19 +00:00
|
|
|
}
|
2015-03-16 18:33:59 +00:00
|
|
|
m.logger.Printf("[ERR] expire: maximum revoke attempts for '%s' reached", vaultID)
|
2015-03-16 01:06:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// revokeEntry is used to attempt revocation of an internal entry
|
|
|
|
func (m *ExpirationManager) revokeEntry(le *leaseEntry) error {
|
2015-03-24 01:11:15 +00:00
|
|
|
// Revocation of login tokens is special since we can by-pass the
|
|
|
|
// backend and directly interact with the token store
|
2015-04-03 18:58:10 +00:00
|
|
|
if le.Auth != nil {
|
|
|
|
if err := m.tokenStore.RevokeTree(le.Auth.ClientToken); err != nil {
|
2015-03-24 01:11:15 +00:00
|
|
|
return fmt.Errorf("failed to revoke token: %v", err)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Handle standard revocation via backends
|
2015-03-19 19:20:25 +00:00
|
|
|
_, err := m.router.Route(logical.RevokeRequest(
|
2015-03-19 22:11:42 +00:00
|
|
|
le.Path, le.Secret, le.Data))
|
2015-03-16 18:33:59 +00:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to revoke entry: %v", err)
|
|
|
|
}
|
|
|
|
return nil
|
2015-03-16 01:06:19 +00:00
|
|
|
}
|
|
|
|
|
2015-03-16 20:29:51 +00:00
|
|
|
// renewEntry is used to attempt renew of an internal entry
|
2015-03-16 21:59:37 +00:00
|
|
|
func (m *ExpirationManager) renewEntry(le *leaseEntry, increment time.Duration) (*logical.Response, error) {
|
2015-03-19 22:11:42 +00:00
|
|
|
secret := *le.Secret
|
|
|
|
secret.LeaseIncrement = increment
|
|
|
|
secret.VaultID = ""
|
|
|
|
|
2015-03-19 19:20:25 +00:00
|
|
|
resp, err := m.router.Route(logical.RenewRequest(
|
2015-03-19 22:11:42 +00:00
|
|
|
le.Path, &secret, le.Data))
|
2015-03-16 20:29:51 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("failed to renew entry: %v", err)
|
|
|
|
}
|
|
|
|
return resp, nil
|
|
|
|
}
|
|
|
|
|
2015-03-16 01:06:19 +00:00
|
|
|
// loadEntry is used to read a lease entry
|
|
|
|
func (m *ExpirationManager) loadEntry(vaultID string) (*leaseEntry, error) {
|
|
|
|
out, err := m.view.Get(vaultID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("failed to read lease entry: %v", err)
|
|
|
|
}
|
|
|
|
if out == nil {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
le, err := decodeLeaseEntry(out.Value)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("failed to decode lease entry: %v", err)
|
|
|
|
}
|
|
|
|
return le, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// persistEntry is used to persist a lease entry
|
|
|
|
func (m *ExpirationManager) persistEntry(le *leaseEntry) error {
|
2015-03-13 17:55:54 +00:00
|
|
|
// Encode the entry
|
|
|
|
buf, err := le.encode()
|
|
|
|
if err != nil {
|
2015-03-16 01:06:19 +00:00
|
|
|
return fmt.Errorf("failed to encode lease entry: %v", err)
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Write out to the view
|
2015-03-15 20:52:43 +00:00
|
|
|
ent := logical.StorageEntry{
|
2015-03-13 17:55:54 +00:00
|
|
|
Key: le.VaultID,
|
|
|
|
Value: buf,
|
|
|
|
}
|
|
|
|
if err := m.view.Put(&ent); err != nil {
|
2015-03-16 01:06:19 +00:00
|
|
|
return fmt.Errorf("failed to persist lease entry: %v", err)
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
2015-03-16 01:06:19 +00:00
|
|
|
return nil
|
|
|
|
}
|
2015-03-13 17:55:54 +00:00
|
|
|
|
2015-03-16 01:06:19 +00:00
|
|
|
// deleteEntry is used to delete a lease entry
|
|
|
|
func (m *ExpirationManager) deleteEntry(vaultID string) error {
|
|
|
|
if err := m.view.Delete(vaultID); err != nil {
|
|
|
|
return fmt.Errorf("failed to delete lease entry: %v", err)
|
|
|
|
}
|
|
|
|
return nil
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// leaseEntry is used to structure the values the expiration
|
|
|
|
// manager stores. This is used to handle renew and revocation.
|
|
|
|
type leaseEntry struct {
|
2015-03-16 18:33:59 +00:00
|
|
|
VaultID string `json:"vault_id"`
|
|
|
|
Path string `json:"path"`
|
|
|
|
Data map[string]interface{} `json:"data"`
|
2015-03-19 22:11:42 +00:00
|
|
|
Secret *logical.Secret `json:"secret"`
|
2015-04-03 18:58:10 +00:00
|
|
|
Auth *logical.Auth `json:"auth"`
|
2015-03-16 18:33:59 +00:00
|
|
|
IssueTime time.Time `json:"issue_time"`
|
|
|
|
ExpireTime time.Time `json:"expire_time"`
|
2015-03-13 17:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// encode is used to JSON encode the lease entry
|
|
|
|
func (l *leaseEntry) encode() ([]byte, error) {
|
|
|
|
return json.Marshal(l)
|
|
|
|
}
|
|
|
|
|
|
|
|
// decodeLeaseEntry is used to reverse encode and return a new entry
|
|
|
|
func decodeLeaseEntry(buf []byte) (*leaseEntry, error) {
|
|
|
|
out := new(leaseEntry)
|
|
|
|
return out, json.Unmarshal(buf, out)
|
2015-03-13 01:38:15 +00:00
|
|
|
}
|