github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add DNSSAN and IPSAN to cache key (#7597)

pull/7650/head
sasha 2020-04-15 18:11:11 +03:00 committed by GitHub
parent 04a8a77365
commit ac9b330f6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/cache-types/connect_ca_leaf.go
View File

@ -660,6 +660,8 @@ func (r *ConnectCALeafRequest) Key() string {
v, err := hashstructure.Hash([]interface{}{ v, err := hashstructure.Hash([]interface{}{
r.Service, r.Service,
r.EnterpriseMeta, r.EnterpriseMeta,
r.DNSSAN,
r.IPSAN,
}, nil) }, nil)
if err == nil { if err == nil {
return fmt.Sprintf("service:%d", v) return fmt.Sprintf("service:%d", v)

15
agent/cache-types/connect_ca_leaf_test.go
View File

@ -2,6 +2,7 @@ package cachetype
import ( import (
"fmt" "fmt"
"net"
"strings" "strings"
"sync/atomic" "sync/atomic"
"testing" "testing"
@ -1022,12 +1023,26 @@ func TestConnectCALeaf_Key(t *testing.T) {
r1 := ConnectCALeafRequest{Service: "web"} r1 := ConnectCALeafRequest{Service: "web"}
r2 := ConnectCALeafRequest{Service: "api"} r2 := ConnectCALeafRequest{Service: "api"}
r3 := ConnectCALeafRequest{DNSSAN: []string{"a.com"}}
r4 := ConnectCALeafRequest{DNSSAN: []string{"b.com"}}
r5 := ConnectCALeafRequest{IPSAN: []net.IP{net.ParseIP("192.168.4.139")}}
r6 := ConnectCALeafRequest{IPSAN: []net.IP{net.ParseIP("192.168.4.140")}}
// hashstructure will hash the service name + ent meta to produce this key // hashstructure will hash the service name + ent meta to produce this key
r1Key := r1.Key() r1Key := r1.Key()
r2Key := r2.Key() r2Key := r2.Key()
r3Key := r3.Key()
r4Key := r4.Key()
r5Key := r5.Key()
r6Key := r6.Key()
require.True(t, strings.HasPrefix(r1Key, "service:"), "Key %s does not start with service:", r1Key) require.True(t, strings.HasPrefix(r1Key, "service:"), "Key %s does not start with service:", r1Key)
require.True(t, strings.HasPrefix(r2Key, "service:"), "Key %s does not start with service:", r2Key) require.True(t, strings.HasPrefix(r2Key, "service:"), "Key %s does not start with service:", r2Key)
require.NotEqual(t, r1Key, r2Key, "Cache keys for different services are not equal") require.NotEqual(t, r1Key, r2Key, "Cache keys for different services are not equal")
require.NotEqual(t, r3Key, r4Key, "Cache keys for different DNSSAN are not equal")
require.NotEqual(t, r5Key, r6Key, "Cache keys for different IPSAN are not equal")
r := ConnectCALeafRequest{Agent: "abc"} r := ConnectCALeafRequest{Agent: "abc"}
require.Equal(t, "agent:abc", r.Key()) require.Equal(t, "agent:abc", r.Key())
} }