Improve TLS Handshake
This commit is contained in:
parent
2303301d38
commit
689f120410
20 changed files with 819 additions and 60 deletions
134
tls/certificate_store_test.go
Normal file
134
tls/certificate_store_test.go
Normal file
|
@ -0,0 +1,134 @@
|
|||
package tls
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/containous/traefik/safe"
|
||||
"github.com/patrickmn/go-cache"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestGetBestCertificate(t *testing.T) {
|
||||
testCases := []struct {
|
||||
desc string
|
||||
domainToCheck string
|
||||
staticCert string
|
||||
dynamicCert string
|
||||
expectedCert string
|
||||
}{
|
||||
{
|
||||
desc: "Empty Store, returns no certs",
|
||||
domainToCheck: "snitest.com",
|
||||
staticCert: "",
|
||||
dynamicCert: "",
|
||||
expectedCert: "",
|
||||
},
|
||||
{
|
||||
desc: "Empty static cert store",
|
||||
domainToCheck: "snitest.com",
|
||||
staticCert: "",
|
||||
dynamicCert: "snitest.com",
|
||||
expectedCert: "snitest.com",
|
||||
},
|
||||
{
|
||||
desc: "Empty dynamic cert store",
|
||||
domainToCheck: "snitest.com",
|
||||
staticCert: "snitest.com",
|
||||
dynamicCert: "",
|
||||
expectedCert: "snitest.com",
|
||||
},
|
||||
{
|
||||
desc: "Best Match",
|
||||
domainToCheck: "snitest.com",
|
||||
staticCert: "snitest.com",
|
||||
dynamicCert: "snitest.org",
|
||||
expectedCert: "snitest.com",
|
||||
},
|
||||
{
|
||||
desc: "Best Match with wildcard dynamic and exact static",
|
||||
domainToCheck: "www.snitest.com",
|
||||
staticCert: "www.snitest.com",
|
||||
dynamicCert: "*.snitest.com",
|
||||
expectedCert: "www.snitest.com",
|
||||
},
|
||||
{
|
||||
desc: "Best Match with wildcard static and exact dynamic",
|
||||
domainToCheck: "www.snitest.com",
|
||||
staticCert: "*.snitest.com",
|
||||
dynamicCert: "www.snitest.com",
|
||||
expectedCert: "www.snitest.com",
|
||||
},
|
||||
{
|
||||
desc: "Best Match with static wildcard only",
|
||||
domainToCheck: "www.snitest.com",
|
||||
staticCert: "*.snitest.com",
|
||||
dynamicCert: "",
|
||||
expectedCert: "*.snitest.com",
|
||||
},
|
||||
{
|
||||
desc: "Best Match with dynamic wildcard only",
|
||||
domainToCheck: "www.snitest.com",
|
||||
staticCert: "",
|
||||
dynamicCert: "*.snitest.com",
|
||||
expectedCert: "*.snitest.com",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range testCases {
|
||||
test := test
|
||||
t.Run(test.desc, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
staticMap := map[string]*tls.Certificate{}
|
||||
dynamicMap := map[string]*tls.Certificate{}
|
||||
|
||||
if test.staticCert != "" {
|
||||
cert, err := loadTestCert(test.staticCert)
|
||||
require.NoError(t, err)
|
||||
staticMap[test.staticCert] = cert
|
||||
}
|
||||
|
||||
if test.dynamicCert != "" {
|
||||
cert, err := loadTestCert(test.dynamicCert)
|
||||
require.NoError(t, err)
|
||||
dynamicMap[test.dynamicCert] = cert
|
||||
}
|
||||
|
||||
store := &CertificateStore{
|
||||
DynamicCerts: safe.New(dynamicMap),
|
||||
StaticCerts: safe.New(staticMap),
|
||||
CertCache: cache.New(1*time.Hour, 10*time.Minute),
|
||||
}
|
||||
|
||||
var expected *tls.Certificate
|
||||
if test.expectedCert != "" {
|
||||
cert, err := loadTestCert(test.expectedCert)
|
||||
require.NoError(t, err)
|
||||
expected = cert
|
||||
}
|
||||
|
||||
clientHello := &tls.ClientHelloInfo{
|
||||
ServerName: test.domainToCheck,
|
||||
}
|
||||
|
||||
actual := store.GetBestCertificate(clientHello)
|
||||
assert.Equal(t, expected, actual)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func loadTestCert(certName string) (*tls.Certificate, error) {
|
||||
staticCert, err := tls.LoadX509KeyPair(
|
||||
fmt.Sprintf("../integration/fixtures/https/%s.cert", strings.Replace(certName, "*", "wildcard", -1)),
|
||||
fmt.Sprintf("../integration/fixtures/https/%s.key", strings.Replace(certName, "*", "wildcard", -1)),
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &staticCert, nil
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue