2015-03-05 21:27:35 +00:00
|
|
|
package vault
|
|
|
|
|
|
|
|
import (
|
2018-01-19 06:44:44 +00:00
|
|
|
"context"
|
2015-03-05 21:27:35 +00:00
|
|
|
"crypto/aes"
|
|
|
|
"crypto/cipher"
|
|
|
|
"crypto/rand"
|
2015-05-28 18:28:33 +00:00
|
|
|
"crypto/subtle"
|
2015-05-27 23:01:25 +00:00
|
|
|
"encoding/binary"
|
2018-09-05 15:49:32 +00:00
|
|
|
"errors"
|
2015-03-05 21:27:35 +00:00
|
|
|
"fmt"
|
2015-03-12 18:27:32 +00:00
|
|
|
"strings"
|
2015-03-05 21:27:35 +00:00
|
|
|
"sync"
|
2015-04-08 23:43:17 +00:00
|
|
|
"time"
|
2015-03-05 21:27:35 +00:00
|
|
|
|
2019-01-09 00:48:57 +00:00
|
|
|
metrics "github.com/armon/go-metrics"
|
2018-04-05 15:49:21 +00:00
|
|
|
"github.com/hashicorp/errwrap"
|
2016-07-06 16:25:40 +00:00
|
|
|
"github.com/hashicorp/vault/helper/jsonutil"
|
2017-11-30 14:43:07 +00:00
|
|
|
"github.com/hashicorp/vault/helper/strutil"
|
2019-01-31 14:25:18 +00:00
|
|
|
"github.com/hashicorp/vault/logical"
|
2015-03-05 21:27:35 +00:00
|
|
|
"github.com/hashicorp/vault/physical"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
2015-05-27 23:01:25 +00:00
|
|
|
// initialKeyTerm is the hard coded initial key term. This is
|
|
|
|
// used only for values that are not encrypted with the keyring.
|
|
|
|
initialKeyTerm = 1
|
2015-04-17 23:51:13 +00:00
|
|
|
|
2015-05-22 21:00:29 +00:00
|
|
|
// termSize the number of bytes used for the key term.
|
|
|
|
termSize = 4
|
2015-09-19 19:33:18 +00:00
|
|
|
)
|
2015-04-17 23:51:13 +00:00
|
|
|
|
2015-09-19 19:33:18 +00:00
|
|
|
// Versions of the AESGCM storage methodology
|
|
|
|
const (
|
|
|
|
AESGCMVersion1 = 0x1
|
|
|
|
AESGCMVersion2 = 0x2
|
2015-03-05 21:27:35 +00:00
|
|
|
)
|
|
|
|
|
2015-03-05 21:57:45 +00:00
|
|
|
// barrierInit is the JSON encoded value stored
|
|
|
|
type barrierInit struct {
|
|
|
|
Version int // Version is the current format version
|
|
|
|
Key []byte // Key is the primary encryption key
|
|
|
|
}
|
|
|
|
|
2018-01-19 06:44:44 +00:00
|
|
|
// Validate AESGCMBarrier satisfies SecurityBarrier interface
|
|
|
|
var _ SecurityBarrier = &AESGCMBarrier{}
|
|
|
|
|
2015-04-15 23:24:23 +00:00
|
|
|
// AESGCMBarrier is a SecurityBarrier implementation that uses the AES
|
|
|
|
// cipher core and the Galois Counter Mode block mode. It defaults to
|
|
|
|
// the golang NONCE default value of 12 and a key size of 256
|
|
|
|
// bit. AES-GCM is high performance, and provides both confidentiality
|
2015-03-05 21:27:35 +00:00
|
|
|
// and integrity.
|
|
|
|
type AESGCMBarrier struct {
|
|
|
|
backend physical.Backend
|
|
|
|
|
|
|
|
l sync.RWMutex
|
|
|
|
sealed bool
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// keyring is used to maintain all of the encryption keys, including
|
|
|
|
// the active key used for encryption, but also prior keys to allow
|
|
|
|
// decryption of keys encrypted under previous terms.
|
|
|
|
keyring *Keyring
|
|
|
|
|
|
|
|
// cache is used to reduce the number of AEAD constructions we do
|
|
|
|
cache map[uint32]cipher.AEAD
|
|
|
|
cacheLock sync.RWMutex
|
2015-09-19 19:33:18 +00:00
|
|
|
|
|
|
|
// currentAESGCMVersionByte is prefixed to a message to allow for
|
|
|
|
// future versioning of barrier implementations. It's var instead
|
|
|
|
// of const to allow for testing
|
|
|
|
currentAESGCMVersionByte byte
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewAESGCMBarrier is used to construct a new barrier that uses
|
|
|
|
// the provided physical backend for storage.
|
|
|
|
func NewAESGCMBarrier(physical physical.Backend) (*AESGCMBarrier, error) {
|
|
|
|
b := &AESGCMBarrier{
|
2018-09-04 16:29:18 +00:00
|
|
|
backend: physical,
|
|
|
|
sealed: true,
|
|
|
|
cache: make(map[uint32]cipher.AEAD),
|
2015-09-19 19:33:18 +00:00
|
|
|
currentAESGCMVersionByte: byte(AESGCMVersion2),
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
return b, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialized checks if the barrier has been initialized
|
|
|
|
// and has a master key set.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) Initialized(ctx context.Context) (bool, error) {
|
2015-05-27 23:01:25 +00:00
|
|
|
// Read the keyring file
|
2018-01-19 06:44:44 +00:00
|
|
|
keys, err := b.backend.List(ctx, keyringPrefix)
|
2015-05-27 23:01:25 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return false, errwrap.Wrapf("failed to check for initialization: {{err}}", err)
|
2015-05-27 23:01:25 +00:00
|
|
|
}
|
2017-11-30 14:43:07 +00:00
|
|
|
if strutil.StrListContains(keys, "keyring") {
|
2015-05-27 23:01:25 +00:00
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fallback, check for the old sentinel file
|
2018-01-19 06:44:44 +00:00
|
|
|
out, err := b.backend.Get(ctx, barrierInitPath)
|
2015-03-05 21:27:35 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return false, errwrap.Wrapf("failed to check for initialization: {{err}}", err)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
return out != nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize works only if the barrier has not been initialized
|
|
|
|
// and makes use of the given master key.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) Initialize(ctx context.Context, key []byte) error {
|
2015-03-05 21:27:35 +00:00
|
|
|
// Verify the key size
|
2015-04-15 20:33:28 +00:00
|
|
|
min, max := b.KeyLength()
|
|
|
|
if len(key) < min || len(key) > max {
|
2018-04-09 18:35:21 +00:00
|
|
|
return fmt.Errorf("key size must be %d or %d", min, max)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check if already initialized
|
2018-01-19 06:44:44 +00:00
|
|
|
if alreadyInit, err := b.Initialized(ctx); err != nil {
|
2015-03-05 21:27:35 +00:00
|
|
|
return err
|
|
|
|
} else if alreadyInit {
|
|
|
|
return ErrBarrierAlreadyInit
|
|
|
|
}
|
|
|
|
|
|
|
|
// Generate encryption key
|
|
|
|
encrypt, err := b.GenerateKey()
|
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to generate encryption key: {{err}}", err)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// Create a new keyring, install the keys
|
|
|
|
keyring := NewKeyring()
|
2015-05-28 00:04:46 +00:00
|
|
|
keyring = keyring.SetMasterKey(key)
|
|
|
|
keyring, err = keyring.AddKey(&Key{
|
2015-05-27 23:01:25 +00:00
|
|
|
Term: 1,
|
2015-03-05 21:57:45 +00:00
|
|
|
Version: 1,
|
2015-05-27 23:01:25 +00:00
|
|
|
Value: encrypt,
|
|
|
|
})
|
2015-05-28 00:04:46 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to create keyring: {{err}}", err)
|
2015-05-28 00:04:46 +00:00
|
|
|
}
|
2018-01-19 06:44:44 +00:00
|
|
|
return b.persistKeyring(ctx, keyring)
|
2015-05-27 23:29:59 +00:00
|
|
|
}
|
2015-05-27 23:01:25 +00:00
|
|
|
|
2015-05-27 23:29:59 +00:00
|
|
|
// persistKeyring is used to write out the keyring using the
|
|
|
|
// master key to encrypt it.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) persistKeyring(ctx context.Context, keyring *Keyring) error {
|
2015-05-27 23:01:25 +00:00
|
|
|
// Create the keyring entry
|
2016-05-27 20:47:40 +00:00
|
|
|
keyringBuf, err := keyring.Serialize()
|
|
|
|
defer memzero(keyringBuf)
|
2015-03-05 21:57:45 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to serialize keyring: {{err}}", err)
|
2015-03-05 21:57:45 +00:00
|
|
|
}
|
|
|
|
|
2015-05-27 23:29:59 +00:00
|
|
|
// Create the AES-GCM
|
|
|
|
gcm, err := b.aeadFromKey(keyring.MasterKey())
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:57:45 +00:00
|
|
|
// Encrypt the barrier init value
|
2018-09-05 15:49:32 +00:00
|
|
|
value, err := b.encrypt(keyringPath, initialKeyTerm, gcm, keyringBuf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
|
2015-05-27 23:42:42 +00:00
|
|
|
// Create the keyring physical entry
|
2015-03-05 21:57:45 +00:00
|
|
|
pe := &physical.Entry{
|
2015-05-27 23:01:25 +00:00
|
|
|
Key: keyringPath,
|
2015-03-05 21:27:35 +00:00
|
|
|
Value: value,
|
|
|
|
}
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := b.backend.Put(ctx, pe); err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to persist keyring: {{err}}", err)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
2015-05-29 21:29:55 +00:00
|
|
|
|
|
|
|
// Serialize the master key value
|
|
|
|
key := &Key{
|
|
|
|
Term: 1,
|
|
|
|
Version: 1,
|
|
|
|
Value: keyring.MasterKey(),
|
|
|
|
}
|
2016-05-27 20:47:40 +00:00
|
|
|
keyBuf, err := key.Serialize()
|
|
|
|
defer memzero(keyBuf)
|
2015-05-29 21:29:55 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to serialize master key: {{err}}", err)
|
2015-05-29 21:29:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Encrypt the master key
|
|
|
|
activeKey := keyring.ActiveKey()
|
|
|
|
aead, err := b.aeadFromKey(activeKey.Value)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2018-09-05 15:49:32 +00:00
|
|
|
value, err = b.encrypt(masterKeyPath, activeKey.Term, aead, keyBuf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-05-29 21:29:55 +00:00
|
|
|
|
|
|
|
// Update the masterKeyPath for standby instances
|
|
|
|
pe = &physical.Entry{
|
|
|
|
Key: masterKeyPath,
|
|
|
|
Value: value,
|
|
|
|
}
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := b.backend.Put(ctx, pe); err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to persist master key: {{err}}", err)
|
2015-05-29 21:29:55 +00:00
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GenerateKey is used to generate a new key
|
|
|
|
func (b *AESGCMBarrier) GenerateKey() ([]byte, error) {
|
2015-04-15 20:33:40 +00:00
|
|
|
// Generate a 256bit key
|
|
|
|
buf := make([]byte, 2*aes.BlockSize)
|
2015-03-05 21:27:35 +00:00
|
|
|
_, err := rand.Read(buf)
|
|
|
|
return buf, err
|
|
|
|
}
|
|
|
|
|
2015-03-12 18:20:27 +00:00
|
|
|
// KeyLength is used to sanity check a key
|
|
|
|
func (b *AESGCMBarrier) KeyLength() (int, int) {
|
2015-04-15 20:33:28 +00:00
|
|
|
return aes.BlockSize, 2 * aes.BlockSize
|
2015-03-12 18:20:27 +00:00
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Sealed checks if the barrier has been unlocked yet. The Barrier
|
|
|
|
// is not expected to be able to perform any CRUD until it is unsealed.
|
|
|
|
func (b *AESGCMBarrier) Sealed() (bool, error) {
|
|
|
|
b.l.RLock()
|
2018-06-14 13:49:10 +00:00
|
|
|
sealed := b.sealed
|
|
|
|
b.l.RUnlock()
|
|
|
|
return sealed, nil
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
2015-05-28 18:28:33 +00:00
|
|
|
// VerifyMaster is used to check if the given key matches the master key
|
|
|
|
func (b *AESGCMBarrier) VerifyMaster(key []byte) error {
|
|
|
|
b.l.RLock()
|
|
|
|
defer b.l.RUnlock()
|
|
|
|
if b.sealed {
|
|
|
|
return ErrBarrierSealed
|
|
|
|
}
|
|
|
|
if subtle.ConstantTimeCompare(key, b.keyring.MasterKey()) != 1 {
|
|
|
|
return ErrBarrierInvalidKey
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-05-28 23:09:15 +00:00
|
|
|
// ReloadKeyring is used to re-read the underlying keyring.
|
|
|
|
// This is used for HA deployments to ensure the latest keyring
|
|
|
|
// is present in the leader.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) ReloadKeyring(ctx context.Context) error {
|
2015-05-28 23:09:15 +00:00
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
|
|
|
// Create the AES-GCM
|
|
|
|
gcm, err := b.aeadFromKey(b.keyring.MasterKey())
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read in the keyring
|
2018-01-19 06:44:44 +00:00
|
|
|
out, err := b.backend.Get(ctx, keyringPath)
|
2015-05-28 23:09:15 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to check for keyring: {{err}}", err)
|
2015-05-28 23:09:15 +00:00
|
|
|
}
|
|
|
|
|
2015-07-13 08:18:22 +00:00
|
|
|
// Ensure that the keyring exists. This should never happen,
|
|
|
|
// and indicates something really bad has happened.
|
|
|
|
if out == nil {
|
2018-09-05 15:49:32 +00:00
|
|
|
return errors.New("keyring unexpectedly missing")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify the term is always just one
|
|
|
|
term := binary.BigEndian.Uint32(out.Value[:4])
|
|
|
|
if term != initialKeyTerm {
|
|
|
|
return errors.New("term mis-match")
|
2015-07-13 08:18:22 +00:00
|
|
|
}
|
|
|
|
|
2015-05-28 23:09:15 +00:00
|
|
|
// Decrypt the barrier init key
|
2015-09-19 19:33:18 +00:00
|
|
|
plain, err := b.decrypt(keyringPath, gcm, out.Value)
|
2016-05-27 20:47:40 +00:00
|
|
|
defer memzero(plain)
|
2015-05-28 23:09:15 +00:00
|
|
|
if err != nil {
|
|
|
|
if strings.Contains(err.Error(), "message authentication failed") {
|
|
|
|
return ErrBarrierInvalidKey
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Recover the keyring
|
|
|
|
keyring, err := DeserializeKeyring(plain)
|
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("keyring deserialization failed: {{err}}", err)
|
2015-05-28 23:09:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the keyring and finish
|
|
|
|
b.keyring = keyring
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-05-29 21:29:55 +00:00
|
|
|
// ReloadMasterKey is used to re-read the underlying masterkey.
|
|
|
|
// This is used for HA deployments to ensure the latest master key
|
|
|
|
// is available for keyring reloading.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) ReloadMasterKey(ctx context.Context) error {
|
2015-05-29 21:29:55 +00:00
|
|
|
// Read the masterKeyPath upgrade
|
2018-01-19 06:44:44 +00:00
|
|
|
out, err := b.Get(ctx, masterKeyPath)
|
2015-05-29 21:29:55 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to read master key path: {{err}}", err)
|
2015-05-29 21:29:55 +00:00
|
|
|
}
|
|
|
|
|
2016-05-15 16:58:36 +00:00
|
|
|
// The masterKeyPath could be missing (backwards incompatible),
|
2015-05-29 21:29:55 +00:00
|
|
|
// we can ignore this and attempt to make progress with the current
|
|
|
|
// master key.
|
|
|
|
if out == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-04-08 16:45:28 +00:00
|
|
|
// Grab write lock and refetch
|
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
|
|
|
out, err = b.lockSwitchedGet(ctx, masterKeyPath, false)
|
|
|
|
if err != nil {
|
|
|
|
return errwrap.Wrapf("failed to read master key path: {{err}}", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if out == nil {
|
|
|
|
return nil
|
|
|
|
}
|
2016-05-27 20:47:40 +00:00
|
|
|
|
2015-05-29 21:29:55 +00:00
|
|
|
// Deserialize the master key
|
|
|
|
key, err := DeserializeKey(out.Value)
|
2019-04-08 16:45:28 +00:00
|
|
|
memzero(out.Value)
|
2015-05-29 21:29:55 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to deserialize key: {{err}}", err)
|
2015-05-29 21:29:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check if the master key is the same
|
2017-01-17 20:43:10 +00:00
|
|
|
if subtle.ConstantTimeCompare(b.keyring.MasterKey(), key.Value) == 1 {
|
2015-05-29 21:29:55 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the master key
|
2016-05-27 20:47:40 +00:00
|
|
|
oldKeyring := b.keyring
|
2015-05-29 21:29:55 +00:00
|
|
|
b.keyring = b.keyring.SetMasterKey(key.Value)
|
2016-05-27 20:47:40 +00:00
|
|
|
oldKeyring.Zeroize(false)
|
2015-05-29 21:29:55 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Unseal is used to provide the master key which permits the barrier
|
|
|
|
// to be unsealed. If the key is not correct, the barrier remains sealed.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) Unseal(ctx context.Context, key []byte) error {
|
2015-03-05 21:27:35 +00:00
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
|
|
|
// Do nothing if already unsealed
|
|
|
|
if !b.sealed {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// Create the AES-GCM
|
|
|
|
gcm, err := b.aeadFromKey(key)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read in the keyring
|
2018-01-19 06:44:44 +00:00
|
|
|
out, err := b.backend.Get(ctx, keyringPath)
|
2015-05-27 23:01:25 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to check for keyring: {{err}}", err)
|
2015-05-27 23:01:25 +00:00
|
|
|
}
|
|
|
|
if out != nil {
|
2018-09-05 15:49:32 +00:00
|
|
|
// Verify the term is always just one
|
|
|
|
term := binary.BigEndian.Uint32(out.Value[:4])
|
|
|
|
if term != initialKeyTerm {
|
|
|
|
return errors.New("term mis-match")
|
|
|
|
}
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// Decrypt the barrier init key
|
2015-09-19 19:33:18 +00:00
|
|
|
plain, err := b.decrypt(keyringPath, gcm, out.Value)
|
2016-05-27 20:47:40 +00:00
|
|
|
defer memzero(plain)
|
2015-05-27 23:01:25 +00:00
|
|
|
if err != nil {
|
|
|
|
if strings.Contains(err.Error(), "message authentication failed") {
|
|
|
|
return ErrBarrierInvalidKey
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Recover the keyring
|
|
|
|
keyring, err := DeserializeKeyring(plain)
|
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("keyring deserialization failed: {{err}}", err)
|
2015-05-27 23:01:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the keyring and finish
|
|
|
|
b.keyring = keyring
|
|
|
|
b.sealed = false
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Read the barrier initialization key
|
2018-01-19 06:44:44 +00:00
|
|
|
out, err = b.backend.Get(ctx, barrierInitPath)
|
2015-03-05 21:27:35 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to check for initialization: {{err}}", err)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
if out == nil {
|
|
|
|
return ErrBarrierNotInit
|
|
|
|
}
|
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
// Verify the term is always just one
|
|
|
|
term := binary.BigEndian.Uint32(out.Value[:4])
|
|
|
|
if term != initialKeyTerm {
|
|
|
|
return errors.New("term mis-match")
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Decrypt the barrier init key
|
2015-09-19 19:33:18 +00:00
|
|
|
plain, err := b.decrypt(barrierInitPath, gcm, out.Value)
|
2015-03-05 21:27:35 +00:00
|
|
|
if err != nil {
|
2015-03-12 18:27:32 +00:00
|
|
|
if strings.Contains(err.Error(), "message authentication failed") {
|
|
|
|
return ErrBarrierInvalidKey
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
return err
|
|
|
|
}
|
2015-03-05 21:57:45 +00:00
|
|
|
defer memzero(plain)
|
|
|
|
|
|
|
|
// Unmarshal the barrier init
|
|
|
|
var init barrierInit
|
2016-07-06 16:25:40 +00:00
|
|
|
if err := jsonutil.DecodeJSON(plain, &init); err != nil {
|
2015-03-05 21:57:45 +00:00
|
|
|
return fmt.Errorf("failed to unmarshal barrier init file")
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
|
2016-05-15 16:58:36 +00:00
|
|
|
// Setup a new keyring, this is for backwards compatibility
|
2016-05-27 20:47:40 +00:00
|
|
|
keyringNew := NewKeyring()
|
|
|
|
keyring := keyringNew.SetMasterKey(key)
|
|
|
|
|
|
|
|
// AddKey reuses the master, so we are only zeroizing after this call
|
|
|
|
defer keyringNew.Zeroize(false)
|
|
|
|
|
2015-05-28 00:04:46 +00:00
|
|
|
keyring, err = keyring.AddKey(&Key{
|
2015-05-27 23:01:25 +00:00
|
|
|
Term: 1,
|
|
|
|
Version: 1,
|
|
|
|
Value: init.Key,
|
|
|
|
})
|
2015-05-28 00:04:46 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to create keyring: {{err}}", err)
|
2015-05-28 00:04:46 +00:00
|
|
|
}
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := b.persistKeyring(ctx, keyring); err != nil {
|
2015-05-27 23:29:59 +00:00
|
|
|
return err
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
2015-05-27 23:42:42 +00:00
|
|
|
// Delete the old barrier entry
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := b.backend.Delete(ctx, barrierInitPath); err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return errwrap.Wrapf("failed to delete barrier init file: {{err}}", err)
|
2015-05-27 23:42:42 +00:00
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Set the vault as unsealed
|
2015-05-27 23:01:25 +00:00
|
|
|
b.keyring = keyring
|
2015-03-05 21:27:35 +00:00
|
|
|
b.sealed = false
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Seal is used to re-seal the barrier. This requires the barrier to
|
|
|
|
// be unsealed again to perform any further operations.
|
|
|
|
func (b *AESGCMBarrier) Seal() error {
|
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
|
|
|
// Remove the primary key, and seal the vault
|
2015-05-27 23:01:25 +00:00
|
|
|
b.cache = make(map[uint32]cipher.AEAD)
|
2016-05-27 20:47:40 +00:00
|
|
|
b.keyring.Zeroize(true)
|
2015-05-28 00:04:46 +00:00
|
|
|
b.keyring = nil
|
2015-03-05 21:27:35 +00:00
|
|
|
b.sealed = true
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-05-28 00:05:02 +00:00
|
|
|
// Rotate is used to create a new encryption key. All future writes
|
|
|
|
// should use the new key, while old values should still be decryptable.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) Rotate(ctx context.Context) (uint32, error) {
|
2015-05-28 00:05:02 +00:00
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
if b.sealed {
|
2015-05-28 23:42:32 +00:00
|
|
|
return 0, ErrBarrierSealed
|
2015-05-28 00:05:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Generate a new key
|
|
|
|
encrypt, err := b.GenerateKey()
|
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return 0, errwrap.Wrapf("failed to generate encryption key: {{err}}", err)
|
2015-05-28 00:05:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get the next term
|
|
|
|
term := b.keyring.ActiveTerm()
|
2015-05-28 23:42:32 +00:00
|
|
|
newTerm := term + 1
|
2015-05-28 00:05:02 +00:00
|
|
|
|
|
|
|
// Add a new encryption key
|
|
|
|
newKeyring, err := b.keyring.AddKey(&Key{
|
2015-05-28 23:42:32 +00:00
|
|
|
Term: newTerm,
|
2015-05-28 00:05:02 +00:00
|
|
|
Version: 1,
|
|
|
|
Value: encrypt,
|
|
|
|
})
|
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return 0, errwrap.Wrapf("failed to add new encryption key: {{err}}", err)
|
2015-05-28 00:05:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Persist the new keyring
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := b.persistKeyring(ctx, newKeyring); err != nil {
|
2015-05-28 23:42:32 +00:00
|
|
|
return 0, err
|
2015-05-28 00:05:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Swap the keyrings
|
|
|
|
b.keyring = newKeyring
|
2015-05-28 23:42:32 +00:00
|
|
|
return newTerm, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// CreateUpgrade creates an upgrade path key to the given term from the previous term
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) CreateUpgrade(ctx context.Context, term uint32) error {
|
2015-05-28 23:42:32 +00:00
|
|
|
b.l.RLock()
|
|
|
|
if b.sealed {
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-28 23:42:32 +00:00
|
|
|
return ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the key for this term
|
|
|
|
termKey := b.keyring.TermKey(term)
|
|
|
|
buf, err := termKey.Serialize()
|
2016-05-27 20:47:40 +00:00
|
|
|
defer memzero(buf)
|
2015-05-28 23:42:32 +00:00
|
|
|
if err != nil {
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-28 23:42:32 +00:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the AEAD for the previous term
|
|
|
|
prevTerm := term - 1
|
|
|
|
primary, err := b.aeadForTerm(prevTerm)
|
|
|
|
if err != nil {
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-28 23:42:32 +00:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-09-19 19:33:18 +00:00
|
|
|
key := fmt.Sprintf("%s%d", keyringUpgradePrefix, prevTerm)
|
2018-09-05 15:49:32 +00:00
|
|
|
value, err := b.encrypt(key, prevTerm, primary, buf)
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2018-09-05 15:49:32 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-05-28 23:42:32 +00:00
|
|
|
// Create upgrade key
|
|
|
|
pe := &physical.Entry{
|
2017-11-30 14:43:07 +00:00
|
|
|
Key: key,
|
|
|
|
Value: value,
|
2015-05-28 23:42:32 +00:00
|
|
|
}
|
2018-01-19 06:44:44 +00:00
|
|
|
return b.backend.Put(ctx, pe)
|
2015-05-28 00:05:02 +00:00
|
|
|
}
|
|
|
|
|
2015-05-28 23:42:32 +00:00
|
|
|
// DestroyUpgrade destroys the upgrade path key to the given term
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) DestroyUpgrade(ctx context.Context, term uint32) error {
|
2015-05-28 23:42:32 +00:00
|
|
|
path := fmt.Sprintf("%s%d", keyringUpgradePrefix, term-1)
|
2018-01-19 06:44:44 +00:00
|
|
|
return b.Delete(ctx, path)
|
2015-05-28 23:42:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// CheckUpgrade looks for an upgrade to the current term and installs it
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) CheckUpgrade(ctx context.Context) (bool, uint32, error) {
|
2015-05-28 23:42:32 +00:00
|
|
|
b.l.RLock()
|
|
|
|
if b.sealed {
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-28 23:42:32 +00:00
|
|
|
return false, 0, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the current term
|
|
|
|
activeTerm := b.keyring.ActiveTerm()
|
|
|
|
|
|
|
|
// Check for an upgrade key
|
|
|
|
upgrade := fmt.Sprintf("%s%d", keyringUpgradePrefix, activeTerm)
|
2019-04-08 16:45:28 +00:00
|
|
|
entry, err := b.lockSwitchedGet(ctx, upgrade, false)
|
2015-05-28 23:42:32 +00:00
|
|
|
if err != nil {
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-28 23:42:32 +00:00
|
|
|
return false, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Nothing to do if no upgrade
|
|
|
|
if entry == nil {
|
2019-04-08 16:45:28 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-28 23:42:32 +00:00
|
|
|
return false, 0, nil
|
|
|
|
}
|
|
|
|
|
2019-04-08 16:45:28 +00:00
|
|
|
// Upgrade from read lock to write lock
|
|
|
|
b.l.RUnlock()
|
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
|
|
|
// Validate base cases and refetch values again
|
|
|
|
|
|
|
|
if b.sealed {
|
|
|
|
return false, 0, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
activeTerm = b.keyring.ActiveTerm()
|
|
|
|
|
|
|
|
upgrade = fmt.Sprintf("%s%d", keyringUpgradePrefix, activeTerm)
|
|
|
|
entry, err = b.lockSwitchedGet(ctx, upgrade, false)
|
|
|
|
if err != nil {
|
|
|
|
return false, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if entry == nil {
|
|
|
|
return false, 0, nil
|
|
|
|
}
|
2016-05-27 20:47:40 +00:00
|
|
|
|
2015-05-28 23:42:32 +00:00
|
|
|
// Deserialize the key
|
|
|
|
key, err := DeserializeKey(entry.Value)
|
2019-04-08 16:45:28 +00:00
|
|
|
memzero(entry.Value)
|
2015-05-28 23:42:32 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the keyring
|
|
|
|
newKeyring, err := b.keyring.AddKey(key)
|
2015-05-28 22:52:26 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return false, 0, errwrap.Wrapf("failed to add new encryption key: {{err}}", err)
|
2015-05-28 22:52:26 +00:00
|
|
|
}
|
|
|
|
b.keyring = newKeyring
|
2015-05-28 23:42:32 +00:00
|
|
|
|
|
|
|
// Done!
|
|
|
|
return true, key.Term, nil
|
2015-05-28 22:52:26 +00:00
|
|
|
}
|
|
|
|
|
2015-05-28 00:25:36 +00:00
|
|
|
// ActiveKeyInfo is used to inform details about the active key
|
|
|
|
func (b *AESGCMBarrier) ActiveKeyInfo() (*KeyInfo, error) {
|
|
|
|
b.l.RLock()
|
|
|
|
defer b.l.RUnlock()
|
|
|
|
if b.sealed {
|
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
// Determine the key install time
|
|
|
|
term := b.keyring.ActiveTerm()
|
|
|
|
key := b.keyring.TermKey(term)
|
|
|
|
|
|
|
|
// Return the key info
|
|
|
|
info := &KeyInfo{
|
|
|
|
Term: int(term),
|
|
|
|
InstallTime: key.InstallTime,
|
|
|
|
}
|
|
|
|
return info, nil
|
|
|
|
}
|
|
|
|
|
2015-05-28 00:13:40 +00:00
|
|
|
// Rekey is used to change the master key used to protect the keyring
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) Rekey(ctx context.Context, key []byte) error {
|
2015-05-28 00:13:40 +00:00
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
2017-02-17 04:09:39 +00:00
|
|
|
newKeyring, err := b.updateMasterKeyCommon(key)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2015-05-28 00:13:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Persist the new keyring
|
2018-01-19 06:44:44 +00:00
|
|
|
if err := b.persistKeyring(ctx, newKeyring); err != nil {
|
2015-05-28 00:13:40 +00:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Swap the keyrings
|
2016-05-27 20:47:40 +00:00
|
|
|
oldKeyring := b.keyring
|
2015-05-28 00:13:40 +00:00
|
|
|
b.keyring = newKeyring
|
2016-05-27 20:47:40 +00:00
|
|
|
oldKeyring.Zeroize(false)
|
2015-05-28 00:13:40 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-17 04:09:39 +00:00
|
|
|
// SetMasterKey updates the keyring's in-memory master key but does not persist
|
|
|
|
// anything to storage
|
|
|
|
func (b *AESGCMBarrier) SetMasterKey(key []byte) error {
|
|
|
|
b.l.Lock()
|
|
|
|
defer b.l.Unlock()
|
|
|
|
|
|
|
|
newKeyring, err := b.updateMasterKeyCommon(key)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Swap the keyrings
|
|
|
|
oldKeyring := b.keyring
|
|
|
|
b.keyring = newKeyring
|
|
|
|
oldKeyring.Zeroize(false)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Performs common tasks related to updating the master key; note that the lock
|
|
|
|
// must be held before calling this function
|
|
|
|
func (b *AESGCMBarrier) updateMasterKeyCommon(key []byte) (*Keyring, error) {
|
|
|
|
if b.sealed {
|
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify the key size
|
|
|
|
min, max := b.KeyLength()
|
|
|
|
if len(key) < min || len(key) > max {
|
2018-04-09 18:35:21 +00:00
|
|
|
return nil, fmt.Errorf("key size must be %d or %d", min, max)
|
2017-02-17 04:09:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return b.keyring.SetMasterKey(key), nil
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Put is used to insert or update an entry
|
2019-01-31 14:25:18 +00:00
|
|
|
func (b *AESGCMBarrier) Put(ctx context.Context, entry *logical.StorageEntry) error {
|
2015-04-08 23:43:17 +00:00
|
|
|
defer metrics.MeasureSince([]string{"barrier", "put"}, time.Now())
|
2015-03-05 21:27:35 +00:00
|
|
|
b.l.RLock()
|
2015-05-28 00:04:46 +00:00
|
|
|
if b.sealed {
|
2018-09-05 15:49:32 +00:00
|
|
|
b.l.RUnlock()
|
2015-03-05 21:27:35 +00:00
|
|
|
return ErrBarrierSealed
|
|
|
|
}
|
2015-05-28 00:04:46 +00:00
|
|
|
|
|
|
|
term := b.keyring.ActiveTerm()
|
2015-05-27 23:01:25 +00:00
|
|
|
primary, err := b.aeadForTerm(term)
|
2018-09-05 15:49:32 +00:00
|
|
|
b.l.RUnlock()
|
2015-05-27 23:01:25 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
value, err := b.encrypt(entry.Key, term, primary, entry.Value)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
pe := &physical.Entry{
|
2017-10-23 20:42:56 +00:00
|
|
|
Key: entry.Key,
|
2018-09-05 15:49:32 +00:00
|
|
|
Value: value,
|
2017-10-23 20:42:56 +00:00
|
|
|
SealWrap: entry.SealWrap,
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
2018-06-14 17:44:13 +00:00
|
|
|
return b.backend.Put(ctx, pe)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get is used to fetch an entry
|
2019-01-31 14:25:18 +00:00
|
|
|
func (b *AESGCMBarrier) Get(ctx context.Context, key string) (*logical.StorageEntry, error) {
|
2019-04-08 16:45:28 +00:00
|
|
|
return b.lockSwitchedGet(ctx, key, true)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (b *AESGCMBarrier) lockSwitchedGet(ctx context.Context, key string, getLock bool) (*logical.StorageEntry, error) {
|
2015-04-08 23:43:17 +00:00
|
|
|
defer metrics.MeasureSince([]string{"barrier", "get"}, time.Now())
|
2019-04-08 16:45:28 +00:00
|
|
|
if getLock {
|
|
|
|
b.l.RLock()
|
|
|
|
}
|
2015-05-28 00:04:46 +00:00
|
|
|
if b.sealed {
|
2019-04-08 16:45:28 +00:00
|
|
|
if getLock {
|
|
|
|
b.l.RUnlock()
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read the key from the backend
|
2018-01-19 06:44:44 +00:00
|
|
|
pe, err := b.backend.Get(ctx, key)
|
2015-03-05 21:27:35 +00:00
|
|
|
if err != nil {
|
2019-04-08 16:45:28 +00:00
|
|
|
if getLock {
|
|
|
|
b.l.RUnlock()
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
return nil, err
|
|
|
|
} else if pe == nil {
|
2019-04-08 16:45:28 +00:00
|
|
|
if getLock {
|
|
|
|
b.l.RUnlock()
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
2018-11-07 22:10:08 +00:00
|
|
|
if len(pe.Value) < 4 {
|
2019-04-08 16:45:28 +00:00
|
|
|
if getLock {
|
|
|
|
b.l.RUnlock()
|
|
|
|
}
|
2018-11-07 22:10:08 +00:00
|
|
|
return nil, errors.New("invalid value")
|
|
|
|
}
|
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
// Verify the term
|
|
|
|
term := binary.BigEndian.Uint32(pe.Value[:4])
|
|
|
|
|
|
|
|
// Get the GCM by term
|
|
|
|
// It is expensive to do this first but it is not a
|
|
|
|
// normal case that this won't match
|
|
|
|
gcm, err := b.aeadForTerm(term)
|
2019-04-08 16:45:28 +00:00
|
|
|
if getLock {
|
|
|
|
b.l.RUnlock()
|
|
|
|
}
|
2018-09-05 15:49:32 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if gcm == nil {
|
|
|
|
return nil, fmt.Errorf("no decryption key available for term %d", term)
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Decrypt the ciphertext
|
2018-09-05 15:49:32 +00:00
|
|
|
plain, err := b.decrypt(key, gcm, pe.Value)
|
2015-03-05 21:27:35 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return nil, errwrap.Wrapf("decryption failed: {{err}}", err)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Wrap in a logical entry
|
2019-01-31 14:25:18 +00:00
|
|
|
entry := &logical.StorageEntry{
|
2017-10-23 20:42:56 +00:00
|
|
|
Key: key,
|
|
|
|
Value: plain,
|
|
|
|
SealWrap: pe.SealWrap,
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
return entry, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete is used to permanently delete an entry
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) Delete(ctx context.Context, key string) error {
|
2015-04-08 23:43:17 +00:00
|
|
|
defer metrics.MeasureSince([]string{"barrier", "delete"}, time.Now())
|
2015-03-05 21:27:35 +00:00
|
|
|
b.l.RLock()
|
2018-09-05 15:49:32 +00:00
|
|
|
sealed := b.sealed
|
|
|
|
b.l.RUnlock()
|
|
|
|
if sealed {
|
2015-03-05 21:27:35 +00:00
|
|
|
return ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
2018-06-14 17:44:13 +00:00
|
|
|
return b.backend.Delete(ctx, key)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// List is used ot list all the keys under a given
|
|
|
|
// prefix, up to the next prefix.
|
2018-01-19 06:44:44 +00:00
|
|
|
func (b *AESGCMBarrier) List(ctx context.Context, prefix string) ([]string, error) {
|
2015-04-08 23:43:17 +00:00
|
|
|
defer metrics.MeasureSince([]string{"barrier", "list"}, time.Now())
|
2015-03-05 21:27:35 +00:00
|
|
|
b.l.RLock()
|
2018-09-05 15:49:32 +00:00
|
|
|
sealed := b.sealed
|
|
|
|
b.l.RUnlock()
|
|
|
|
if sealed {
|
2015-03-05 21:27:35 +00:00
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
2018-06-14 17:44:13 +00:00
|
|
|
return b.backend.List(ctx, prefix)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// aeadForTerm returns the AES-GCM AEAD for the given term
|
|
|
|
func (b *AESGCMBarrier) aeadForTerm(term uint32) (cipher.AEAD, error) {
|
|
|
|
// Check for the keyring
|
|
|
|
keyring := b.keyring
|
|
|
|
if keyring == nil {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the cache for the aead
|
|
|
|
b.cacheLock.RLock()
|
|
|
|
aead, ok := b.cache[term]
|
|
|
|
b.cacheLock.RUnlock()
|
|
|
|
if ok {
|
|
|
|
return aead, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read the underlying key
|
|
|
|
key := keyring.TermKey(term)
|
|
|
|
if key == nil {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a new aead
|
|
|
|
aead, err := b.aeadFromKey(key.Value)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the cache
|
|
|
|
b.cacheLock.Lock()
|
|
|
|
b.cache[term] = aead
|
|
|
|
b.cacheLock.Unlock()
|
|
|
|
return aead, nil
|
|
|
|
}
|
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// aeadFromKey returns an AES-GCM AEAD using the given key.
|
|
|
|
func (b *AESGCMBarrier) aeadFromKey(key []byte) (cipher.AEAD, error) {
|
|
|
|
// Create the AES cipher
|
|
|
|
aesCipher, err := aes.NewCipher(key)
|
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return nil, errwrap.Wrapf("failed to create cipher: {{err}}", err)
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Create the GCM mode AEAD
|
|
|
|
gcm, err := cipher.NewGCM(aesCipher)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("failed to initialize GCM mode")
|
|
|
|
}
|
|
|
|
return gcm, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// encrypt is used to encrypt a value
|
2018-09-05 15:49:32 +00:00
|
|
|
func (b *AESGCMBarrier) encrypt(path string, term uint32, gcm cipher.AEAD, plain []byte) ([]byte, error) {
|
2015-05-22 21:00:29 +00:00
|
|
|
// Allocate the output buffer with room for tern, version byte,
|
2015-03-05 21:27:35 +00:00
|
|
|
// nonce, GCM tag and the plaintext
|
2015-05-22 21:00:29 +00:00
|
|
|
capacity := termSize + 1 + gcm.NonceSize() + gcm.Overhead() + len(plain)
|
|
|
|
size := termSize + 1 + gcm.NonceSize()
|
2015-03-05 21:27:35 +00:00
|
|
|
out := make([]byte, size, capacity)
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// Set the key term
|
|
|
|
binary.BigEndian.PutUint32(out[:4], term)
|
2015-04-17 23:51:13 +00:00
|
|
|
|
2015-03-05 21:27:35 +00:00
|
|
|
// Set the version byte
|
2015-09-19 19:33:18 +00:00
|
|
|
out[4] = b.currentAESGCMVersionByte
|
2015-03-05 21:27:35 +00:00
|
|
|
|
|
|
|
// Generate a random nonce
|
2015-04-17 23:51:13 +00:00
|
|
|
nonce := out[5 : 5+gcm.NonceSize()]
|
2018-09-05 15:49:32 +00:00
|
|
|
n, err := rand.Read(nonce)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if n != len(nonce) {
|
|
|
|
return nil, errors.New("unable to read enough random bytes to fill gcm nonce")
|
|
|
|
}
|
2015-03-05 21:27:35 +00:00
|
|
|
|
|
|
|
// Seal the output
|
2015-09-19 19:33:18 +00:00
|
|
|
switch b.currentAESGCMVersionByte {
|
|
|
|
case AESGCMVersion1:
|
|
|
|
out = gcm.Seal(out, nonce, plain, nil)
|
|
|
|
case AESGCMVersion2:
|
2018-10-15 16:56:24 +00:00
|
|
|
aad := []byte(nil)
|
|
|
|
if path != "" {
|
|
|
|
aad = []byte(path)
|
|
|
|
}
|
|
|
|
out = gcm.Seal(out, nonce, plain, aad)
|
2015-09-19 19:33:18 +00:00
|
|
|
default:
|
|
|
|
panic("Unknown AESGCM version")
|
|
|
|
}
|
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
return out, nil
|
2015-03-05 21:27:35 +00:00
|
|
|
}
|
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
// decrypt is used to decrypt a value using the keyring
|
2015-09-19 19:33:18 +00:00
|
|
|
func (b *AESGCMBarrier) decrypt(path string, gcm cipher.AEAD, cipher []byte) ([]byte, error) {
|
2015-03-05 21:27:35 +00:00
|
|
|
// Capture the parts
|
2015-04-17 23:51:13 +00:00
|
|
|
nonce := cipher[5 : 5+gcm.NonceSize()]
|
|
|
|
raw := cipher[5+gcm.NonceSize():]
|
2015-03-05 21:27:35 +00:00
|
|
|
out := make([]byte, 0, len(raw)-gcm.NonceSize())
|
|
|
|
|
2015-05-27 23:01:25 +00:00
|
|
|
// Attempt to open
|
2015-09-19 19:33:18 +00:00
|
|
|
switch cipher[4] {
|
|
|
|
case AESGCMVersion1:
|
|
|
|
return gcm.Open(out, nonce, raw, nil)
|
|
|
|
case AESGCMVersion2:
|
2018-10-15 16:56:24 +00:00
|
|
|
aad := []byte(nil)
|
|
|
|
if path != "" {
|
|
|
|
aad = []byte(path)
|
|
|
|
}
|
|
|
|
return gcm.Open(out, nonce, raw, aad)
|
2015-09-19 19:33:18 +00:00
|
|
|
default:
|
|
|
|
return nil, fmt.Errorf("version bytes mis-match")
|
|
|
|
}
|
2015-05-27 23:01:25 +00:00
|
|
|
}
|
2017-02-17 04:09:39 +00:00
|
|
|
|
|
|
|
// Encrypt is used to encrypt in-memory for the BarrierEncryptor interface
|
2018-01-19 10:31:55 +00:00
|
|
|
func (b *AESGCMBarrier) Encrypt(ctx context.Context, key string, plaintext []byte) ([]byte, error) {
|
2017-02-17 04:09:39 +00:00
|
|
|
b.l.RLock()
|
|
|
|
if b.sealed {
|
2018-06-14 13:49:10 +00:00
|
|
|
b.l.RUnlock()
|
2017-02-17 04:09:39 +00:00
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
term := b.keyring.ActiveTerm()
|
|
|
|
primary, err := b.aeadForTerm(term)
|
2018-09-05 15:49:32 +00:00
|
|
|
b.l.RUnlock()
|
2017-02-17 04:09:39 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
ciphertext, err := b.encrypt(key, term, primary, plaintext)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-02-17 04:09:39 +00:00
|
|
|
return ciphertext, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Decrypt is used to decrypt in-memory for the BarrierEncryptor interface
|
2018-01-19 10:31:55 +00:00
|
|
|
func (b *AESGCMBarrier) Decrypt(ctx context.Context, key string, ciphertext []byte) ([]byte, error) {
|
2017-02-17 04:09:39 +00:00
|
|
|
b.l.RLock()
|
|
|
|
if b.sealed {
|
2018-06-14 13:49:10 +00:00
|
|
|
b.l.RUnlock()
|
2017-02-17 04:09:39 +00:00
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
2018-09-05 15:49:32 +00:00
|
|
|
// Verify the term
|
|
|
|
term := binary.BigEndian.Uint32(ciphertext[:4])
|
|
|
|
|
|
|
|
// Get the GCM by term
|
|
|
|
// It is expensive to do this first but it is not a
|
|
|
|
// normal case that this won't match
|
|
|
|
gcm, err := b.aeadForTerm(term)
|
|
|
|
b.l.RUnlock()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if gcm == nil {
|
|
|
|
return nil, fmt.Errorf("no decryption key available for term %d", term)
|
|
|
|
}
|
|
|
|
|
2017-02-17 04:09:39 +00:00
|
|
|
// Decrypt the ciphertext
|
2018-09-05 15:49:32 +00:00
|
|
|
plain, err := b.decrypt(key, gcm, ciphertext)
|
2017-02-17 04:09:39 +00:00
|
|
|
if err != nil {
|
2018-04-05 15:49:21 +00:00
|
|
|
return nil, errwrap.Wrapf("decryption failed: {{err}}", err)
|
2017-02-17 04:09:39 +00:00
|
|
|
}
|
2018-06-14 13:49:10 +00:00
|
|
|
|
2017-02-17 04:09:39 +00:00
|
|
|
return plain, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (b *AESGCMBarrier) Keyring() (*Keyring, error) {
|
|
|
|
b.l.RLock()
|
|
|
|
defer b.l.RUnlock()
|
|
|
|
if b.sealed {
|
|
|
|
return nil, ErrBarrierSealed
|
|
|
|
}
|
|
|
|
|
|
|
|
return b.keyring.Clone(), nil
|
|
|
|
}
|