mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 10:37:56 +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
		
			
				
	
	
		
			313 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			313 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package command
 | |
| 
 | |
| import (
 | |
| 	"encoding/hex"
 | |
| 	"os"
 | |
| 	"sort"
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/hashicorp/vault/http"
 | |
| 	"github.com/hashicorp/vault/logical"
 | |
| 	"github.com/hashicorp/vault/meta"
 | |
| 	"github.com/hashicorp/vault/vault"
 | |
| 	"github.com/mitchellh/cli"
 | |
| )
 | |
| 
 | |
| func TestRekey(t *testing.T) {
 | |
| 	core, keys, _ := vault.TestCoreUnsealed(t)
 | |
| 	ln, addr := http.TestServer(t, core)
 | |
| 	defer ln.Close()
 | |
| 
 | |
| 	ui := new(cli.MockUi)
 | |
| 
 | |
| 	for i, key := range keys {
 | |
| 		c := &RekeyCommand{
 | |
| 			Key:         hex.EncodeToString(key),
 | |
| 			RecoveryKey: false,
 | |
| 			Meta: meta.Meta{
 | |
| 				Ui: ui,
 | |
| 			},
 | |
| 		}
 | |
| 
 | |
| 		if i > 0 {
 | |
| 			conf, err := core.RekeyConfig(false)
 | |
| 			if err != nil {
 | |
| 				t.Fatal(err)
 | |
| 			}
 | |
| 			c.Nonce = conf.Nonce
 | |
| 		}
 | |
| 
 | |
| 		args := []string{"-address", addr}
 | |
| 		if code := c.Run(args); code != 0 {
 | |
| 			t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	config, err := core.SealAccess().BarrierConfig()
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if config.SecretShares != 5 {
 | |
| 		t.Fatal("should rekey")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestRekey_arg(t *testing.T) {
 | |
| 	core, keys, _ := vault.TestCoreUnsealed(t)
 | |
| 	ln, addr := http.TestServer(t, core)
 | |
| 	defer ln.Close()
 | |
| 
 | |
| 	ui := new(cli.MockUi)
 | |
| 
 | |
| 	for i, key := range keys {
 | |
| 		c := &RekeyCommand{
 | |
| 			RecoveryKey: false,
 | |
| 			Meta: meta.Meta{
 | |
| 				Ui: ui,
 | |
| 			},
 | |
| 		}
 | |
| 
 | |
| 		if i > 0 {
 | |
| 			conf, err := core.RekeyConfig(false)
 | |
| 			if err != nil {
 | |
| 				t.Fatal(err)
 | |
| 			}
 | |
| 			c.Nonce = conf.Nonce
 | |
| 		}
 | |
| 
 | |
| 		args := []string{"-address", addr, hex.EncodeToString(key)}
 | |
| 		if code := c.Run(args); code != 0 {
 | |
| 			t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	config, err := core.SealAccess().BarrierConfig()
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if config.SecretShares != 5 {
 | |
| 		t.Fatal("should rekey")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestRekey_init(t *testing.T) {
 | |
| 	core, _, _ := vault.TestCoreUnsealed(t)
 | |
| 	ln, addr := http.TestServer(t, core)
 | |
| 	defer ln.Close()
 | |
| 
 | |
| 	ui := new(cli.MockUi)
 | |
| 
 | |
| 	c := &RekeyCommand{
 | |
| 		Meta: meta.Meta{
 | |
| 			Ui: ui,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	args := []string{
 | |
| 		"-address", addr,
 | |
| 		"-init",
 | |
| 		"-key-threshold", "10",
 | |
| 		"-key-shares", "10",
 | |
| 	}
 | |
| 	if code := c.Run(args); code != 0 {
 | |
| 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 	}
 | |
| 
 | |
| 	config, err := core.RekeyConfig(false)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if config.SecretShares != 10 {
 | |
| 		t.Fatal("should rekey")
 | |
| 	}
 | |
| 	if config.SecretThreshold != 10 {
 | |
| 		t.Fatal("should rekey")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestRekey_cancel(t *testing.T) {
 | |
| 	core, keys, _ := vault.TestCoreUnsealed(t)
 | |
| 	ln, addr := http.TestServer(t, core)
 | |
| 	defer ln.Close()
 | |
| 
 | |
| 	ui := new(cli.MockUi)
 | |
| 	c := &RekeyCommand{
 | |
| 		Key: hex.EncodeToString(keys[0]),
 | |
| 		Meta: meta.Meta{
 | |
| 			Ui: ui,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	args := []string{"-address", addr, "-init"}
 | |
| 	if code := c.Run(args); code != 0 {
 | |
| 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 	}
 | |
| 
 | |
| 	args = []string{"-address", addr, "-cancel"}
 | |
| 	if code := c.Run(args); code != 0 {
 | |
| 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 	}
 | |
| 
 | |
| 	config, err := core.RekeyConfig(false)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if config != nil {
 | |
| 		t.Fatal("should not rekey")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestRekey_status(t *testing.T) {
 | |
| 	core, keys, _ := vault.TestCoreUnsealed(t)
 | |
| 	ln, addr := http.TestServer(t, core)
 | |
| 	defer ln.Close()
 | |
| 
 | |
| 	ui := new(cli.MockUi)
 | |
| 	c := &RekeyCommand{
 | |
| 		Key: hex.EncodeToString(keys[0]),
 | |
| 		Meta: meta.Meta{
 | |
| 			Ui: ui,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	args := []string{"-address", addr, "-init"}
 | |
| 	if code := c.Run(args); code != 0 {
 | |
| 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 	}
 | |
| 
 | |
| 	args = []string{"-address", addr, "-status"}
 | |
| 	if code := c.Run(args); code != 0 {
 | |
| 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 	}
 | |
| 
 | |
| 	if !strings.Contains(ui.OutputWriter.String(), "Started: true") {
 | |
| 		t.Fatalf("bad: %s", ui.OutputWriter.String())
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestRekey_init_pgp(t *testing.T) {
 | |
| 	core, keys, token := vault.TestCoreUnsealed(t)
 | |
| 	ln, addr := http.TestServer(t, core)
 | |
| 	defer ln.Close()
 | |
| 
 | |
| 	bc := &logical.BackendConfig{
 | |
| 		Logger: nil,
 | |
| 		System: logical.StaticSystemView{
 | |
| 			DefaultLeaseTTLVal: time.Hour * 24,
 | |
| 			MaxLeaseTTLVal:     time.Hour * 24 * 32,
 | |
| 		},
 | |
| 	}
 | |
| 	sysBackend := vault.NewSystemBackend(core)
 | |
| 	err := sysBackend.Backend.Setup(bc)
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	ui := new(cli.MockUi)
 | |
| 	c := &RekeyCommand{
 | |
| 		Meta: meta.Meta{
 | |
| 			Ui: ui,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	tempDir, pubFiles, err := getPubKeyFiles(t)
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.RemoveAll(tempDir)
 | |
| 
 | |
| 	args := []string{
 | |
| 		"-address", addr,
 | |
| 		"-init",
 | |
| 		"-key-shares", "4",
 | |
| 		"-pgp-keys", pubFiles[0] + ",@" + pubFiles[1] + "," + pubFiles[2] + "," + pubFiles[3],
 | |
| 		"-key-threshold", "2",
 | |
| 		"-backup", "true",
 | |
| 	}
 | |
| 
 | |
| 	if code := c.Run(args); code != 0 {
 | |
| 		t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 	}
 | |
| 
 | |
| 	config, err := core.RekeyConfig(false)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if config.SecretShares != 4 {
 | |
| 		t.Fatal("should rekey")
 | |
| 	}
 | |
| 	if config.SecretThreshold != 2 {
 | |
| 		t.Fatal("should rekey")
 | |
| 	}
 | |
| 
 | |
| 	for _, key := range keys {
 | |
| 		c = &RekeyCommand{
 | |
| 			Key: hex.EncodeToString(key),
 | |
| 			Meta: meta.Meta{
 | |
| 				Ui: ui,
 | |
| 			},
 | |
| 		}
 | |
| 
 | |
| 		c.Nonce = config.Nonce
 | |
| 
 | |
| 		args = []string{
 | |
| 			"-address", addr,
 | |
| 		}
 | |
| 		if code := c.Run(args); code != 0 {
 | |
| 			t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	type backupStruct struct {
 | |
| 		Keys    map[string][]string
 | |
| 		KeysB64 map[string][]string
 | |
| 	}
 | |
| 	backupVals := &backupStruct{}
 | |
| 
 | |
| 	req := logical.TestRequest(t, logical.ReadOperation, "rekey/backup")
 | |
| 	resp, err := sysBackend.HandleRequest(req)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("error running backed-up unseal key fetch: %v", err)
 | |
| 	}
 | |
| 	if resp == nil {
 | |
| 		t.Fatalf("got nil resp with unseal key fetch")
 | |
| 	}
 | |
| 	if resp.Data["keys"] == nil {
 | |
| 		t.Fatalf("could not retrieve unseal keys from token")
 | |
| 	}
 | |
| 	if resp.Data["nonce"] != config.Nonce {
 | |
| 		t.Fatalf("nonce mismatch between rekey and backed-up keys")
 | |
| 	}
 | |
| 
 | |
| 	backupVals.Keys = resp.Data["keys"].(map[string][]string)
 | |
| 	backupVals.KeysB64 = resp.Data["keys_base64"].(map[string][]string)
 | |
| 
 | |
| 	// Now delete and try again; the values should be inaccessible
 | |
| 	req = logical.TestRequest(t, logical.DeleteOperation, "rekey/backup")
 | |
| 	resp, err = sysBackend.HandleRequest(req)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("error running backed-up unseal key delete: %v", err)
 | |
| 	}
 | |
| 	req = logical.TestRequest(t, logical.ReadOperation, "rekey/backup")
 | |
| 	resp, err = sysBackend.HandleRequest(req)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("error running backed-up unseal key fetch: %v", err)
 | |
| 	}
 | |
| 	if resp == nil {
 | |
| 		t.Fatalf("got nil resp with unseal key fetch")
 | |
| 	}
 | |
| 	if resp.Data["keys"] != nil {
 | |
| 		t.Fatalf("keys found when they should have been deleted")
 | |
| 	}
 | |
| 
 | |
| 	// Sort, because it'll be tested with DeepEqual later
 | |
| 	for k, _ := range backupVals.Keys {
 | |
| 		sort.Strings(backupVals.Keys[k])
 | |
| 		sort.Strings(backupVals.KeysB64[k])
 | |
| 	}
 | |
| 
 | |
| 	parseDecryptAndTestUnsealKeys(t, ui.OutputWriter.String(), token, true, backupVals.Keys, backupVals.KeysB64, core)
 | |
| }
 |