3f1c510bc9
* Fix a deadlock if a panic happens during request handling During request handling, if a panic is created, deferred functions are run but otherwise execution stops. #5889 changed some locks to non-defers but had the side effect of causing the read lock to not be released if the request panicked. This fixes that and addresses a few other potential places where things could go wrong: 1) In sealInitCommon we always now defer a function that unlocks the read lock if it hasn't been unlocked already 2) In StepDown we defer the RUnlock but we also had two error cases that were calling it manually. These are unlikely to be hit but if they were I believe would cause a panic. * Add panic recovery test
50 lines
1 KiB
Go
50 lines
1 KiB
Go
package token
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/hashicorp/go-hclog"
|
|
"github.com/hashicorp/vault/api"
|
|
vaulthttp "github.com/hashicorp/vault/http"
|
|
"github.com/hashicorp/vault/sdk/logical"
|
|
"github.com/hashicorp/vault/vault"
|
|
)
|
|
|
|
// Tests the regression in
|
|
// https://github.com/hashicorp/vault/pull/6920
|
|
func TestRecoverFromPanic(t *testing.T) {
|
|
logger := hclog.New(nil)
|
|
|
|
coreConfig := &vault.CoreConfig{
|
|
LogicalBackends: map[string]logical.Factory{
|
|
"noop": vault.NoopBackendFactory,
|
|
},
|
|
EnableRaw: true,
|
|
Logger: logger,
|
|
}
|
|
cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
|
|
HandlerFunc: vaulthttp.Handler,
|
|
})
|
|
cluster.Start()
|
|
defer cluster.Cleanup()
|
|
|
|
core := cluster.Cores[0]
|
|
vault.TestWaitActive(t, core.Core)
|
|
client := core.Client
|
|
|
|
err := client.Sys().Mount("noop", &api.MountInput{
|
|
Type: "noop",
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
_, err = client.Logical().Read("noop/panic")
|
|
if err == nil {
|
|
t.Fatal("expected error")
|
|
}
|
|
|
|
// This will deadlock the test if we hit the condition
|
|
cluster.EnsureCoresSealed(t)
|
|
}
|