6853d80212
* Add plugin reload capability on all mounts for a specific plugin type * Comments cleanup * Add per-mount plugin backend reload, add tests * Fix typos * Remove old comment * Reuse existing storage view in reloadPluginCommon * Correctly handle reloading auth plugin backends * Update path to plugin/backend/reload * Use multierrors on reloadMatchingPluginMounts, attempt to reload all mounts provided * Use internal value as check to ensure plugin backend reload * Remove connection state from request for plugins at the moment * Minor cleanup * Refactor tests
126 lines
3.3 KiB
Go
126 lines
3.3 KiB
Go
package vault
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
multierror "github.com/hashicorp/go-multierror"
|
|
"github.com/hashicorp/vault/logical"
|
|
)
|
|
|
|
// reloadPluginMounts reloads provided mounts, regardless of
|
|
// plugin name, as long as the backend type is plugin.
|
|
func (c *Core) reloadMatchingPluginMounts(mounts []string) error {
|
|
c.mountsLock.Lock()
|
|
defer c.mountsLock.Unlock()
|
|
|
|
var errors error
|
|
for _, mount := range mounts {
|
|
entry := c.router.MatchingMountEntry(mount)
|
|
if entry == nil {
|
|
errors = multierror.Append(errors, fmt.Errorf("cannot fetch mount entry on %s", mount))
|
|
continue
|
|
// return fmt.Errorf("cannot fetch mount entry on %s", mount)
|
|
}
|
|
|
|
var isAuth bool
|
|
fullPath := c.router.MatchingMount(mount)
|
|
if strings.HasPrefix(fullPath, credentialRoutePrefix) {
|
|
isAuth = true
|
|
}
|
|
|
|
if entry.Type == "plugin" {
|
|
err := c.reloadPluginCommon(entry, isAuth)
|
|
if err != nil {
|
|
errors = multierror.Append(errors, fmt.Errorf("cannot reload plugin on %s: %v", mount, err))
|
|
continue
|
|
}
|
|
c.logger.Info("core: successfully reloaded plugin", "plugin", entry.Config.PluginName, "path", entry.Path)
|
|
}
|
|
}
|
|
return errors
|
|
}
|
|
|
|
// reloadPlugin reloads all mounted backends that are of
|
|
// plugin pluginName (name of the plugin as registered in
|
|
// the plugin catalog).
|
|
func (c *Core) reloadMatchingPlugin(pluginName string) error {
|
|
c.mountsLock.Lock()
|
|
defer c.mountsLock.Unlock()
|
|
|
|
// Filter mount entries that only matches the plugin name
|
|
for _, entry := range c.mounts.Entries {
|
|
if entry.Config.PluginName == pluginName && entry.Type == "plugin" {
|
|
err := c.reloadPluginCommon(entry, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.logger.Info("core: successfully reloaded plugin", "plugin", pluginName, "path", entry.Path)
|
|
}
|
|
}
|
|
|
|
// Filter auth mount entries that ony matches the plugin name
|
|
for _, entry := range c.auth.Entries {
|
|
if entry.Config.PluginName == pluginName && entry.Type == "plugin" {
|
|
err := c.reloadPluginCommon(entry, true)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.logger.Info("core: successfully reloaded plugin", "plugin", pluginName, "path", entry.Path)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// reloadPluginCommon is a generic method to reload a backend provided a
|
|
// MountEntry. entry.Type should be checked by the caller to ensure that
|
|
// it's a "plugin" type.
|
|
func (c *Core) reloadPluginCommon(entry *MountEntry, isAuth bool) error {
|
|
path := entry.Path
|
|
|
|
// Fast-path out if the backend doesn't exist
|
|
raw, ok := c.router.root.Get(path)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
// Call backend's Cleanup routine
|
|
re := raw.(*routeEntry)
|
|
re.backend.Cleanup()
|
|
|
|
view := re.storageView
|
|
|
|
sysView := c.mountEntrySysView(entry)
|
|
conf := make(map[string]string)
|
|
if entry.Config.PluginName != "" {
|
|
conf["plugin_name"] = entry.Config.PluginName
|
|
}
|
|
|
|
var backend logical.Backend
|
|
var err error
|
|
if !isAuth {
|
|
// Dispense a new backend
|
|
backend, err = c.newLogicalBackend(entry.Type, sysView, view, conf)
|
|
} else {
|
|
backend, err = c.newCredentialBackend(entry.Type, sysView, view, conf)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if backend == nil {
|
|
return fmt.Errorf("nil backend of type %q returned from creation function", entry.Type)
|
|
}
|
|
|
|
// Call initialize; this takes care of init tasks that must be run after
|
|
// the ignore paths are collected.
|
|
if err := backend.Initialize(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Set the backend back
|
|
re.backend = backend
|
|
|
|
return nil
|
|
}
|