mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 02:28:09 +00:00 
			
		
		
		
	 792d219aa9
			
		
	
	792d219aa9
	
	
	
		
			
			* logbridge with hclog and identical output * Initial search & replace This compiles, but there is a fair amount of TODO and commented out code, especially around the plugin logclient/logserver code. * strip logbridge * fix majority of tests * update logxi aliases * WIP fixing tests * more test fixes * Update test to hclog * Fix format * Rename hclog -> log * WIP making hclog and logxi love each other * update logger_test.go * clean up merged comments * Replace RawLogger interface with a Logger * Add some logger names * Replace Trace with Debug * update builtin logical logging patterns * Fix build errors * More log updates * update log approach in command and builtin * More log updates * update helper, http, and logical directories * Update loggers * Log updates * Update logging * Update logging * Update logging * Update logging * update logging in physical * prefixing and lowercase * Update logging * Move phyisical logging name to server command * Fix som tests * address jims feedback so far * incorporate brians feedback so far * strip comments * move vault.go to logging package * update Debug to Trace * Update go-plugin deps * Update logging based on review comments * Updates from review * Unvendor logxi * Remove null_logger.go
		
			
				
	
	
		
			424 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			424 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package dbplugin_test
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"errors"
 | |
| 	"os"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	log "github.com/hashicorp/go-hclog"
 | |
| 	plugin "github.com/hashicorp/go-plugin"
 | |
| 	"github.com/hashicorp/vault/builtin/logical/database/dbplugin"
 | |
| 	"github.com/hashicorp/vault/helper/pluginutil"
 | |
| 	vaulthttp "github.com/hashicorp/vault/http"
 | |
| 	"github.com/hashicorp/vault/logical"
 | |
| 	"github.com/hashicorp/vault/plugins"
 | |
| 	"github.com/hashicorp/vault/vault"
 | |
| )
 | |
| 
 | |
| type mockPlugin struct {
 | |
| 	users map[string][]string
 | |
| }
 | |
| 
 | |
| func (m *mockPlugin) Type() (string, error) { return "mock", nil }
 | |
| func (m *mockPlugin) CreateUser(_ context.Context, statements dbplugin.Statements, usernameConf dbplugin.UsernameConfig, expiration time.Time) (username string, password string, err error) {
 | |
| 	err = errors.New("err")
 | |
| 	if usernameConf.DisplayName == "" || expiration.IsZero() {
 | |
| 		return "", "", err
 | |
| 	}
 | |
| 
 | |
| 	if _, ok := m.users[usernameConf.DisplayName]; ok {
 | |
| 		return "", "", err
 | |
| 	}
 | |
| 
 | |
| 	m.users[usernameConf.DisplayName] = []string{password}
 | |
| 
 | |
| 	return usernameConf.DisplayName, "test", nil
 | |
| }
 | |
| func (m *mockPlugin) RenewUser(_ context.Context, statements dbplugin.Statements, username string, expiration time.Time) error {
 | |
| 	err := errors.New("err")
 | |
| 	if username == "" || expiration.IsZero() {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	if _, ok := m.users[username]; !ok {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| func (m *mockPlugin) RevokeUser(_ context.Context, statements dbplugin.Statements, username string) error {
 | |
| 	err := errors.New("err")
 | |
| 	if username == "" {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	if _, ok := m.users[username]; !ok {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	delete(m.users, username)
 | |
| 	return nil
 | |
| }
 | |
| func (m *mockPlugin) RotateRootCredentials(_ context.Context, statements []string) (map[string]interface{}, error) {
 | |
| 	return nil, nil
 | |
| }
 | |
| func (m *mockPlugin) Init(_ context.Context, conf map[string]interface{}, _ bool) (map[string]interface{}, error) {
 | |
| 	err := errors.New("err")
 | |
| 	if len(conf) != 1 {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	return conf, nil
 | |
| }
 | |
| func (m *mockPlugin) Initialize(_ context.Context, conf map[string]interface{}, _ bool) error {
 | |
| 	err := errors.New("err")
 | |
| 	if len(conf) != 1 {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| func (m *mockPlugin) Close() error {
 | |
| 	m.users = nil
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func getCluster(t *testing.T) (*vault.TestCluster, logical.SystemView) {
 | |
| 	cluster := vault.NewTestCluster(t, nil, &vault.TestClusterOptions{
 | |
| 		HandlerFunc: vaulthttp.Handler,
 | |
| 	})
 | |
| 	cluster.Start()
 | |
| 	cores := cluster.Cores
 | |
| 
 | |
| 	sys := vault.TestDynamicSystemView(cores[0].Core)
 | |
| 	vault.TestAddTestPlugin(t, cores[0].Core, "test-plugin", "TestPlugin_GRPC_Main")
 | |
| 	vault.TestAddTestPlugin(t, cores[0].Core, "test-plugin-netRPC", "TestPlugin_NetRPC_Main")
 | |
| 
 | |
| 	return cluster, sys
 | |
| }
 | |
| 
 | |
| // This is not an actual test case, it's a helper function that will be executed
 | |
| // by the go-plugin client via an exec call.
 | |
| func TestPlugin_GRPC_Main(t *testing.T) {
 | |
| 	if os.Getenv(pluginutil.PluginUnwrapTokenEnv) == "" {
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	plugin := &mockPlugin{
 | |
| 		users: make(map[string][]string),
 | |
| 	}
 | |
| 
 | |
| 	args := []string{"--tls-skip-verify=true"}
 | |
| 
 | |
| 	apiClientMeta := &pluginutil.APIClientMeta{}
 | |
| 	flags := apiClientMeta.FlagSet()
 | |
| 	flags.Parse(args)
 | |
| 
 | |
| 	plugins.Serve(plugin, apiClientMeta.GetTLSConfig())
 | |
| }
 | |
| 
 | |
| // This is not an actual test case, it's a helper function that will be executed
 | |
| // by the go-plugin client via an exec call.
 | |
| func TestPlugin_NetRPC_Main(t *testing.T) {
 | |
| 	if os.Getenv(pluginutil.PluginUnwrapTokenEnv) == "" {
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	p := &mockPlugin{
 | |
| 		users: make(map[string][]string),
 | |
| 	}
 | |
| 
 | |
| 	args := []string{"--tls-skip-verify=true"}
 | |
| 
 | |
| 	apiClientMeta := &pluginutil.APIClientMeta{}
 | |
| 	flags := apiClientMeta.FlagSet()
 | |
| 	flags.Parse(args)
 | |
| 
 | |
| 	tlsProvider := pluginutil.VaultPluginTLSProvider(apiClientMeta.GetTLSConfig())
 | |
| 	serveConf := dbplugin.ServeConfig(p, tlsProvider)
 | |
| 	serveConf.GRPCServer = nil
 | |
| 
 | |
| 	plugin.Serve(serveConf)
 | |
| }
 | |
| 
 | |
| func TestPlugin_Init(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	dbRaw, err := dbplugin.PluginFactory(context.Background(), "test-plugin", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 
 | |
| 	_, err = dbRaw.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	err = dbRaw.Close()
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPlugin_CreateUser(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	db, err := dbplugin.PluginFactory(context.Background(), "test-plugin", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	defer db.Close()
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 
 | |
| 	_, err = db.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	usernameConf := dbplugin.UsernameConfig{
 | |
| 		DisplayName: "test",
 | |
| 		RoleName:    "test",
 | |
| 	}
 | |
| 
 | |
| 	us, pw, err := db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if us != "test" || pw != "test" {
 | |
| 		t.Fatal("expected username and password to be 'test'")
 | |
| 	}
 | |
| 
 | |
| 	// try and save the same user again to verify it saved the first time, this
 | |
| 	// should return an error
 | |
| 	_, _, err = db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err == nil {
 | |
| 		t.Fatal("expected an error, user wasn't created correctly")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPlugin_RenewUser(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	db, err := dbplugin.PluginFactory(context.Background(), "test-plugin", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	defer db.Close()
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 	_, err = db.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	usernameConf := dbplugin.UsernameConfig{
 | |
| 		DisplayName: "test",
 | |
| 		RoleName:    "test",
 | |
| 	}
 | |
| 
 | |
| 	us, _, err := db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	err = db.RenewUser(context.Background(), dbplugin.Statements{}, us, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPlugin_RevokeUser(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	db, err := dbplugin.PluginFactory(context.Background(), "test-plugin", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	defer db.Close()
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 	_, err = db.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	usernameConf := dbplugin.UsernameConfig{
 | |
| 		DisplayName: "test",
 | |
| 		RoleName:    "test",
 | |
| 	}
 | |
| 
 | |
| 	us, _, err := db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	// Test default revoke statements
 | |
| 	err = db.RevokeUser(context.Background(), dbplugin.Statements{}, us)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	// Try adding the same username back so we can verify it was removed
 | |
| 	_, _, err = db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // Test the code is still compatible with an old netRPC plugin
 | |
| func TestPlugin_NetRPC_Init(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	dbRaw, err := dbplugin.PluginFactory(context.Background(), "test-plugin-netRPC", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 
 | |
| 	_, err = dbRaw.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	err = dbRaw.Close()
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPlugin_NetRPC_CreateUser(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	db, err := dbplugin.PluginFactory(context.Background(), "test-plugin-netRPC", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	defer db.Close()
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 
 | |
| 	_, err = db.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	usernameConf := dbplugin.UsernameConfig{
 | |
| 		DisplayName: "test",
 | |
| 		RoleName:    "test",
 | |
| 	}
 | |
| 
 | |
| 	us, pw, err := db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	if us != "test" || pw != "test" {
 | |
| 		t.Fatal("expected username and password to be 'test'")
 | |
| 	}
 | |
| 
 | |
| 	// try and save the same user again to verify it saved the first time, this
 | |
| 	// should return an error
 | |
| 	_, _, err = db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err == nil {
 | |
| 		t.Fatal("expected an error, user wasn't created correctly")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPlugin_NetRPC_RenewUser(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	db, err := dbplugin.PluginFactory(context.Background(), "test-plugin-netRPC", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	defer db.Close()
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 	_, err = db.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	usernameConf := dbplugin.UsernameConfig{
 | |
| 		DisplayName: "test",
 | |
| 		RoleName:    "test",
 | |
| 	}
 | |
| 
 | |
| 	us, _, err := db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	err = db.RenewUser(context.Background(), dbplugin.Statements{}, us, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestPlugin_NetRPC_RevokeUser(t *testing.T) {
 | |
| 	cluster, sys := getCluster(t)
 | |
| 	defer cluster.Cleanup()
 | |
| 
 | |
| 	db, err := dbplugin.PluginFactory(context.Background(), "test-plugin-netRPC", sys, log.NewNullLogger())
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 	defer db.Close()
 | |
| 
 | |
| 	connectionDetails := map[string]interface{}{
 | |
| 		"test": 1,
 | |
| 	}
 | |
| 	_, err = db.Init(context.Background(), connectionDetails, true)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	usernameConf := dbplugin.UsernameConfig{
 | |
| 		DisplayName: "test",
 | |
| 		RoleName:    "test",
 | |
| 	}
 | |
| 
 | |
| 	us, _, err := db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	// Test default revoke statements
 | |
| 	err = db.RevokeUser(context.Background(), dbplugin.Statements{}, us)
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| 
 | |
| 	// Try adding the same username back so we can verify it was removed
 | |
| 	_, _, err = db.CreateUser(context.Background(), dbplugin.Statements{}, usernameConf, time.Now().Add(time.Minute))
 | |
| 	if err != nil {
 | |
| 		t.Fatalf("err: %s", err)
 | |
| 	}
 | |
| }
 |