scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 09:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport of commit 9ae8f48f9b (#20420)

Browse Source 
Co-authored-by: Peter Wilson <peter.wilson@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-04-28 11:50:58 -04:00
committed by GitHub
parent ba82d7a8b5
commit 657c287221
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/20418.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
command/server: fixes panic in Vault server command when running in recovery mode
```

8
command/server.go
View File

@@ -446,7 +446,7 @@ func (c *ServerCommand) runRecoveryMode() int {
}
// Update the 'log' related aspects of shared config based on config/env var/cli
c.Flags().applyLogConfigOverrides(config.SharedConfig)
c.flags.applyLogConfigOverrides(config.SharedConfig)
l, err := c.configureLogging(config)
if err != nil {
c.UI.Error(err.Error())
@@ -661,6 +661,12 @@ func (c *ServerCommand) runRecoveryMode() int {
c.UI.Output("")
// Tests might not want to start a vault server and just want to verify
// the configuration.
if c.flagTestVerifyOnly {
return 0
}
for _, ln := range lns {
handler := vaulthttp.Handler.Handler(&vault.HandlerProperties{
Core: core,

34
command/server_test.go
View File

@@ -283,6 +283,13 @@ func TestServer(t *testing.T) {
0,
[]string{"-test-verify-only"},
},
{
"recovery_mode",
testBaseHCL(t, "") + inmemHCL,
"",
0,
[]string{"-test-verify-only", "-recovery"},
},
}
for _, tc := range cases {
@@ -292,26 +299,21 @@ func TestServer(t *testing.T) {
t.Parallel()
ui, cmd := testServerCommand(t)
f, err := ioutil.TempFile("", "")
if err != nil {
t.Fatalf("error creating temp dir: %v", err)
}
f.WriteString(tc.contents)
f.Close()
defer os.Remove(f.Name())
f, err := os.CreateTemp(t.TempDir(), "")
require.NoErrorf(t, err, "error creating temp dir: %v", err)
_, err = f.WriteString(tc.contents)
require.NoErrorf(t, err, "cannot write temp file contents")
err = f.Close()
require.NoErrorf(t, err, "unable to close temp file")
args := append(tc.args, "-config", f.Name())
code := cmd.Run(args)
output := ui.ErrorWriter.String() + ui.OutputWriter.String()
if code != tc.code {
t.Errorf("expected %d to be %d: %s", code, tc.code, output)
}
if !strings.Contains(output, tc.exp) {
t.Fatalf("expected %q to contain %q", output, tc.exp)
}
require.Equal(t, tc.code, code, "expected %d to be %d: %s", code, tc.code, output)
require.Contains(t, output, tc.exp, "expected %q to contain %q", output, tc.exp)
})
}
}