mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-30 02:02:43 +00:00 
			
		
		
		
	 415d260995
			
		
	
	415d260995
	
	
	
		
			
			* Support trimming trailing slashes via a mount tuneable to support CMPv2 * changelog/ * Perform trimming in handleLoginRequest too * Eagerly fetch the mount entry so we only test this once * Add a mount match function that gets path and entry * Update vault/request_handling.go Co-authored-by: Steven Clark <steven.clark@hashicorp.com> * more docs * Some patches (from ENT) didnt apply * patch fail * Update vault/router.go Co-authored-by: Steven Clark <steven.clark@hashicorp.com> * PR feedback * dupe * another dupe * Add support for enabling trim_request_trailing_slashes on mount creation * Fix read mount api returning configuration for trim_request_trailing_slashes * Fix test assertion * Switch enable and tune arguments to BoolPtrVal to allow end-users to specify false flag * Add trim-request-trailing-slashes to the auth enable API and CLI --------- Co-authored-by: Steven Clark <steven.clark@hashicorp.com>
		
			
				
	
	
		
			382 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			382 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright (c) HashiCorp, Inc.
 | |
| // SPDX-License-Identifier: BUSL-1.1
 | |
| 
 | |
| package command
 | |
| 
 | |
| import (
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 
 | |
| 	"github.com/go-test/deep"
 | |
| 	"github.com/hashicorp/cli"
 | |
| 	"github.com/hashicorp/vault/api"
 | |
| 	"github.com/hashicorp/vault/helper/testhelpers/corehelpers"
 | |
| )
 | |
| 
 | |
| func testSecretsTuneCommand(tb testing.TB) (*cli.MockUi, *SecretsTuneCommand) {
 | |
| 	tb.Helper()
 | |
| 
 | |
| 	ui := cli.NewMockUi()
 | |
| 	return ui, &SecretsTuneCommand{
 | |
| 		BaseCommand: &BaseCommand{
 | |
| 			UI: ui,
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestSecretsTuneCommand_Run(t *testing.T) {
 | |
| 	t.Parallel()
 | |
| 
 | |
| 	cases := []struct {
 | |
| 		name string
 | |
| 		args []string
 | |
| 		out  string
 | |
| 		code int
 | |
| 	}{
 | |
| 		{
 | |
| 			"not_enough_args",
 | |
| 			[]string{},
 | |
| 			"Not enough arguments",
 | |
| 			1,
 | |
| 		},
 | |
| 		{
 | |
| 			"too_many_args",
 | |
| 			[]string{"foo", "bar"},
 | |
| 			"Too many arguments",
 | |
| 			1,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	t.Run("validations", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 
 | |
| 		for _, tc := range cases {
 | |
| 			tc := tc
 | |
| 
 | |
| 			t.Run(tc.name, func(t *testing.T) {
 | |
| 				t.Parallel()
 | |
| 
 | |
| 				client, closer := testVaultServer(t)
 | |
| 				defer closer()
 | |
| 
 | |
| 				ui, cmd := testSecretsTuneCommand(t)
 | |
| 				cmd.client = client
 | |
| 
 | |
| 				code := cmd.Run(tc.args)
 | |
| 				if code != tc.code {
 | |
| 					t.Errorf("expected %d to be %d", code, tc.code)
 | |
| 				}
 | |
| 
 | |
| 				combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 				if !strings.Contains(combined, tc.out) {
 | |
| 					t.Errorf("expected %q to contain %q", combined, tc.out)
 | |
| 				}
 | |
| 			})
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("protect_downgrade", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 		client, closer := testVaultServer(t)
 | |
| 		defer closer()
 | |
| 
 | |
| 		ui, cmd := testSecretsTuneCommand(t)
 | |
| 		cmd.client = client
 | |
| 
 | |
| 		// Mount
 | |
| 		if err := client.Sys().Mount("kv", &api.MountInput{
 | |
| 			Type: "kv",
 | |
| 			Options: map[string]string{
 | |
| 				"version": "2",
 | |
| 			},
 | |
| 		}); err != nil {
 | |
| 			t.Fatal(err)
 | |
| 		}
 | |
| 
 | |
| 		// confirm default max_versions
 | |
| 		mounts, err := client.Sys().ListMounts()
 | |
| 		if err != nil {
 | |
| 			t.Fatal(err)
 | |
| 		}
 | |
| 
 | |
| 		mountInfo, ok := mounts["kv/"]
 | |
| 		if !ok {
 | |
| 			t.Fatalf("expected mount to exist")
 | |
| 		}
 | |
| 		if exp := "kv"; mountInfo.Type != exp {
 | |
| 			t.Errorf("expected %q to be %q", mountInfo.Type, exp)
 | |
| 		}
 | |
| 		if exp := "2"; mountInfo.Options["version"] != exp {
 | |
| 			t.Errorf("expected %q to be %q", mountInfo.Options["version"], exp)
 | |
| 		}
 | |
| 
 | |
| 		if exp := ""; mountInfo.Options["max_versions"] != exp {
 | |
| 			t.Errorf("expected %s to be empty", mountInfo.Options["max_versions"])
 | |
| 		}
 | |
| 
 | |
| 		// omitting the version should not cause a downgrade
 | |
| 		code := cmd.Run([]string{
 | |
| 			"-options", "max_versions=2",
 | |
| 			"kv/",
 | |
| 		})
 | |
| 		if exp := 0; code != exp {
 | |
| 			t.Errorf("expected %d to be %d", code, exp)
 | |
| 		}
 | |
| 
 | |
| 		expected := "Success! Tuned the secrets engine at: kv/"
 | |
| 		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 		if !strings.Contains(combined, expected) {
 | |
| 			t.Errorf("expected %q to contain %q", combined, expected)
 | |
| 		}
 | |
| 
 | |
| 		mounts, err = client.Sys().ListMounts()
 | |
| 		if err != nil {
 | |
| 			t.Fatal(err)
 | |
| 		}
 | |
| 
 | |
| 		mountInfo, ok = mounts["kv/"]
 | |
| 		if !ok {
 | |
| 			t.Fatalf("expected mount to exist")
 | |
| 		}
 | |
| 		if exp := "2"; mountInfo.Options["version"] != exp {
 | |
| 			t.Errorf("expected %q to be %q", mountInfo.Options["version"], exp)
 | |
| 		}
 | |
| 		if exp := "kv"; mountInfo.Type != exp {
 | |
| 			t.Errorf("expected %q to be %q", mountInfo.Type, exp)
 | |
| 		}
 | |
| 		if exp := "2"; mountInfo.Options["max_versions"] != exp {
 | |
| 			t.Errorf("expected %s to be %s", mountInfo.Options["max_versions"], exp)
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("integration", func(t *testing.T) {
 | |
| 		t.Run("flags_all", func(t *testing.T) {
 | |
| 			t.Parallel()
 | |
| 			pluginDir := corehelpers.MakeTestPluginDir(t)
 | |
| 
 | |
| 			client, _, closer := testVaultServerPluginDir(t, pluginDir)
 | |
| 			defer closer()
 | |
| 
 | |
| 			ui, cmd := testSecretsTuneCommand(t)
 | |
| 			cmd.client = client
 | |
| 
 | |
| 			// Mount
 | |
| 			if err := client.Sys().Mount("mount_tune_integration", &api.MountInput{
 | |
| 				Type: "pki",
 | |
| 			}); err != nil {
 | |
| 				t.Fatal(err)
 | |
| 			}
 | |
| 
 | |
| 			mounts, err := client.Sys().ListMounts()
 | |
| 			if err != nil {
 | |
| 				t.Fatal(err)
 | |
| 			}
 | |
| 			mountInfo, ok := mounts["mount_tune_integration/"]
 | |
| 			if !ok {
 | |
| 				t.Fatalf("expected mount to exist")
 | |
| 			}
 | |
| 
 | |
| 			if exp := ""; mountInfo.PluginVersion != exp {
 | |
| 				t.Errorf("expected %q to be %q", mountInfo.PluginVersion, exp)
 | |
| 			}
 | |
| 
 | |
| 			_, _, version := testPluginCreateAndRegisterVersioned(t, client, pluginDir, "pki", api.PluginTypeSecrets)
 | |
| 
 | |
| 			code := cmd.Run([]string{
 | |
| 				"-description", "new description",
 | |
| 				"-default-lease-ttl", "30m",
 | |
| 				"-max-lease-ttl", "1h",
 | |
| 				"-audit-non-hmac-request-keys", "foo,bar",
 | |
| 				"-audit-non-hmac-response-keys", "foo,bar",
 | |
| 				"-passthrough-request-headers", "authorization",
 | |
| 				"-passthrough-request-headers", "www-authentication",
 | |
| 				"-allowed-response-headers", "authorization,www-authentication",
 | |
| 				"-allowed-managed-keys", "key1,key2",
 | |
| 				"-identity-token-key", "default",
 | |
| 				"-listing-visibility", "unauth",
 | |
| 				"-plugin-version", version,
 | |
| 				"-delegated-auth-accessors", "authAcc1,authAcc2",
 | |
| 				"-trim-request-trailing-slashes=true",
 | |
| 				"mount_tune_integration/",
 | |
| 			})
 | |
| 			if exp := 0; code != exp {
 | |
| 				t.Errorf("expected %d to be %d", code, exp)
 | |
| 			}
 | |
| 
 | |
| 			expected := "Success! Tuned the secrets engine at: mount_tune_integration/"
 | |
| 			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 			if !strings.Contains(combined, expected) {
 | |
| 				t.Errorf("expected %q to contain %q", combined, expected)
 | |
| 			}
 | |
| 
 | |
| 			mounts, err = client.Sys().ListMounts()
 | |
| 			if err != nil {
 | |
| 				t.Fatal(err)
 | |
| 			}
 | |
| 
 | |
| 			mountInfo, ok = mounts["mount_tune_integration/"]
 | |
| 			if !ok {
 | |
| 				t.Fatalf("expected mount to exist")
 | |
| 			}
 | |
| 			if exp := "new description"; mountInfo.Description != exp {
 | |
| 				t.Errorf("expected %q to be %q", mountInfo.Description, exp)
 | |
| 			}
 | |
| 			if exp := "pki"; mountInfo.Type != exp {
 | |
| 				t.Errorf("expected %q to be %q", mountInfo.Type, exp)
 | |
| 			}
 | |
| 			if exp := version; mountInfo.PluginVersion != exp {
 | |
| 				t.Errorf("expected %q to be %q", mountInfo.PluginVersion, exp)
 | |
| 			}
 | |
| 			if exp := 1800; mountInfo.Config.DefaultLeaseTTL != exp {
 | |
| 				t.Errorf("expected %d to be %d", mountInfo.Config.DefaultLeaseTTL, exp)
 | |
| 			}
 | |
| 			if exp := 3600; mountInfo.Config.MaxLeaseTTL != exp {
 | |
| 				t.Errorf("expected %d to be %d", mountInfo.Config.MaxLeaseTTL, exp)
 | |
| 			}
 | |
| 			if !mountInfo.Config.TrimRequestTrailingSlashes {
 | |
| 				t.Errorf("expected trim_request_trailing_slashes to be enabled")
 | |
| 			}
 | |
| 			if diff := deep.Equal([]string{"authorization", "www-authentication"}, mountInfo.Config.PassthroughRequestHeaders); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values for PassthroughRequestHeaders. Difference is: %v", diff)
 | |
| 			}
 | |
| 			if diff := deep.Equal([]string{"authorization,www-authentication"}, mountInfo.Config.AllowedResponseHeaders); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values in AllowedResponseHeaders. Difference is: %v", diff)
 | |
| 			}
 | |
| 			if diff := deep.Equal([]string{"foo,bar"}, mountInfo.Config.AuditNonHMACRequestKeys); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values in AuditNonHMACRequestKeys. Difference is: %v", diff)
 | |
| 			}
 | |
| 			if diff := deep.Equal([]string{"foo,bar"}, mountInfo.Config.AuditNonHMACResponseKeys); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values in AuditNonHMACResponseKeys. Difference is: %v", diff)
 | |
| 			}
 | |
| 			if diff := deep.Equal([]string{"key1,key2"}, mountInfo.Config.AllowedManagedKeys); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values in AllowedManagedKeys. Difference is: %v", diff)
 | |
| 			}
 | |
| 			if diff := deep.Equal([]string{"authAcc1,authAcc2"}, mountInfo.Config.DelegatedAuthAccessors); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values in DelegatedAuthAccessors. Difference is: %v", diff)
 | |
| 			}
 | |
| 			if diff := deep.Equal("default", mountInfo.Config.IdentityTokenKey); len(diff) > 0 {
 | |
| 				t.Errorf("Failed to find expected values in IdentityTokenKey. Difference is: %v", diff)
 | |
| 			}
 | |
| 		})
 | |
| 
 | |
| 		t.Run("flags_description", func(t *testing.T) {
 | |
| 			t.Parallel()
 | |
| 			t.Run("not_provided", func(t *testing.T) {
 | |
| 				client, closer := testVaultServer(t)
 | |
| 				defer closer()
 | |
| 
 | |
| 				ui, cmd := testSecretsTuneCommand(t)
 | |
| 				cmd.client = client
 | |
| 
 | |
| 				// Mount
 | |
| 				if err := client.Sys().Mount("mount_tune_integration", &api.MountInput{
 | |
| 					Type:        "pki",
 | |
| 					Description: "initial description",
 | |
| 				}); err != nil {
 | |
| 					t.Fatal(err)
 | |
| 				}
 | |
| 
 | |
| 				code := cmd.Run([]string{
 | |
| 					"-default-lease-ttl", "30m",
 | |
| 					"mount_tune_integration/",
 | |
| 				})
 | |
| 				if exp := 0; code != exp {
 | |
| 					t.Errorf("expected %d to be %d", code, exp)
 | |
| 				}
 | |
| 
 | |
| 				expected := "Success! Tuned the secrets engine at: mount_tune_integration/"
 | |
| 				combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 				if !strings.Contains(combined, expected) {
 | |
| 					t.Errorf("expected %q to contain %q", combined, expected)
 | |
| 				}
 | |
| 
 | |
| 				mounts, err := client.Sys().ListMounts()
 | |
| 				if err != nil {
 | |
| 					t.Fatal(err)
 | |
| 				}
 | |
| 
 | |
| 				mountInfo, ok := mounts["mount_tune_integration/"]
 | |
| 				if !ok {
 | |
| 					t.Fatalf("expected mount to exist")
 | |
| 				}
 | |
| 				if exp := "initial description"; mountInfo.Description != exp {
 | |
| 					t.Errorf("expected %q to be %q", mountInfo.Description, exp)
 | |
| 				}
 | |
| 			})
 | |
| 
 | |
| 			t.Run("provided_empty", func(t *testing.T) {
 | |
| 				client, closer := testVaultServer(t)
 | |
| 				defer closer()
 | |
| 
 | |
| 				ui, cmd := testSecretsTuneCommand(t)
 | |
| 				cmd.client = client
 | |
| 
 | |
| 				// Mount
 | |
| 				if err := client.Sys().Mount("mount_tune_integration", &api.MountInput{
 | |
| 					Type:        "pki",
 | |
| 					Description: "initial description",
 | |
| 				}); err != nil {
 | |
| 					t.Fatal(err)
 | |
| 				}
 | |
| 
 | |
| 				code := cmd.Run([]string{
 | |
| 					"-description", "",
 | |
| 					"mount_tune_integration/",
 | |
| 				})
 | |
| 				if exp := 0; code != exp {
 | |
| 					t.Errorf("expected %d to be %d", code, exp)
 | |
| 				}
 | |
| 
 | |
| 				expected := "Success! Tuned the secrets engine at: mount_tune_integration/"
 | |
| 				combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 				if !strings.Contains(combined, expected) {
 | |
| 					t.Errorf("expected %q to contain %q", combined, expected)
 | |
| 				}
 | |
| 
 | |
| 				mounts, err := client.Sys().ListMounts()
 | |
| 				if err != nil {
 | |
| 					t.Fatal(err)
 | |
| 				}
 | |
| 
 | |
| 				mountInfo, ok := mounts["mount_tune_integration/"]
 | |
| 				if !ok {
 | |
| 					t.Fatalf("expected mount to exist")
 | |
| 				}
 | |
| 				if exp := ""; mountInfo.Description != exp {
 | |
| 					t.Errorf("expected %q to be %q", mountInfo.Description, exp)
 | |
| 				}
 | |
| 			})
 | |
| 		})
 | |
| 	})
 | |
| 
 | |
| 	t.Run("communication_failure", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 
 | |
| 		client, closer := testVaultServerBad(t)
 | |
| 		defer closer()
 | |
| 
 | |
| 		ui, cmd := testSecretsTuneCommand(t)
 | |
| 		cmd.client = client
 | |
| 
 | |
| 		code := cmd.Run([]string{
 | |
| 			"pki/",
 | |
| 		})
 | |
| 		if exp := 2; code != exp {
 | |
| 			t.Errorf("expected %d to be %d", code, exp)
 | |
| 		}
 | |
| 
 | |
| 		expected := "Error tuning secrets engine pki/: "
 | |
| 		combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
 | |
| 		if !strings.Contains(combined, expected) {
 | |
| 			t.Errorf("expected %q to contain %q", combined, expected)
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("no_tabs", func(t *testing.T) {
 | |
| 		t.Parallel()
 | |
| 
 | |
| 		_, cmd := testSecretsTuneCommand(t)
 | |
| 		assertNoTabs(t, cmd)
 | |
| 	})
 | |
| }
 |