mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 18:48:08 +00:00 
			
		
		
		
	 2b0f80b981
			
		
	
	2b0f80b981
	
	
	
		
			
			* Add backend plugin changes * Fix totp backend plugin tests * Fix logical/plugin InvalidateKey test * Fix plugin catalog CRUD test, fix NoopBackend * Clean up commented code block * Fix system backend mount test * Set plugin_name to omitempty, fix handleMountTable config parsing * Clean up comments, keep shim connections alive until cleanup * Include pluginClient, disallow LookupPlugin call from within a plugin * Add wrapper around backendPluginClient for proper cleanup * Add logger shim tests * Add logger, storage, and system shim tests * Use pointer receivers for system view shim * Use plugin name if no path is provided on mount * Enable plugins for auth backends * Add backend type attribute, move builtin/plugin/package * Fix merge conflict * Fix missing plugin name in mount config * Add integration tests on enabling auth backend plugins * Remove dependency cycle on mock-plugin * Add passthrough backend plugin, use logical.BackendType to determine lease generation * Remove vault package dependency on passthrough package * Add basic impl test for passthrough plugin * Incorporate feedback; set b.backend after shims creation on backendPluginServer * Fix totp plugin test * Add plugin backends docs * Fix tests * Fix builtin/plugin tests * Remove flatten from PluginRunner fields * Move mock plugin to logical/plugin, remove totp and passthrough plugins * Move pluginMap into newPluginClient * Do not create storage RPC connection on HandleRequest and HandleExistenceCheck * Change shim logger's Fatal to no-op * Change BackendType to uint32, match UX backend types * Change framework.Backend Setup signature * Add Setup func to logical.Backend interface * Move OptionallyEnableMlock call into plugin.Serve, update docs and comments * Remove commented var in plugin package * RegisterLicense on logical.Backend interface (#3017) * Add RegisterLicense to logical.Backend interface * Update RegisterLicense to use callback func on framework.Backend * Refactor framework.Backend.RegisterLicense * plugin: Prevent plugin.SystemViewClient.ResponseWrapData from getting JWTs * plugin: Revert BackendType to remove TypePassthrough and related references * Fix typo in plugin backends docs
		
			
				
	
	
		
			157 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			157 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package plugin
 | |
| 
 | |
| import (
 | |
| 	"net/rpc"
 | |
| 
 | |
| 	"github.com/hashicorp/go-plugin"
 | |
| 	"github.com/hashicorp/vault/logical"
 | |
| )
 | |
| 
 | |
| // backendPluginServer is the RPC server that backendPluginClient talks to,
 | |
| // it methods conforming to requirements by net/rpc
 | |
| type backendPluginServer struct {
 | |
| 	broker  *plugin.MuxBroker
 | |
| 	backend logical.Backend
 | |
| 	factory func(*logical.BackendConfig) (logical.Backend, error)
 | |
| 
 | |
| 	loggerClient  *rpc.Client
 | |
| 	sysViewClient *rpc.Client
 | |
| 	storageClient *rpc.Client
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) HandleRequest(args *HandleRequestArgs, reply *HandleRequestReply) error {
 | |
| 	storage := &StorageClient{client: b.storageClient}
 | |
| 	args.Request.Storage = storage
 | |
| 
 | |
| 	resp, err := b.backend.HandleRequest(args.Request)
 | |
| 	*reply = HandleRequestReply{
 | |
| 		Response: resp,
 | |
| 		Error:    plugin.NewBasicError(err),
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) SpecialPaths(_ interface{}, reply *SpecialPathsReply) error {
 | |
| 	*reply = SpecialPathsReply{
 | |
| 		Paths: b.backend.SpecialPaths(),
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) HandleExistenceCheck(args *HandleExistenceCheckArgs, reply *HandleExistenceCheckReply) error {
 | |
| 	storage := &StorageClient{client: b.storageClient}
 | |
| 	args.Request.Storage = storage
 | |
| 
 | |
| 	checkFound, exists, err := b.backend.HandleExistenceCheck(args.Request)
 | |
| 	*reply = HandleExistenceCheckReply{
 | |
| 		CheckFound: checkFound,
 | |
| 		Exists:     exists,
 | |
| 		Error:      plugin.NewBasicError(err),
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) Cleanup(_ interface{}, _ *struct{}) error {
 | |
| 	b.backend.Cleanup()
 | |
| 
 | |
| 	// Close rpc clients
 | |
| 	b.loggerClient.Close()
 | |
| 	b.sysViewClient.Close()
 | |
| 	b.storageClient.Close()
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) Initialize(_ interface{}, _ *struct{}) error {
 | |
| 	err := b.backend.Initialize()
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) InvalidateKey(args string, _ *struct{}) error {
 | |
| 	b.backend.InvalidateKey(args)
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // Setup dials into the plugin's broker to get a shimmed storage, logger, and
 | |
| // system view of the backend. This method also instantiates the underlying
 | |
| // backend through its factory func for the server side of the plugin.
 | |
| func (b *backendPluginServer) Setup(args *SetupArgs, reply *SetupReply) error {
 | |
| 	// Dial for storage
 | |
| 	storageConn, err := b.broker.Dial(args.StorageID)
 | |
| 	if err != nil {
 | |
| 		*reply = SetupReply{
 | |
| 			Error: plugin.NewBasicError(err),
 | |
| 		}
 | |
| 		return nil
 | |
| 	}
 | |
| 	rawStorageClient := rpc.NewClient(storageConn)
 | |
| 	b.storageClient = rawStorageClient
 | |
| 
 | |
| 	storage := &StorageClient{client: rawStorageClient}
 | |
| 
 | |
| 	// Dial for logger
 | |
| 	loggerConn, err := b.broker.Dial(args.LoggerID)
 | |
| 	if err != nil {
 | |
| 		*reply = SetupReply{
 | |
| 			Error: plugin.NewBasicError(err),
 | |
| 		}
 | |
| 		return nil
 | |
| 	}
 | |
| 	rawLoggerClient := rpc.NewClient(loggerConn)
 | |
| 	b.loggerClient = rawLoggerClient
 | |
| 
 | |
| 	logger := &LoggerClient{client: rawLoggerClient}
 | |
| 
 | |
| 	// Dial for sys view
 | |
| 	sysViewConn, err := b.broker.Dial(args.SysViewID)
 | |
| 	if err != nil {
 | |
| 		*reply = SetupReply{
 | |
| 			Error: plugin.NewBasicError(err),
 | |
| 		}
 | |
| 		return nil
 | |
| 	}
 | |
| 	rawSysViewClient := rpc.NewClient(sysViewConn)
 | |
| 	b.sysViewClient = rawSysViewClient
 | |
| 
 | |
| 	sysView := &SystemViewClient{client: rawSysViewClient}
 | |
| 
 | |
| 	config := &logical.BackendConfig{
 | |
| 		StorageView: storage,
 | |
| 		Logger:      logger,
 | |
| 		System:      sysView,
 | |
| 		Config:      args.Config,
 | |
| 	}
 | |
| 
 | |
| 	// Call the underlying backend factory after shims have been created
 | |
| 	// to set b.backend
 | |
| 	backend, err := b.factory(config)
 | |
| 	if err != nil {
 | |
| 		*reply = SetupReply{
 | |
| 			Error: plugin.NewBasicError(err),
 | |
| 		}
 | |
| 	}
 | |
| 	b.backend = backend
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) Type(_ interface{}, reply *TypeReply) error {
 | |
| 	*reply = TypeReply{
 | |
| 		Type: b.backend.Type(),
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func (b *backendPluginServer) RegisterLicense(args *RegisterLicenseArgs, reply *RegisterLicenseReply) error {
 | |
| 	err := b.backend.RegisterLicense(args.License)
 | |
| 	if err != nil {
 | |
| 		*reply = RegisterLicenseReply{
 | |
| 			Error: plugin.NewBasicError(err),
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 |