e06a78a474
* Rename builtin/credential/aws-ec2 to aws The aws-ec2 authentication backend is being expanded and will become the generic aws backend. This is a small rename commit to keep the commit history clean. * Expand aws-ec2 backend to more generic aws This adds the ability to authenticate arbitrary AWS IAM principals using AWS's sts:GetCallerIdentity method. The AWS-EC2 auth backend is being to just AWS with the expansion. * Add missing aws auth handler to CLI This was omitted from the previous commit * aws auth backend general variable name cleanup Also fixed a bug where allowed auth types weren't being checked upon login, and added tests for it. * Update docs for the aws auth backend * Refactor aws bind validation * Fix env var override in aws backend test Intent is to override the AWS environment variables with the TEST_* versions if they are set, but the reverse was happening. * Update docs on use of IAM authentication profile AWS now allows you to change the instance profile of a running instance, so the use case of "a long-lived instance that's not in an instance profile" no longer means you have to use the the EC2 auth method. You can now just change the instance profile on the fly. * Fix typo in aws auth cli help * Respond to PR feedback * More PR feedback * Respond to additional PR feedback * Address more feedback on aws auth PR * Make aws auth_type immutable per role * Address more aws auth PR feedback * Address more iam auth PR feedback * Rename aws-ec2.html.md to aws.html.md Per PR feedback, to go along with new backend name. * Add MountType to logical.Request * Make default aws auth_type dependent upon MountType When MountType is aws-ec2, default to ec2 auth_type for backwards compatibility with legacy roles. Otherwise, default to iam. * Pass MountPoint and MountType back up to the core Previously the request router reset the MountPoint and MountType back to the empty string before returning to the core. This ensures they get set back to the correct values.
506 lines
13 KiB
Go
506 lines
13 KiB
Go
package vault
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/go-uuid"
|
|
"github.com/hashicorp/vault/helper/jsonutil"
|
|
"github.com/hashicorp/vault/logical"
|
|
)
|
|
|
|
const (
|
|
// coreAuthConfigPath is used to store the auth configuration.
|
|
// Auth configuration is protected within the Vault itself, which means it
|
|
// can only be viewed or modified after an unseal.
|
|
coreAuthConfigPath = "core/auth"
|
|
|
|
// coreLocalAuthConfigPath is used to store credential configuration for
|
|
// local (non-replicated) mounts
|
|
coreLocalAuthConfigPath = "core/local-auth"
|
|
|
|
// credentialBarrierPrefix is the prefix to the UUID used in the
|
|
// barrier view for the credential backends.
|
|
credentialBarrierPrefix = "auth/"
|
|
|
|
// credentialRoutePrefix is the mount prefix used for the router
|
|
credentialRoutePrefix = "auth/"
|
|
|
|
// credentialTableType is the value we expect to find for the credential
|
|
// table and corresponding entries
|
|
credentialTableType = "auth"
|
|
)
|
|
|
|
var (
|
|
// errLoadAuthFailed if loadCredentials encounters an error
|
|
errLoadAuthFailed = errors.New("failed to setup auth table")
|
|
|
|
// credentialAliases maps old backend names to new backend names, allowing us
|
|
// to move/rename backends but maintain backwards compatibility
|
|
credentialAliases = map[string]string{"aws-ec2": "aws"}
|
|
)
|
|
|
|
// enableCredential is used to enable a new credential backend
|
|
func (c *Core) enableCredential(entry *MountEntry) error {
|
|
// Ensure we end the path in a slash
|
|
if !strings.HasSuffix(entry.Path, "/") {
|
|
entry.Path += "/"
|
|
}
|
|
|
|
// Ensure there is a name
|
|
if entry.Path == "/" {
|
|
return fmt.Errorf("backend path must be specified")
|
|
}
|
|
|
|
c.authLock.Lock()
|
|
defer c.authLock.Unlock()
|
|
|
|
// Look for matching name
|
|
for _, ent := range c.auth.Entries {
|
|
switch {
|
|
// Existing is oauth/github/ new is oauth/ or
|
|
// existing is oauth/ and new is oauth/github/
|
|
case strings.HasPrefix(ent.Path, entry.Path):
|
|
fallthrough
|
|
case strings.HasPrefix(entry.Path, ent.Path):
|
|
return logical.CodedError(409, "path is already in use")
|
|
}
|
|
}
|
|
|
|
// Ensure the token backend is a singleton
|
|
if entry.Type == "token" {
|
|
return fmt.Errorf("token credential backend cannot be instantiated")
|
|
}
|
|
|
|
if match := c.router.MatchingMount(credentialRoutePrefix + entry.Path); match != "" {
|
|
return logical.CodedError(409, fmt.Sprintf("existing mount at %s", match))
|
|
}
|
|
|
|
// Generate a new UUID and view
|
|
if entry.UUID == "" {
|
|
entryUUID, err := uuid.GenerateUUID()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
entry.UUID = entryUUID
|
|
}
|
|
|
|
viewPath := credentialBarrierPrefix + entry.UUID + "/"
|
|
view := NewBarrierView(c.barrier, viewPath)
|
|
sysView := c.mountEntrySysView(entry)
|
|
|
|
// Create the new backend
|
|
backend, err := c.newCredentialBackend(entry.Type, sysView, view, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if backend == nil {
|
|
return fmt.Errorf("nil backend returned from %q factory", entry.Type)
|
|
}
|
|
|
|
if err := backend.Initialize(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Update the auth table
|
|
newTable := c.auth.shallowClone()
|
|
newTable.Entries = append(newTable.Entries, entry)
|
|
if err := c.persistAuth(newTable, entry.Local); err != nil {
|
|
return errors.New("failed to update auth table")
|
|
}
|
|
|
|
c.auth = newTable
|
|
|
|
path := credentialRoutePrefix + entry.Path
|
|
if err := c.router.Mount(backend, path, entry, view); err != nil {
|
|
return err
|
|
}
|
|
|
|
if c.logger.IsInfo() {
|
|
c.logger.Info("core: enabled credential backend", "path", entry.Path, "type", entry.Type)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// disableCredential is used to disable an existing credential backend; the
|
|
// boolean indicates if it existed
|
|
func (c *Core) disableCredential(path string) (bool, error) {
|
|
// Ensure we end the path in a slash
|
|
if !strings.HasSuffix(path, "/") {
|
|
path += "/"
|
|
}
|
|
|
|
// Ensure the token backend is not affected
|
|
if path == "token/" {
|
|
return true, fmt.Errorf("token credential backend cannot be disabled")
|
|
}
|
|
|
|
// Store the view for this backend
|
|
fullPath := credentialRoutePrefix + path
|
|
view := c.router.MatchingStorageView(fullPath)
|
|
if view == nil {
|
|
return false, fmt.Errorf("no matching backend %s", fullPath)
|
|
}
|
|
|
|
// Mark the entry as tainted
|
|
if err := c.taintCredEntry(path); err != nil {
|
|
return true, err
|
|
}
|
|
|
|
// Taint the router path to prevent routing
|
|
if err := c.router.Taint(fullPath); err != nil {
|
|
return true, err
|
|
}
|
|
|
|
// Revoke credentials from this path
|
|
if err := c.expiration.RevokePrefix(fullPath); err != nil {
|
|
return true, err
|
|
}
|
|
|
|
// Call cleanup function if it exists
|
|
backend := c.router.MatchingBackend(fullPath)
|
|
if backend != nil {
|
|
backend.Cleanup()
|
|
}
|
|
|
|
// Unmount the backend
|
|
if err := c.router.Unmount(fullPath); err != nil {
|
|
return true, err
|
|
}
|
|
|
|
// Clear the data in the view
|
|
if view != nil {
|
|
if err := logical.ClearView(view); err != nil {
|
|
return true, err
|
|
}
|
|
}
|
|
|
|
// Remove the mount table entry
|
|
if err := c.removeCredEntry(path); err != nil {
|
|
return true, err
|
|
}
|
|
if c.logger.IsInfo() {
|
|
c.logger.Info("core: disabled credential backend", "path", path)
|
|
}
|
|
return true, nil
|
|
}
|
|
|
|
// removeCredEntry is used to remove an entry in the auth table
|
|
func (c *Core) removeCredEntry(path string) error {
|
|
c.authLock.Lock()
|
|
defer c.authLock.Unlock()
|
|
|
|
// Taint the entry from the auth table
|
|
newTable := c.auth.shallowClone()
|
|
entry := newTable.remove(path)
|
|
if entry == nil {
|
|
c.logger.Error("core: nil entry found removing entry in auth table", "path", path)
|
|
return logical.CodedError(500, "failed to remove entry in auth table")
|
|
}
|
|
|
|
// Update the auth table
|
|
if err := c.persistAuth(newTable, entry.Local); err != nil {
|
|
return errors.New("failed to update auth table")
|
|
}
|
|
|
|
c.auth = newTable
|
|
|
|
return nil
|
|
}
|
|
|
|
// taintCredEntry is used to mark an entry in the auth table as tainted
|
|
func (c *Core) taintCredEntry(path string) error {
|
|
c.authLock.Lock()
|
|
defer c.authLock.Unlock()
|
|
|
|
// Taint the entry from the auth table
|
|
// We do this on the original since setting the taint operates
|
|
// on the entries which a shallow clone shares anyways
|
|
entry := c.auth.setTaint(path, true)
|
|
|
|
// Ensure there was a match
|
|
if entry == nil {
|
|
return fmt.Errorf("no matching backend")
|
|
}
|
|
|
|
// Update the auth table
|
|
if err := c.persistAuth(c.auth, entry.Local); err != nil {
|
|
return errors.New("failed to update auth table")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// loadCredentials is invoked as part of postUnseal to load the auth table
|
|
func (c *Core) loadCredentials() error {
|
|
authTable := &MountTable{}
|
|
localAuthTable := &MountTable{}
|
|
|
|
// Load the existing mount table
|
|
raw, err := c.barrier.Get(coreAuthConfigPath)
|
|
if err != nil {
|
|
c.logger.Error("core: failed to read auth table", "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
rawLocal, err := c.barrier.Get(coreLocalAuthConfigPath)
|
|
if err != nil {
|
|
c.logger.Error("core: failed to read local auth table", "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
|
|
c.authLock.Lock()
|
|
defer c.authLock.Unlock()
|
|
|
|
if raw != nil {
|
|
if err := jsonutil.DecodeJSON(raw.Value, authTable); err != nil {
|
|
c.logger.Error("core: failed to decode auth table", "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
c.auth = authTable
|
|
}
|
|
if rawLocal != nil {
|
|
if err := jsonutil.DecodeJSON(rawLocal.Value, localAuthTable); err != nil {
|
|
c.logger.Error("core: failed to decode local auth table", "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
c.auth.Entries = append(c.auth.Entries, localAuthTable.Entries...)
|
|
}
|
|
|
|
// Done if we have restored the auth table
|
|
if c.auth != nil {
|
|
needPersist := false
|
|
|
|
// Upgrade to typed auth table
|
|
if c.auth.Type == "" {
|
|
c.auth.Type = credentialTableType
|
|
needPersist = true
|
|
}
|
|
|
|
// Upgrade to table-scoped entries
|
|
for _, entry := range c.auth.Entries {
|
|
if entry.Table == "" {
|
|
entry.Table = c.auth.Type
|
|
needPersist = true
|
|
}
|
|
}
|
|
|
|
if !needPersist {
|
|
return nil
|
|
}
|
|
} else {
|
|
c.auth = defaultAuthTable()
|
|
}
|
|
|
|
if err := c.persistAuth(c.auth, false); err != nil {
|
|
c.logger.Error("core: failed to persist auth table", "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// persistAuth is used to persist the auth table after modification
|
|
func (c *Core) persistAuth(table *MountTable, localOnly bool) error {
|
|
if table.Type != credentialTableType {
|
|
c.logger.Error("core: given table to persist has wrong type", "actual_type", table.Type, "expected_type", credentialTableType)
|
|
return fmt.Errorf("invalid table type given, not persisting")
|
|
}
|
|
|
|
for _, entry := range table.Entries {
|
|
if entry.Table != table.Type {
|
|
c.logger.Error("core: given entry to persist in auth table has wrong table value", "path", entry.Path, "entry_table_type", entry.Table, "actual_type", table.Type)
|
|
return fmt.Errorf("invalid auth entry found, not persisting")
|
|
}
|
|
}
|
|
|
|
nonLocalAuth := &MountTable{
|
|
Type: credentialTableType,
|
|
}
|
|
|
|
localAuth := &MountTable{
|
|
Type: credentialTableType,
|
|
}
|
|
|
|
for _, entry := range table.Entries {
|
|
if entry.Local {
|
|
localAuth.Entries = append(localAuth.Entries, entry)
|
|
} else {
|
|
nonLocalAuth.Entries = append(nonLocalAuth.Entries, entry)
|
|
}
|
|
}
|
|
|
|
if !localOnly {
|
|
// Marshal the table
|
|
compressedBytes, err := jsonutil.EncodeJSONAndCompress(nonLocalAuth, nil)
|
|
if err != nil {
|
|
c.logger.Error("core: failed to encode and/or compress auth table", "error", err)
|
|
return err
|
|
}
|
|
|
|
// Create an entry
|
|
entry := &Entry{
|
|
Key: coreAuthConfigPath,
|
|
Value: compressedBytes,
|
|
}
|
|
|
|
// Write to the physical backend
|
|
if err := c.barrier.Put(entry); err != nil {
|
|
c.logger.Error("core: failed to persist auth table", "error", err)
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Repeat with local auth
|
|
compressedBytes, err := jsonutil.EncodeJSONAndCompress(localAuth, nil)
|
|
if err != nil {
|
|
c.logger.Error("core: failed to encode and/or compress local auth table", "error", err)
|
|
return err
|
|
}
|
|
|
|
entry := &Entry{
|
|
Key: coreLocalAuthConfigPath,
|
|
Value: compressedBytes,
|
|
}
|
|
|
|
if err := c.barrier.Put(entry); err != nil {
|
|
c.logger.Error("core: failed to persist local auth table", "error", err)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// setupCredentials is invoked after we've loaded the auth table to
|
|
// initialize the credential backends and setup the router
|
|
func (c *Core) setupCredentials() error {
|
|
var backend logical.Backend
|
|
var view *BarrierView
|
|
var err error
|
|
var persistNeeded bool
|
|
|
|
c.authLock.Lock()
|
|
defer c.authLock.Unlock()
|
|
|
|
for _, entry := range c.auth.Entries {
|
|
// Work around some problematic code that existed in master for a while
|
|
if strings.HasPrefix(entry.Path, credentialRoutePrefix) {
|
|
entry.Path = strings.TrimPrefix(entry.Path, credentialRoutePrefix)
|
|
persistNeeded = true
|
|
}
|
|
|
|
// Create a barrier view using the UUID
|
|
viewPath := credentialBarrierPrefix + entry.UUID + "/"
|
|
view = NewBarrierView(c.barrier, viewPath)
|
|
sysView := c.mountEntrySysView(entry)
|
|
|
|
// Initialize the backend
|
|
backend, err = c.newCredentialBackend(entry.Type, sysView, view, nil)
|
|
if err != nil {
|
|
c.logger.Error("core: failed to create credential entry", "path", entry.Path, "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
if backend == nil {
|
|
return fmt.Errorf("nil backend returned from %q factory", entry.Type)
|
|
}
|
|
|
|
if err := backend.Initialize(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Mount the backend
|
|
path := credentialRoutePrefix + entry.Path
|
|
err = c.router.Mount(backend, path, entry, view)
|
|
if err != nil {
|
|
c.logger.Error("core: failed to mount auth entry", "path", entry.Path, "error", err)
|
|
return errLoadAuthFailed
|
|
}
|
|
|
|
// Ensure the path is tainted if set in the mount table
|
|
if entry.Tainted {
|
|
c.router.Taint(path)
|
|
}
|
|
|
|
// Check if this is the token store
|
|
if entry.Type == "token" {
|
|
c.tokenStore = backend.(*TokenStore)
|
|
|
|
// this is loaded *after* the normal mounts, including cubbyhole
|
|
c.router.tokenStoreSalt = c.tokenStore.salt
|
|
c.tokenStore.cubbyholeBackend = c.router.MatchingBackend("cubbyhole/").(*CubbyholeBackend)
|
|
}
|
|
}
|
|
|
|
if persistNeeded {
|
|
return c.persistAuth(c.auth, false)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// teardownCredentials is used before we seal the vault to reset the credential
|
|
// backends to their unloaded state. This is reversed by loadCredentials.
|
|
func (c *Core) teardownCredentials() error {
|
|
c.authLock.Lock()
|
|
defer c.authLock.Unlock()
|
|
|
|
if c.auth != nil {
|
|
authTable := c.auth.shallowClone()
|
|
for _, e := range authTable.Entries {
|
|
backend := c.router.MatchingBackend(credentialRoutePrefix + e.Path)
|
|
if backend != nil {
|
|
backend.Cleanup()
|
|
}
|
|
}
|
|
}
|
|
|
|
c.auth = nil
|
|
c.tokenStore = nil
|
|
return nil
|
|
}
|
|
|
|
// newCredentialBackend is used to create and configure a new credential backend by name
|
|
func (c *Core) newCredentialBackend(
|
|
t string, sysView logical.SystemView, view logical.Storage, conf map[string]string) (logical.Backend, error) {
|
|
if alias, ok := credentialAliases[t]; ok {
|
|
t = alias
|
|
}
|
|
f, ok := c.credentialBackends[t]
|
|
if !ok {
|
|
return nil, fmt.Errorf("unknown backend type: %s", t)
|
|
}
|
|
|
|
config := &logical.BackendConfig{
|
|
StorageView: view,
|
|
Logger: c.logger,
|
|
Config: conf,
|
|
System: sysView,
|
|
}
|
|
|
|
b, err := f(config)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return b, nil
|
|
}
|
|
|
|
// defaultAuthTable creates a default auth table
|
|
func defaultAuthTable() *MountTable {
|
|
table := &MountTable{
|
|
Type: credentialTableType,
|
|
}
|
|
tokenUUID, err := uuid.GenerateUUID()
|
|
if err != nil {
|
|
panic(fmt.Sprintf("could not generate UUID for default auth table token entry: %v", err))
|
|
}
|
|
tokenAuth := &MountEntry{
|
|
Table: credentialTableType,
|
|
Path: "token/",
|
|
Type: "token",
|
|
Description: "token based credentials",
|
|
UUID: tokenUUID,
|
|
}
|
|
table.Entries = append(table.Entries, tokenAuth)
|
|
return table
|
|
}
|