03cf302e9a
* logbridge with hclog and identical output * Initial search & replace This compiles, but there is a fair amount of TODO and commented out code, especially around the plugin logclient/logserver code. * strip logbridge * fix majority of tests * update logxi aliases * WIP fixing tests * more test fixes * Update test to hclog * Fix format * Rename hclog -> log * WIP making hclog and logxi love each other * update logger_test.go * clean up merged comments * Replace RawLogger interface with a Logger * Add some logger names * Replace Trace with Debug * update builtin logical logging patterns * Fix build errors * More log updates * update log approach in command and builtin * More log updates * update helper, http, and logical directories * Update loggers * Log updates * Update logging * Update logging * Update logging * Update logging * update logging in physical * prefixing and lowercase * Update logging * Move phyisical logging name to server command * Fix som tests * address jims feedback so far * incorporate brians feedback so far * strip comments * move vault.go to logging package * update Debug to Trace * Update go-plugin deps * Update logging based on review comments * Updates from review * Unvendor logxi * Remove null_logger.go
358 lines
8.1 KiB
Go
358 lines
8.1 KiB
Go
package etcd
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
metrics "github.com/armon/go-metrics"
|
|
"github.com/coreos/etcd/clientv3"
|
|
"github.com/coreos/etcd/clientv3/concurrency"
|
|
"github.com/coreos/etcd/pkg/transport"
|
|
log "github.com/hashicorp/go-hclog"
|
|
"github.com/hashicorp/vault/helper/strutil"
|
|
"github.com/hashicorp/vault/physical"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// EtcdBackend is a physical backend that stores data at specific
|
|
// prefix within etcd. It is used for most production situations as
|
|
// it allows Vault to run on multiple machines in a highly-available manner.
|
|
type EtcdBackend struct {
|
|
logger log.Logger
|
|
path string
|
|
haEnabled bool
|
|
|
|
permitPool *physical.PermitPool
|
|
|
|
etcd *clientv3.Client
|
|
}
|
|
|
|
const (
|
|
// etcd3 default lease duration is 60s. set to 15s for faster recovery.
|
|
etcd3LockTimeoutInSeconds = 15
|
|
// etcd3 default request timeout is set to 5s. It should be long enough
|
|
// for most cases, even with internal retry.
|
|
etcd3RequestTimeout = 5 * time.Second
|
|
)
|
|
|
|
// Verify EtcdBackend satisfies the correct interfaces
|
|
var _ physical.Backend = (*EtcdBackend)(nil)
|
|
var _ physical.HABackend = (*EtcdBackend)(nil)
|
|
var _ physical.Lock = (*EtcdLock)(nil)
|
|
|
|
// newEtcd3Backend constructs a etcd3 backend.
|
|
func newEtcd3Backend(conf map[string]string, logger log.Logger) (physical.Backend, error) {
|
|
// Get the etcd path form the configuration.
|
|
path, ok := conf["path"]
|
|
if !ok {
|
|
path = "/vault"
|
|
}
|
|
|
|
// Ensure path is prefixed.
|
|
if !strings.HasPrefix(path, "/") {
|
|
path = "/" + path
|
|
}
|
|
|
|
endpoints, err := getEtcdEndpoints(conf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
cfg := clientv3.Config{
|
|
Endpoints: endpoints,
|
|
}
|
|
|
|
haEnabled := os.Getenv("ETCD_HA_ENABLED")
|
|
if haEnabled == "" {
|
|
haEnabled = conf["ha_enabled"]
|
|
}
|
|
if haEnabled == "" {
|
|
haEnabled = "false"
|
|
}
|
|
haEnabledBool, err := strconv.ParseBool(haEnabled)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("value [%v] of 'ha_enabled' could not be understood", haEnabled)
|
|
}
|
|
|
|
cert, hasCert := conf["tls_cert_file"]
|
|
key, hasKey := conf["tls_key_file"]
|
|
ca, hasCa := conf["tls_ca_file"]
|
|
if (hasCert && hasKey) || hasCa {
|
|
tls := transport.TLSInfo{
|
|
CAFile: ca,
|
|
CertFile: cert,
|
|
KeyFile: key,
|
|
}
|
|
|
|
tlscfg, err := tls.ClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cfg.TLS = tlscfg
|
|
}
|
|
|
|
// Set credentials.
|
|
username := os.Getenv("ETCD_USERNAME")
|
|
if username == "" {
|
|
username, _ = conf["username"]
|
|
}
|
|
|
|
password := os.Getenv("ETCD_PASSWORD")
|
|
if password == "" {
|
|
password, _ = conf["password"]
|
|
}
|
|
|
|
if username != "" && password != "" {
|
|
cfg.Username = username
|
|
cfg.Password = password
|
|
}
|
|
|
|
if maxReceive, ok := conf["max_receive_size"]; ok {
|
|
// grpc converts this to uint32 internally, so parse as that to avoid passing invalid values
|
|
val, err := strconv.ParseUint(maxReceive, 10, 32)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("value [%v] of 'max_receive_size' could not be understood", maxReceive)
|
|
}
|
|
cfg.MaxCallRecvMsgSize = int(val)
|
|
}
|
|
|
|
etcd, err := clientv3.New(cfg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ssync, ok := conf["sync"]
|
|
if !ok {
|
|
ssync = "true"
|
|
}
|
|
sync, err := strconv.ParseBool(ssync)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("value of 'sync' (%v) could not be understood", err)
|
|
}
|
|
|
|
if sync {
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
err := etcd.Sync(ctx)
|
|
cancel()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return &EtcdBackend{
|
|
path: path,
|
|
etcd: etcd,
|
|
permitPool: physical.NewPermitPool(physical.DefaultParallelOperations),
|
|
logger: logger,
|
|
haEnabled: haEnabledBool,
|
|
}, nil
|
|
}
|
|
|
|
func (c *EtcdBackend) Put(ctx context.Context, entry *physical.Entry) error {
|
|
defer metrics.MeasureSince([]string{"etcd", "put"}, time.Now())
|
|
|
|
c.permitPool.Acquire()
|
|
defer c.permitPool.Release()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
_, err := c.etcd.Put(ctx, path.Join(c.path, entry.Key), string(entry.Value))
|
|
return err
|
|
}
|
|
|
|
func (c *EtcdBackend) Get(ctx context.Context, key string) (*physical.Entry, error) {
|
|
defer metrics.MeasureSince([]string{"etcd", "get"}, time.Now())
|
|
|
|
c.permitPool.Acquire()
|
|
defer c.permitPool.Release()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
resp, err := c.etcd.Get(ctx, path.Join(c.path, key))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(resp.Kvs) == 0 {
|
|
return nil, nil
|
|
}
|
|
if len(resp.Kvs) > 1 {
|
|
return nil, errors.New("unexpected number of keys from a get request")
|
|
}
|
|
return &physical.Entry{
|
|
Key: key,
|
|
Value: resp.Kvs[0].Value,
|
|
}, nil
|
|
}
|
|
|
|
func (c *EtcdBackend) Delete(ctx context.Context, key string) error {
|
|
defer metrics.MeasureSince([]string{"etcd", "delete"}, time.Now())
|
|
|
|
c.permitPool.Acquire()
|
|
defer c.permitPool.Release()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
_, err := c.etcd.Delete(ctx, path.Join(c.path, key))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (c *EtcdBackend) List(ctx context.Context, prefix string) ([]string, error) {
|
|
defer metrics.MeasureSince([]string{"etcd", "list"}, time.Now())
|
|
|
|
c.permitPool.Acquire()
|
|
defer c.permitPool.Release()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
prefix = path.Join(c.path, prefix) + "/"
|
|
resp, err := c.etcd.Get(ctx, prefix, clientv3.WithPrefix())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
keys := []string{}
|
|
for _, kv := range resp.Kvs {
|
|
key := strings.TrimPrefix(string(kv.Key), prefix)
|
|
key = strings.TrimPrefix(key, "/")
|
|
|
|
if len(key) == 0 {
|
|
continue
|
|
}
|
|
|
|
if i := strings.Index(key, "/"); i == -1 {
|
|
keys = append(keys, key)
|
|
} else if i != -1 {
|
|
keys = strutil.AppendIfMissing(keys, key[:i+1])
|
|
}
|
|
}
|
|
return keys, nil
|
|
}
|
|
|
|
func (e *EtcdBackend) HAEnabled() bool {
|
|
return e.haEnabled
|
|
}
|
|
|
|
// EtcdLock implements a lock using and etcd backend.
|
|
type EtcdLock struct {
|
|
lock sync.Mutex
|
|
held bool
|
|
|
|
etcdSession *concurrency.Session
|
|
etcdMu *concurrency.Mutex
|
|
|
|
prefix string
|
|
value string
|
|
|
|
etcd *clientv3.Client
|
|
}
|
|
|
|
// Lock is used for mutual exclusion based on the given key.
|
|
func (c *EtcdBackend) LockWith(key, value string) (physical.Lock, error) {
|
|
p := path.Join(c.path, key)
|
|
return &EtcdLock{
|
|
prefix: p,
|
|
value: value,
|
|
etcd: c.etcd,
|
|
}, nil
|
|
}
|
|
|
|
func (c *EtcdLock) Lock(stopCh <-chan struct{}) (<-chan struct{}, error) {
|
|
c.lock.Lock()
|
|
defer c.lock.Unlock()
|
|
|
|
if c.etcdMu == nil {
|
|
if err := c.initMu(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
if c.held {
|
|
return nil, EtcdLockHeldError
|
|
}
|
|
|
|
select {
|
|
case _, ok := <-c.etcdSession.Done():
|
|
if !ok {
|
|
// The session's done channel is closed, so the session is over,
|
|
// and we need a new lock with a new session.
|
|
if err := c.initMu(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
default:
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
go func() {
|
|
<-stopCh
|
|
cancel()
|
|
}()
|
|
if err := c.etcdMu.Lock(ctx); err != nil {
|
|
if err == context.Canceled {
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
pctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
if _, err := c.etcd.Put(pctx, c.etcdMu.Key(), c.value, clientv3.WithLease(c.etcdSession.Lease())); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
c.held = true
|
|
|
|
return c.etcdSession.Done(), nil
|
|
}
|
|
|
|
func (c *EtcdLock) Unlock() error {
|
|
c.lock.Lock()
|
|
defer c.lock.Unlock()
|
|
|
|
if !c.held {
|
|
return EtcdLockNotHeldError
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
return c.etcdMu.Unlock(ctx)
|
|
}
|
|
|
|
func (c *EtcdLock) Value() (bool, string, error) {
|
|
ctx, cancel := context.WithTimeout(context.Background(), etcd3RequestTimeout)
|
|
defer cancel()
|
|
|
|
resp, err := c.etcd.Get(ctx,
|
|
c.prefix, clientv3.WithPrefix(),
|
|
clientv3.WithSort(clientv3.SortByCreateRevision, clientv3.SortAscend))
|
|
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
if len(resp.Kvs) == 0 {
|
|
return false, "", nil
|
|
}
|
|
|
|
return true, string(resp.Kvs[0].Value), nil
|
|
}
|
|
|
|
func (c *EtcdLock) initMu() error {
|
|
session, err := concurrency.NewSession(c.etcd, concurrency.WithTTL(etcd3LockTimeoutInSeconds))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.etcdSession = session
|
|
c.etcdMu = concurrency.NewMutex(session, c.prefix)
|
|
return nil
|
|
}
|