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

tlsutil: update tests

pull/11647/head
Mike Morris 2021-11-24 15:55:12 -05:00
parent b26212133d
commit 9e609da2e6
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tlsutil/config.go
View File

@ -548,10 +548,6 @@ func (c *Configurator) commonTLSConfig(verifyIncoming bool) *tls.Config {
// default (TLS 1.0) and because the initial check in validateConfig makes
// sure the version is not invalid.
// FIXME: move ParseTLSVersion to be called externally, maybe in
// agent/config/runtime parsing before the tlsutil.Config struct is created?
// tlsVersion, _ := ParseTLSVersion(c.base.TLSMinVersion)
tlsConfig.MinVersion = goTLSVersions[c.base.TLSMinVersion]
// Set ClientAuth if necessary

37
tlsutil/config_test.go
View File

@ -395,17 +395,17 @@ func TestConfig_ParseCiphers(t *testing.T) {
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
}, ",")
ciphers := []uint16{
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
ciphers := []types.TLSCipherSuite{
types.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
types.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
types.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
types.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
types.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
types.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
types.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
types.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
types.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
}
v, err := ParseCiphers(testOk)
require.NoError(t, err)
@ -418,7 +418,7 @@ func TestConfig_ParseCiphers(t *testing.T) {
v, err = ParseCiphers("")
require.NoError(t, err)
require.Equal(t, []uint16{}, v)
require.Equal(t, []types.TLSCipherSuite{}, v)
}
func TestLoadKeyPair(t *testing.T) {
@ -651,13 +651,20 @@ func TestConfigurator_CommonTLSConfigCipherSuites(t *testing.T) {
tlsConf := c.commonTLSConfig(false)
require.Empty(t, tlsConf.CipherSuites)
// TODO: this test previously was expected to pass with an unexpected, but
// valid, value??
conf := Config{CipherSuites: []types.TLSCipherSuite{
types.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256}}
require.NoError(t, c.Update(conf))
tlsConf = c.commonTLSConfig(false)
require.Equal(t, conf.CipherSuites, tlsConf.CipherSuites)
// TODO: this test previously was expected to pass with an unexpected, but
// valid, value??
require.Equal(t, []uint16{}, tlsConf.CipherSuites)
conf = Config{CipherSuites: []types.TLSCipherSuite{
types.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}}
require.NoError(t, c.Update(conf))
tlsConf = c.commonTLSConfig(false)
require.Equal(t, []uint16{0xc009}, tlsConf.CipherSuites)
}
func TestConfigurator_CommonTLSConfigGetClientCertificate(t *testing.T) {