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

add missing key `bound_cidrs` in pathCertRead Response (#6080)

This commit is contained in:
Naoki Ainoya 2019-02-08 12:41:38 +09:00 committed by Chris Hoffman
parent 707c6d1813
commit a967078d80
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/credential/cert/backend_test.go
View File

@ -3,6 +3,7 @@ package cert
import (
"context"
"crypto/rand"
"github.com/hashicorp/go-sockaddr"
"net/http"
"golang.org/x/net/http2"
@ -1200,6 +1201,7 @@ func TestBackend_validCIDR(t *testing.T) {
}
name := "web"
boundCIDRs := []string{"127.0.0.1", "128.252.0.0/16"}
addCertReq := &logical.Request{
Operation: logical.UpdateOperation,
@ -1211,7 +1213,7 @@ func TestBackend_validCIDR(t *testing.T) {
"allowed_names": "",
"required_extensions": "",
"lease": 1000,
"bound_cidrs": []string{"127.0.0.1/32", "128.252.0.0/16"},
"bound_cidrs": boundCIDRs,
},
Storage: storage,
Connection: &logical.Connection{ConnState: &connState},
@ -1222,6 +1224,21 @@ func TestBackend_validCIDR(t *testing.T) {
t.Fatal(err)
}
readCertReq := &logical.Request{
Operation: logical.ReadOperation,
Path: "certs/" + name,
Storage: storage,
Connection: &logical.Connection{ConnState: &connState},
}
readResult, err := b.HandleRequest(context.Background(), readCertReq)
cidrsResult := readResult.Data["bound_cidrs"].([]*sockaddr.SockAddrMarshaler)
if cidrsResult[0].String() != boundCIDRs[0] ||
cidrsResult[1].String() != boundCIDRs[1] {
t.Fatalf("bound_cidrs couldn't be set correctly, EXPECTED: %v, ACTUAL: %v", boundCIDRs, cidrsResult)
}
loginReq := &logical.Request{
Operation: logical.UpdateOperation,
Path: "login",

1
builtin/credential/cert/path_certs.go
View File

@ -198,6 +198,7 @@ func (b *backend) pathCertRead(ctx context.Context, req *logical.Request, d *fra
"allowed_uri_sans": cert.AllowedURISANs,
"allowed_organizational_units": cert.AllowedOrganizationalUnits,
"required_extensions": cert.RequiredExtensions,
"bound_cidrs": cert.BoundCIDRs,
},
}, nil
}