scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some vet fixes

Browse Source
This commit is contained in:
Jeff Mitchell
2018-02-04 20:37:57 -05:00
parent 9584ff537f
commit 63efb0e111
8 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helper/keysutil/policy.go
View File

@@ -953,8 +953,6 @@ func (p *Policy) VerifySignature(context, input []byte, sig, algorithm string) (
default:
return false, errutil.InternalError{Err: fmt.Sprintf("unsupported key type %v", p.Type)}
}
return false, errutil.InternalError{Err: "no valid key type found"}
}
func (p *Policy) Rotate(ctx context.Context, storage logical.Storage) error {

2
helper/proxyutil/proxyutil.go
View File

@@ -36,7 +36,7 @@ func (p *ProxyProtoConfig) SetAuthorizedAddrs(addrs interface{}) error {
for _, v := range addrs.([]interface{}) {
stringAddr, ok := v.(string)
if !ok {
return fmt.Errorf("error parsing %q as string")
return fmt.Errorf("error parsing %v as string", v)
}
stringAddrs = append(stringAddrs, stringAddr)
}

2
helper/strutil/strutil_test.go
View File

@@ -349,7 +349,7 @@ func TestGlobbedStringsMatch(t *testing.T) {
actual := GlobbedStringsMatch(tc.item, tc.val)
if actual != tc.expect {
t.Fatalf("Bad testcase %#v, expected %b, got %b", tc, tc.expect, actual)
t.Fatalf("Bad testcase %#v, expected %t, got %t", tc, tc.expect, actual)
}
}
}

4
http/sys_wrapping_test.go
View File

@@ -310,7 +310,7 @@ func TestHTTP_Wrapping(t *testing.T) {
// Check for correct CreationPath before rewrap
if wrapInfo.CreationPath != "secret/foo" {
t.Fatal("error on wrapInfo.CreationPath: expected: secret/foo, got: %s", wrapInfo.CreationPath)
t.Fatalf("error on wrapInfo.CreationPath: expected: secret/foo, got: %s", wrapInfo.CreationPath)
}
// Test rewrapping
@@ -323,7 +323,7 @@ func TestHTTP_Wrapping(t *testing.T) {
// Check for correct Creation path after rewrap
if wrapInfo.CreationPath != "secret/foo" {
t.Fatal("error on wrapInfo.CreationPath: expected: secret/foo, got: %s", wrapInfo.CreationPath)
t.Fatalf("error on wrapInfo.CreationPath: expected: secret/foo, got: %s", wrapInfo.CreationPath)
}
// Should be expired and fail

2
logical/framework/path_map_test.go
View File

@@ -271,7 +271,7 @@ func testSalting(t *testing.T, ctx context.Context, storage logical.Storage, sal
Value: []byte(`{"foo": "bar"}`),
})
if err != nil {
t.Fatal("err: %v", err)
t.Fatalf("err: %v", err)
}
// A read should transparently upgrade
resp, err = b.HandleRequest(ctx, &logical.Request{

4
logical/plugin/pb/translation_test.go
View File

@@ -31,7 +31,7 @@ func TestTranslation_Errors(t *testing.T) {
e := ProtoErrToErr(pe)
if !reflect.DeepEqual(e, err) {
t.Fatal("Errs did not match: %#v, %#v", e, err)
t.Fatalf("Errs did not match: %#v, %#v", e, err)
}
}
}
@@ -49,7 +49,7 @@ func TestTranslation_StorageEntry(t *testing.T) {
e := ProtoStorageEntryToLogicalStorageEntry(p)
if !reflect.DeepEqual(c, e) {
t.Fatal("Entries did not match: %#v, %#v", e, c)
t.Fatalf("Entries did not match: %#v, %#v", e, c)
}
}
}

8
physical/inmem/inmem_ha.go
View File

@@ -11,7 +11,7 @@ import (
type InmemHABackend struct {
physical.Backend
locks map[string]string
l sync.Mutex
l *sync.Mutex
cond *sync.Cond
logger log.Logger
}
@@ -32,8 +32,9 @@ func NewInmemHA(_ map[string]string, logger log.Logger) (physical.Backend, error
Backend: be,
locks: make(map[string]string),
logger: logger,
l: new(sync.Mutex),
}
in.cond = sync.NewCond(&in.l)
in.cond = sync.NewCond(in.l)
return in, nil
}
@@ -46,13 +47,14 @@ func NewTransactionalInmemHA(_ map[string]string, logger log.Logger) (physical.B
Backend: transInmem,
locks: make(map[string]string),
logger: logger,
l: new(sync.Mutex),
}
in := &TransactionalInmemHABackend{
InmemHABackend: inmemHA,
Transactional: transInmem.(physical.Transactional),
}
in.cond = sync.NewCond(&in.l)
in.cond = sync.NewCond(in.l)
return in, nil
}

37
vault/cluster.go
View File

@@ -343,31 +343,26 @@ func (c *Core) ClusterTLSConfig(ctx context.Context) (*tls.Config, error) {
// of clustering as connections come and go
serverLookup := func(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
switch {
default:
var localCert bytes.Buffer
var localCert bytes.Buffer
c.clusterParamsLock.RLock()
localCert.Write(c.localClusterCert)
localSigner := c.localClusterPrivateKey
parsedCert := c.localClusterParsedCert
c.clusterParamsLock.RUnlock()
if localCert.Len() == 0 {
return nil, fmt.Errorf("got forwarding connection but no local cert")
}
//c.logger.Trace("core: performing cert name lookup", "hello_server_name", clientHello.ServerName, "local_cluster_cert_name", parsedCert.Subject.CommonName)
return &tls.Certificate{
Certificate: [][]byte{localCert.Bytes()},
PrivateKey: localSigner,
Leaf: parsedCert,
}, nil
c.clusterParamsLock.RLock()
localCert.Write(c.localClusterCert)
localSigner := c.localClusterPrivateKey
parsedCert := c.localClusterParsedCert
c.clusterParamsLock.RUnlock()
if localCert.Len() == 0 {
return nil, fmt.Errorf("got forwarding connection but no local cert")
}
return nil, nil
//c.logger.Trace("core: performing cert name lookup", "hello_server_name", clientHello.ServerName, "local_cluster_cert_name", parsedCert.Subject.CommonName)
return &tls.Certificate{
Certificate: [][]byte{localCert.Bytes()},
PrivateKey: localSigner,
Leaf: parsedCert,
}, nil
}
clientLookup := func(requestInfo *tls.CertificateRequestInfo) (*tls.Certificate, error) {