bb54e9c131
* 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
120 lines
2.5 KiB
Go
120 lines
2.5 KiB
Go
package plugin
|
|
|
|
import (
|
|
"net/rpc"
|
|
|
|
"github.com/hashicorp/go-plugin"
|
|
"github.com/hashicorp/vault/logical"
|
|
)
|
|
|
|
// StorageClient is an implementation of logical.Storage that communicates
|
|
// over RPC.
|
|
type StorageClient struct {
|
|
client *rpc.Client
|
|
}
|
|
|
|
func (s *StorageClient) List(prefix string) ([]string, error) {
|
|
var reply StorageListReply
|
|
err := s.client.Call("Plugin.List", prefix, &reply)
|
|
if err != nil {
|
|
return reply.Keys, err
|
|
}
|
|
if reply.Error != nil {
|
|
return reply.Keys, reply.Error
|
|
}
|
|
return reply.Keys, nil
|
|
}
|
|
|
|
func (s *StorageClient) Get(key string) (*logical.StorageEntry, error) {
|
|
var reply StorageGetReply
|
|
err := s.client.Call("Plugin.Get", key, &reply)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if reply.Error != nil {
|
|
return nil, reply.Error
|
|
}
|
|
return reply.StorageEntry, nil
|
|
}
|
|
|
|
func (s *StorageClient) Put(entry *logical.StorageEntry) error {
|
|
var reply StoragePutReply
|
|
err := s.client.Call("Plugin.Put", entry, &reply)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if reply.Error != nil {
|
|
return reply.Error
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *StorageClient) Delete(key string) error {
|
|
var reply StorageDeleteReply
|
|
err := s.client.Call("Plugin.Delete", key, &reply)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if reply.Error != nil {
|
|
return reply.Error
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// StorageServer is a net/rpc compatible structure for serving
|
|
type StorageServer struct {
|
|
impl logical.Storage
|
|
}
|
|
|
|
func (s *StorageServer) List(prefix string, reply *StorageListReply) error {
|
|
keys, err := s.impl.List(prefix)
|
|
*reply = StorageListReply{
|
|
Keys: keys,
|
|
Error: plugin.NewBasicError(err),
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *StorageServer) Get(key string, reply *StorageGetReply) error {
|
|
storageEntry, err := s.impl.Get(key)
|
|
*reply = StorageGetReply{
|
|
StorageEntry: storageEntry,
|
|
Error: plugin.NewBasicError(err),
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *StorageServer) Put(entry *logical.StorageEntry, reply *StoragePutReply) error {
|
|
err := s.impl.Put(entry)
|
|
*reply = StoragePutReply{
|
|
Error: plugin.NewBasicError(err),
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *StorageServer) Delete(key string, reply *StorageDeleteReply) error {
|
|
err := s.impl.Delete(key)
|
|
*reply = StorageDeleteReply{
|
|
Error: plugin.NewBasicError(err),
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type StorageListReply struct {
|
|
Keys []string
|
|
Error *plugin.BasicError
|
|
}
|
|
|
|
type StorageGetReply struct {
|
|
StorageEntry *logical.StorageEntry
|
|
Error *plugin.BasicError
|
|
}
|
|
|
|
type StoragePutReply struct {
|
|
Error *plugin.BasicError
|
|
}
|
|
|
|
type StorageDeleteReply struct {
|
|
Error *plugin.BasicError
|
|
}
|