mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 10:37:56 +00:00 
			
		
		
		
	 c48159ea3a
			
		
	
	c48159ea3a
	
	
	
		
			
			* upgrade aws roles * test upgrade aws roles * Initialize aws credential backend at mount time * add a TODO * create end-to-end test for builtin/credential/aws * fix bug in initializer * improve comments * add Initialize() to logical.Backend * use Initialize() in Core.enableCredentialInternal() * use InitializeRequest to call Initialize() * improve unit testing for framework.Backend * call logical.Backend.Initialize() from all of the places that it needs to be called. * implement backend.proto changes for logical.Backend.Initialize() * persist current role storage version when upgrading aws roles * format comments correctly * improve comments * use postUnseal funcs to initialize backends * simplify test suite * improve test suite * simplify logic in aws role upgrade * simplify aws credential initialization logic * simplify logic in aws role upgrade * use the core's activeContext for initialization * refactor builtin/plugin/Backend * use a goroutine to upgrade the aws roles * misc improvements and cleanup * do not run AWS role upgrade on DR Secondary * always call logical.Backend.Initialize() when loading a plugin. * improve comments * on standbys and DR secondaries we do not want to run any kind of upgrade logic * fix awsVersion struct * clarify aws version upgrade * make the upgrade logic for aws auth more explicit * aws upgrade is now called from a switch * fix fallthrough bug * simplify logic * simplify logic * rename things * introduce currentAwsVersion const to track aws version * improve comments * rearrange things once more * conglomerate things into one function * stub out aws auth initialize e2e test * improve aws auth initialize e2e test * finish aws auth initialize e2e test * tinker with aws auth initialize e2e test * tinker with aws auth initialize e2e test * tinker with aws auth initialize e2e test * fix typo in test suite * simplify logic a tad * rearrange assignment * Fix a few lifecycle related issues in #7025 (#7075) * Fix panic when plugin fails to load
		
			
				
	
	
		
			227 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			227 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package plugin
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"fmt"
 | |
| 	"net/rpc"
 | |
| 	"reflect"
 | |
| 	"sync"
 | |
| 
 | |
| 	uuid "github.com/hashicorp/go-uuid"
 | |
| 	"github.com/hashicorp/vault/sdk/framework"
 | |
| 	"github.com/hashicorp/vault/sdk/helper/consts"
 | |
| 	"github.com/hashicorp/vault/sdk/logical"
 | |
| 	bplugin "github.com/hashicorp/vault/sdk/plugin"
 | |
| )
 | |
| 
 | |
| var (
 | |
| 	ErrMismatchType  = fmt.Errorf("mismatch on mounted backend and plugin backend type")
 | |
| 	ErrMismatchPaths = fmt.Errorf("mismatch on mounted backend and plugin backend special paths")
 | |
| )
 | |
| 
 | |
| // Factory returns a configured plugin logical.Backend.
 | |
| func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 | |
| 	_, ok := conf.Config["plugin_name"]
 | |
| 	if !ok {
 | |
| 		return nil, fmt.Errorf("plugin_name not provided")
 | |
| 	}
 | |
| 	b, err := Backend(ctx, conf)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	if err := b.Setup(ctx, conf); err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	return b, nil
 | |
| }
 | |
| 
 | |
| // Backend returns an instance of the backend, either as a plugin if external
 | |
| // or as a concrete implementation if builtin, casted as logical.Backend.
 | |
| func Backend(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
 | |
| 	var b PluginBackend
 | |
| 
 | |
| 	name := conf.Config["plugin_name"]
 | |
| 	pluginType, err := consts.ParsePluginType(conf.Config["plugin_type"])
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	sys := conf.System
 | |
| 
 | |
| 	// NewBackend with isMetadataMode set to true
 | |
| 	raw, err := bplugin.NewBackend(ctx, name, pluginType, sys, conf, true)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	err = raw.Setup(ctx, conf)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	// Get SpecialPaths and BackendType
 | |
| 	paths := raw.SpecialPaths()
 | |
| 	btype := raw.Type()
 | |
| 
 | |
| 	// Cleanup meta plugin backend
 | |
| 	raw.Cleanup(ctx)
 | |
| 
 | |
| 	// Initialize b.Backend with dummy backend since plugin
 | |
| 	// backends will need to be lazy loaded.
 | |
| 	b.Backend = &framework.Backend{
 | |
| 		PathsSpecial: paths,
 | |
| 		BackendType:  btype,
 | |
| 	}
 | |
| 
 | |
| 	b.config = conf
 | |
| 
 | |
| 	return &b, nil
 | |
| }
 | |
| 
 | |
| // PluginBackend is a thin wrapper around plugin.BackendPluginClient
 | |
| type PluginBackend struct {
 | |
| 	logical.Backend
 | |
| 	sync.RWMutex
 | |
| 
 | |
| 	config *logical.BackendConfig
 | |
| 
 | |
| 	// Used to detect if we already reloaded
 | |
| 	canary string
 | |
| 
 | |
| 	// Used to detect if plugin is set
 | |
| 	loaded bool
 | |
| }
 | |
| 
 | |
| // startBackend starts a plugin backend
 | |
| func (b *PluginBackend) startBackend(ctx context.Context, storage logical.Storage) error {
 | |
| 	pluginName := b.config.Config["plugin_name"]
 | |
| 	pluginType, err := consts.ParsePluginType(b.config.Config["plugin_type"])
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	// Ensure proper cleanup of the backend (i.e. call client.Kill())
 | |
| 	b.Backend.Cleanup(ctx)
 | |
| 
 | |
| 	nb, err := bplugin.NewBackend(ctx, pluginName, pluginType, b.config.System, b.config, false)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 	err = nb.Setup(ctx, b.config)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	// If the backend has not been loaded (i.e. still in metadata mode),
 | |
| 	// check if type and special paths still matches
 | |
| 	if !b.loaded {
 | |
| 		if b.Backend.Type() != nb.Type() {
 | |
| 			nb.Cleanup(ctx)
 | |
| 			b.Logger().Warn("failed to start plugin process", "plugin", b.config.Config["plugin_name"], "error", ErrMismatchType)
 | |
| 			return ErrMismatchType
 | |
| 		}
 | |
| 		if !reflect.DeepEqual(b.Backend.SpecialPaths(), nb.SpecialPaths()) {
 | |
| 			nb.Cleanup(ctx)
 | |
| 			b.Logger().Warn("failed to start plugin process", "plugin", b.config.Config["plugin_name"], "error", ErrMismatchPaths)
 | |
| 			return ErrMismatchPaths
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	b.Backend = nb
 | |
| 	b.loaded = true
 | |
| 
 | |
| 	// call Initialize() explicitly here.
 | |
| 	return b.Backend.Initialize(ctx, &logical.InitializationRequest{
 | |
| 		Storage: storage,
 | |
| 	})
 | |
| }
 | |
| 
 | |
| // lazyLoad lazy-loads the backend before running a method
 | |
| func (b *PluginBackend) lazyLoadBackend(ctx context.Context, storage logical.Storage, methodWrapper func() error) error {
 | |
| 	b.RLock()
 | |
| 	canary := b.canary
 | |
| 
 | |
| 	// Lazy-load backend
 | |
| 	if !b.loaded {
 | |
| 		// Upgrade lock
 | |
| 		b.RUnlock()
 | |
| 		b.Lock()
 | |
| 		// Check once more after lock swap
 | |
| 		if !b.loaded {
 | |
| 			err := b.startBackend(ctx, storage)
 | |
| 			if err != nil {
 | |
| 				b.Unlock()
 | |
| 				return err
 | |
| 			}
 | |
| 		}
 | |
| 		b.Unlock()
 | |
| 		b.RLock()
 | |
| 	}
 | |
| 
 | |
| 	err := methodWrapper()
 | |
| 	b.RUnlock()
 | |
| 
 | |
| 	// Need to compare string value for case were err comes from plugin RPC
 | |
| 	// and is returned as plugin.BasicError type.
 | |
| 	if err != nil &&
 | |
| 		(err.Error() == rpc.ErrShutdown.Error() || err == bplugin.ErrPluginShutdown) {
 | |
| 		// Reload plugin if it's an rpc.ErrShutdown
 | |
| 		b.Lock()
 | |
| 		if b.canary == canary {
 | |
| 			b.Logger().Debug("reloading plugin backend", "plugin", b.config.Config["plugin_name"])
 | |
| 			err := b.startBackend(ctx, storage)
 | |
| 			if err != nil {
 | |
| 				b.Unlock()
 | |
| 				return err
 | |
| 			}
 | |
| 			b.canary, err = uuid.GenerateUUID()
 | |
| 			if err != nil {
 | |
| 				b.Unlock()
 | |
| 				return err
 | |
| 			}
 | |
| 		}
 | |
| 		b.Unlock()
 | |
| 
 | |
| 		// Try once more
 | |
| 		b.RLock()
 | |
| 		defer b.RUnlock()
 | |
| 		return methodWrapper()
 | |
| 	}
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| // HandleRequest is a thin wrapper implementation of HandleRequest that includes automatic plugin reload.
 | |
| func (b *PluginBackend) HandleRequest(ctx context.Context, req *logical.Request) (resp *logical.Response, err error) {
 | |
| 
 | |
| 	err = b.lazyLoadBackend(ctx, req.Storage, func() error {
 | |
| 		var merr error
 | |
| 		resp, merr = b.Backend.HandleRequest(ctx, req)
 | |
| 		return merr
 | |
| 	})
 | |
| 
 | |
| 	return
 | |
| }
 | |
| 
 | |
| // HandleExistenceCheck is a thin wrapper implementation of HandleExistenceCheck that includes automatic plugin reload.
 | |
| func (b *PluginBackend) HandleExistenceCheck(ctx context.Context, req *logical.Request) (checkFound bool, exists bool, err error) {
 | |
| 
 | |
| 	err = b.lazyLoadBackend(ctx, req.Storage, func() error {
 | |
| 		var merr error
 | |
| 		checkFound, exists, merr = b.Backend.HandleExistenceCheck(ctx, req)
 | |
| 		return merr
 | |
| 	})
 | |
| 
 | |
| 	return
 | |
| }
 | |
| 
 | |
| // Initialize is a thin wrapper implementation of Initialize that includes automatic plugin reload.
 | |
| func (b *PluginBackend) Initialize(ctx context.Context, req *logical.InitializationRequest) error {
 | |
| 
 | |
| 	// This method is only ever called just after mounting, so we know that the
 | |
| 	// call to lazyLoadBackend() will call startBackend().  Since
 | |
| 	// startBackend() calls Initialize() on the underlying logical.Backend, the
 | |
| 	// method wrapper that we pass in here is a no-op
 | |
| 	return b.lazyLoadBackend(ctx, req.Storage, func() error {
 | |
| 		return nil
 | |
| 	})
 | |
| }
 |