upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-09 08:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

VAULT-39368 fix version not being populated for some KV mounts in events/observations (#9270) (#9278)

Browse source 
Co-authored-by: Violet Hynes <violet.hynes@hashicorp.com>
This commit is contained in:
Vault Automation 2025-09-11 12:08:22 -06:00 committed by GitHub
parent a73eca5759
commit 0fe7702c62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vault/auth.go
View file

@ -1037,6 +1037,7 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
conf["plugin_type"] = consts.PluginTypeCredential.String()
conf["plugin_version"] = pluginVersion
pluginOptionsVersion := entry.Options["version"]
authLogger := c.baseLogger.Named(fmt.Sprintf("auth.%s.%s", t, entry.Accessor))
c.AddLogger(authLogger)
@ -1046,7 +1047,7 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
MountPath: entry.Path,
Plugin: entry.Type,
PluginVersion: pluginVersion,
Version: entry.Options["version"],
Version: pluginOptionsVersion,
})
if err != nil {
return nil, err
@ -1064,7 +1065,7 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
Plugin: entry.Type,
PluginVersion: pluginVersion,
RunningPluginVersion: pluginRunningVersion,
Version: entry.Options["version"],
Version: pluginOptionsVersion,
Local: entry.Local,
})
if err != nil {

11
vault/mount.go
View file

@ -20,6 +20,7 @@ import (
"github.com/hashicorp/vault/builtin/plugin"
"github.com/hashicorp/vault/helper/metricsutil"
"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/pluginconsts"
"github.com/hashicorp/vault/helper/versions"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
@ -1775,6 +1776,12 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
conf["plugin_type"] = consts.PluginTypeSecrets.String()
conf["plugin_version"] = pluginVersion
pluginOptionsVersion := entry.Options["version"]
// If Version isn't specified for a KV mount, it must be version 1.
if pluginOptionsVersion == "" && entry.Type == pluginconsts.SecretEngineKV {
pluginOptionsVersion = "1"
}
backendLogger := c.baseLogger.Named(fmt.Sprintf("secrets.%s.%s", t, entry.Accessor))
c.AddLogger(backendLogger)
pluginEventSender, err := c.events.WithPlugin(entry.namespace, &logical.EventPluginInfo{
@ -1783,7 +1790,7 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
MountPath: entry.Path,
Plugin: entry.Type,
PluginVersion: pluginVersion,
Version: entry.Options["version"],
Version: pluginOptionsVersion,
})
if err != nil {
return nil, err
@ -1801,7 +1808,7 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
Plugin: entry.Type,
PluginVersion: pluginVersion,
RunningPluginVersion: pluginRunningVersion,
Version: entry.Options["version"],
Version: pluginOptionsVersion,
Local: entry.Local,
})
if err != nil {