luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix tests

This commit is contained in:
Jeff Mitchell 2017-06-21 11:19:38 -04:00
parent 4936a83310
commit 286392c2a2
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/server.go
View File

@ -245,7 +245,7 @@ func (c *ServerCommand) Run(args []string) int {
if dev {
coreConfig.DevToken = devRootTokenID
if devLeasedGeneric {
coreConfig.LogicalBackends["generic"] = vault.RenewableLeasedPassthroughBackendFactory
coreConfig.LogicalBackends["generic"] = vault.LeasedPassthroughBackendFactory
}
}

19
vault/logical_passthrough.go
View File

@ -14,26 +14,20 @@ import (
// PassthroughBackendFactory returns a PassthroughBackend
// with leases switched off
func PassthroughBackendFactory(conf *logical.BackendConfig) (logical.Backend, error) {
return LeaseSwitchedPassthroughBackend(conf, false, false)
return LeaseSwitchedPassthroughBackend(conf, false)
}
// PassthroughBackendWithLeasesFactory returns a PassthroughBackend
// with leases switched on
func LeasedPassthroughBackendFactory(conf *logical.BackendConfig) (logical.Backend, error) {
return LeaseSwitchedPassthroughBackend(conf, true, false)
}
// Same as above but renewable
func RenewableLeasedPassthroughBackendFactory(conf *logical.BackendConfig) (logical.Backend, error) {
return LeaseSwitchedPassthroughBackend(conf, true, true)
return LeaseSwitchedPassthroughBackend(conf, true)
}
// LeaseSwitchedPassthroughBackendFactory returns a PassthroughBackend
// with leases switched on or off
func LeaseSwitchedPassthroughBackend(conf *logical.BackendConfig, leases, renewable bool) (logical.Backend, error) {
func LeaseSwitchedPassthroughBackend(conf *logical.BackendConfig, leases bool) (logical.Backend, error) {
var b PassthroughBackend
b.generateLeases = leases
b.renewableLeases = renewable
b.Backend = &framework.Backend{
Help: strings.TrimSpace(passthroughHelp),
@ -80,8 +74,7 @@ func LeaseSwitchedPassthroughBackend(conf *logical.BackendConfig, leases, renewa
// fancy.
type PassthroughBackend struct {
*framework.Backend
generateLeases bool
renewableLeases bool
generateLeases bool
}
func (b *PassthroughBackend) handleRevoke(
@ -124,7 +117,7 @@ func (b *PassthroughBackend) handleRead(
if b.generateLeases {
// Generate the response
resp = b.Secret("generic").Response(rawData, nil)
resp.Secret.Renewable = b.renewableLeases
resp.Secret.Renewable = false
} else {
resp = &logical.Response{
Secret: &logical.Secret{},
@ -145,7 +138,7 @@ func (b *PassthroughBackend) handleRead(
}
if b.generateLeases {
resp.Secret.Renewable = b.renewableLeases
resp.Secret.Renewable = true
}
}