mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-07 15:17:03 +02:00
* cli: only set default command parameter to plugin name if sha256 is provided * api: write warnings to RegisterPluginResponse, propagate up to cli * api: filter out 'Endpoint replaced the value of these parameters' warning before returning in RegisterPluginWithContext * docs * add TODO on filtering that links to api type parameter deprecation ticket * fix tests * allocate filteredWarning slice only if there are warnings * improve deferred resp close and early error return conditionals in RegisterPluginWithContext * refer to sha256 as cli option -sha256 in command cli usage * break up ui error lines for sha256 and version flag check * consolidate if statements for sha256 and command, oci_image check in cli * consolidate if statements for sha256 and command, oci_image check in api * new RegisterPluginV2 and RegisterPluginWithContextV2 api client functions for backward compatibility * add changelog * more descriptive changelog * rename RegisterPluginV2 to RegisterPluginDetailed and RegisterPluginWithContextV2 to RegisterPluginWithContextDetailed * return nil, nil if no warnings to preserve status code * fix eof from decoding (check if no content before decoding) * doc for RegisterPluginResponse * only validate plugin.Command in plugin catalog set for downloaded and binary plugins, which rely on plugin.Command input; extracted artifact plugins don't rely on plugin.Command input * Update website/content/api-docs/system/plugins-catalog.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * Update website/content/api-docs/system/plugins-catalog.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * Update website/content/api-docs/system/plugins-catalog.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * Update website/content/docs/commands/plugin/register.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * Update website/content/docs/commands/plugin/register.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * Update website/content/docs/commands/plugin/register.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * Update website/content/docs/commands/plugin/register.mdx Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com> * move up enterprise note on plugin register command doc * [DOCS] Editorial suggestions for PR #30811 (#31111) * suggestions * move common reqs to a partial * fix typo * tweak reqs * Update website/content/partials/plugins/prepare-plugin.mdx Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> * Update website/content/partials/plugins/prepare-plugin.mdx Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> * Update website/content/partials/plugins/prepare-plugin.mdx Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> * tweak feedback * remove deprecation * Update website/content/partials/plugins/common-requirements.mdx Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> * save * Update website/content/docs/plugins/rollback.mdx Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> * Update website/content/docs/plugins/upgrade.mdx Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> * fix formatting --------- Co-authored-by: helenfufu <25168806+helenfufu@users.noreply.github.com> --------- Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com>
362 lines
8.8 KiB
Go
362 lines
8.8 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: MPL-2.0
|
|
|
|
package api
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/hashicorp/go-secure-stdlib/strutil"
|
|
)
|
|
|
|
func TestRegisterPlugin(t *testing.T) {
|
|
mockVaultServer := httptest.NewServer(http.HandlerFunc(mockVaultHandlerRegister))
|
|
defer mockVaultServer.Close()
|
|
|
|
cfg := DefaultConfig()
|
|
cfg.Address = mockVaultServer.URL
|
|
client, err := NewClient(cfg)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
resp, err := client.Sys().RegisterPluginWithContextDetailed(context.Background(), &RegisterPluginInput{
|
|
Version: "v1.0.0",
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(resp.Warnings) > 0 {
|
|
t.Errorf("expected no warnings, got: %v", resp.Warnings)
|
|
}
|
|
}
|
|
|
|
func TestListPlugins(t *testing.T) {
|
|
mockVaultServer := httptest.NewServer(http.HandlerFunc(mockVaultHandlerList))
|
|
defer mockVaultServer.Close()
|
|
|
|
cfg := DefaultConfig()
|
|
cfg.Address = mockVaultServer.URL
|
|
client, err := NewClient(cfg)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
for name, tc := range map[string]struct {
|
|
input ListPluginsInput
|
|
expectedPlugins map[PluginType][]string
|
|
}{
|
|
"no type specified": {
|
|
input: ListPluginsInput{},
|
|
expectedPlugins: map[PluginType][]string{
|
|
PluginTypeCredential: {"alicloud"},
|
|
PluginTypeDatabase: {"cassandra-database-plugin"},
|
|
PluginTypeSecrets: {"ad", "alicloud"},
|
|
},
|
|
},
|
|
"only auth plugins": {
|
|
input: ListPluginsInput{Type: PluginTypeCredential},
|
|
expectedPlugins: map[PluginType][]string{
|
|
PluginTypeCredential: {"alicloud"},
|
|
},
|
|
},
|
|
"only database plugins": {
|
|
input: ListPluginsInput{Type: PluginTypeDatabase},
|
|
expectedPlugins: map[PluginType][]string{
|
|
PluginTypeDatabase: {"cassandra-database-plugin"},
|
|
},
|
|
},
|
|
"only secret plugins": {
|
|
input: ListPluginsInput{Type: PluginTypeSecrets},
|
|
expectedPlugins: map[PluginType][]string{
|
|
PluginTypeSecrets: {"ad", "alicloud"},
|
|
},
|
|
},
|
|
} {
|
|
t.Run(name, func(t *testing.T) {
|
|
resp, err := client.Sys().ListPluginsWithContext(context.Background(), &tc.input)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
for pluginType, expected := range tc.expectedPlugins {
|
|
actualPlugins := resp.PluginsByType[pluginType]
|
|
if len(expected) != len(actualPlugins) {
|
|
t.Fatal("Wrong number of plugins", expected, actualPlugins)
|
|
}
|
|
for i := range actualPlugins {
|
|
if expected[i] != actualPlugins[i] {
|
|
t.Fatalf("Expected %q but got %q", expected[i], actualPlugins[i])
|
|
}
|
|
}
|
|
|
|
for _, expectedPlugin := range expected {
|
|
found := false
|
|
for _, plugin := range resp.Details {
|
|
if plugin.Type == pluginType.String() && plugin.Name == expectedPlugin {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
t.Errorf("Expected to find %s plugin %s but not found in details: %#v", pluginType.String(), expectedPlugin, resp.Details)
|
|
}
|
|
}
|
|
}
|
|
|
|
for _, actual := range resp.Details {
|
|
pluginType, err := ParsePluginType(actual.Type)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !strutil.StrListContains(tc.expectedPlugins[pluginType], actual.Name) {
|
|
t.Errorf("Did not expect to find %s in details", actual.Name)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetPlugin(t *testing.T) {
|
|
for name, tc := range map[string]struct {
|
|
version string
|
|
body string
|
|
expected GetPluginResponse
|
|
}{
|
|
"builtin": {
|
|
body: getResponse,
|
|
expected: GetPluginResponse{
|
|
Args: nil,
|
|
Builtin: true,
|
|
Command: "",
|
|
Name: "azure",
|
|
SHA256: "",
|
|
DeprecationStatus: "supported",
|
|
Version: "v0.14.0+builtin",
|
|
},
|
|
},
|
|
"external": {
|
|
version: "v1.0.0",
|
|
body: getResponseExternal,
|
|
expected: GetPluginResponse{
|
|
Args: []string{},
|
|
Builtin: false,
|
|
Command: "azure-plugin",
|
|
Name: "azure",
|
|
SHA256: "8ba442dba253803685b05e35ad29dcdebc48dec16774614aa7a4ebe53c1e90e1",
|
|
DeprecationStatus: "",
|
|
Version: "v1.0.0",
|
|
},
|
|
},
|
|
"old server": {
|
|
body: getResponseOldServerVersion,
|
|
expected: GetPluginResponse{
|
|
Args: nil,
|
|
Builtin: true,
|
|
Command: "",
|
|
Name: "azure",
|
|
SHA256: "",
|
|
DeprecationStatus: "",
|
|
Version: "",
|
|
},
|
|
},
|
|
"oci image": {
|
|
version: "v0.16.0",
|
|
body: getResponseOCIImageVersion,
|
|
expected: GetPluginResponse{
|
|
Args: []string{},
|
|
Builtin: false,
|
|
Command: "",
|
|
Name: "jwt",
|
|
OCIImage: "hashicorp/vault-plugin-auth-jwt",
|
|
Runtime: "gvisor",
|
|
SHA256: "8ba442dba253803685b05e35ad29dcdebc48dec16774614aa7a4ebe53c1e90e1",
|
|
DeprecationStatus: "",
|
|
Version: "v0.16.0",
|
|
},
|
|
},
|
|
} {
|
|
t.Run(name, func(t *testing.T) {
|
|
mockVaultServer := httptest.NewServer(http.HandlerFunc(mockVaultHandlerInfo(tc.body)))
|
|
defer mockVaultServer.Close()
|
|
|
|
cfg := DefaultConfig()
|
|
cfg.Address = mockVaultServer.URL
|
|
client, err := NewClient(cfg)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
input := GetPluginInput{
|
|
Name: "azure",
|
|
Type: PluginTypeSecrets,
|
|
}
|
|
if tc.version != "" {
|
|
input.Version = tc.version
|
|
}
|
|
|
|
info, err := client.Sys().GetPluginWithContext(context.Background(), &input)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(tc.expected, *info) {
|
|
t.Errorf("expected: %#v\ngot: %#v", tc.expected, info)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func mockVaultHandlerInfo(body string) func(w http.ResponseWriter, _ *http.Request) {
|
|
return func(w http.ResponseWriter, _ *http.Request) {
|
|
_, _ = w.Write([]byte(body))
|
|
}
|
|
}
|
|
|
|
const getResponse = `{
|
|
"request_id": "e93d3f93-8e4f-8443-a803-f1c97c495241",
|
|
"lease_id": "",
|
|
"renewable": false,
|
|
"lease_duration": 0,
|
|
"data": {
|
|
"args": null,
|
|
"builtin": true,
|
|
"command": "",
|
|
"deprecation_status": "supported",
|
|
"name": "azure",
|
|
"sha256": "",
|
|
"version": "v0.14.0+builtin"
|
|
},
|
|
"wrap_info": null,
|
|
"warnings": null,
|
|
"auth": null
|
|
}`
|
|
|
|
const getResponseExternal = `{
|
|
"request_id": "e93d3f93-8e4f-8443-a803-f1c97c495241",
|
|
"lease_id": "",
|
|
"renewable": false,
|
|
"lease_duration": 0,
|
|
"data": {
|
|
"args": [],
|
|
"builtin": false,
|
|
"command": "azure-plugin",
|
|
"name": "azure",
|
|
"sha256": "8ba442dba253803685b05e35ad29dcdebc48dec16774614aa7a4ebe53c1e90e1",
|
|
"version": "v1.0.0"
|
|
},
|
|
"wrap_info": null,
|
|
"warnings": null,
|
|
"auth": null
|
|
}`
|
|
|
|
const getResponseOldServerVersion = `{
|
|
"request_id": "e93d3f93-8e4f-8443-a803-f1c97c495241",
|
|
"lease_id": "",
|
|
"renewable": false,
|
|
"lease_duration": 0,
|
|
"data": {
|
|
"args": null,
|
|
"builtin": true,
|
|
"command": "",
|
|
"name": "azure",
|
|
"sha256": ""
|
|
},
|
|
"wrap_info": null,
|
|
"warnings": null,
|
|
"auth": null
|
|
}`
|
|
|
|
const getResponseOCIImageVersion = `{
|
|
"request_id": "e93d3f93-8e4f-8443-a803-f1c97c495241",
|
|
"lease_id": "",
|
|
"renewable": false,
|
|
"lease_duration": 0,
|
|
"data": {
|
|
"args": [],
|
|
"builtin": false,
|
|
"name": "jwt",
|
|
"oci_image" : "hashicorp/vault-plugin-auth-jwt",
|
|
"runtime" : "gvisor",
|
|
"sha256": "8ba442dba253803685b05e35ad29dcdebc48dec16774614aa7a4ebe53c1e90e1",
|
|
"version": "v0.16.0"
|
|
},
|
|
"wrap_info": null,
|
|
"warnings": null,
|
|
"auth": null
|
|
}`
|
|
|
|
func mockVaultHandlerList(w http.ResponseWriter, _ *http.Request) {
|
|
_, _ = w.Write([]byte(listUntypedResponse))
|
|
}
|
|
|
|
const listUntypedResponse = `{
|
|
"request_id": "82601a91-cd7a-718f-feca-f573449cc1bb",
|
|
"lease_id": "",
|
|
"renewable": false,
|
|
"lease_duration": 0,
|
|
"data": {
|
|
"auth": [
|
|
"alicloud"
|
|
],
|
|
"database": [
|
|
"cassandra-database-plugin"
|
|
],
|
|
"secret": [
|
|
"ad",
|
|
"alicloud"
|
|
],
|
|
"some_other_unexpected_key": [
|
|
{
|
|
"objectKey": "objectValue"
|
|
},
|
|
{
|
|
"arbitraryData": 7
|
|
}
|
|
],
|
|
"detailed": [
|
|
{
|
|
"type": "auth",
|
|
"name": "alicloud",
|
|
"version": "v0.13.0+builtin",
|
|
"builtin": true,
|
|
"deprecation_status": "supported"
|
|
},
|
|
{
|
|
"type": "database",
|
|
"name": "cassandra-database-plugin",
|
|
"version": "v1.13.0+builtin.vault",
|
|
"builtin": true,
|
|
"deprecation_status": "supported"
|
|
},
|
|
{
|
|
"type": "secret",
|
|
"name": "ad",
|
|
"version": "v0.14.0+builtin",
|
|
"builtin": true,
|
|
"deprecation_status": "supported"
|
|
},
|
|
{
|
|
"type": "secret",
|
|
"name": "alicloud",
|
|
"version": "v0.13.0+builtin",
|
|
"builtin": true,
|
|
"deprecation_status": "supported"
|
|
}
|
|
]
|
|
},
|
|
"wrap_info": null,
|
|
"warnings": null,
|
|
"auth": null
|
|
}`
|
|
|
|
func mockVaultHandlerRegister(w http.ResponseWriter, _ *http.Request) {
|
|
_, _ = w.Write([]byte(registerResponse))
|
|
}
|
|
|
|
const registerResponse = `{}`
|