8020fb2098
* tlsutil: initial implementation of types/TLSVersion tlsutil: add test for parsing deprecated agent TLS version strings tlsutil: return TLSVersionInvalid with error tlsutil: start moving tlsutil cipher suite lookups over to types/tls tlsutil: rename tlsLookup to ParseTLSVersion, add cipherSuiteLookup agent: attempt to use types in runtime config agent: implement b.tlsVersion validation in config builder agent: fix tlsVersion nil check in builder tlsutil: update to renamed ParseTLSVersion and goTLSVersions tlsutil: fixup TestConfigurator_CommonTLSConfigTLSMinVersion tlsutil: disable invalid config parsing tests tlsutil: update tests auto_config: lookup old config strings from base.TLSMinVersion auto_config: update endpoint tests to use TLS types agent: update runtime_test to use TLS types agent: update TestRuntimeCinfig_Sanitize.golden agent: update config runtime tests to expect TLS types * website: update Consul agent tls_min_version values * agent: fixup TLS parsing and compilation errors * test: fixup lint issues in agent/config_runtime_test and tlsutil/config_test * tlsutil: add CHACHA20_POLY1305 cipher suites to goTLSCipherSuites * test: revert autoconfig tls min version fixtures to old format * types: add TLSVersions public function * agent: add warning for deprecated TLS version strings * agent: move agent config specific logic from tlsutil.ParseTLSVersion into agent config builder * tlsutil(BREAKING): change default TLS min version to TLS 1.2 * agent: move ParseCiphers logic from tlsutil into agent config builder * tlsutil: remove unused CipherString function * agent: fixup import for types package * Revert "tlsutil: remove unused CipherString function" This reverts commit 6ca7f6f58d268e617501b7db9500113c13bae70c. * agent: fixup config builder and runtime tests * tlsutil: fixup one remaining ListenerConfig -> ProtocolConfig * test: move TLS cipher suites parsing test from tlsutil into agent config builder tests * agent: remove parseCiphers helper from auto_config_endpoint_test * test: remove unused imports from tlsutil * agent: remove resolved FIXME comment * tlsutil: remove TODO and FIXME in cipher suite validation * agent: prevent setting inherited cipher suite config when TLS 1.3 is specified * changelog: add entry for converting agent config to TLS types * agent: remove FIXME in runtime test, this is covered in builder tests with invalid tls9 value now * tlsutil: remove config tests for values checked at agent config builder boundary * tlsutil: remove tls version check from loadProtocolConfig * tlsutil: remove tests and TODOs for logic checked in TestBuilder_tlsVersion and TestBuilder_tlsCipherSuites * website: update search link for supported Consul agent cipher suites * website: apply review suggestions for tls_min_version description * website: attempt to clean up markdown list formatting for tls_min_version * website: moar linebreaks to fix tls_min_version formatting * Revert "website: moar linebreaks to fix tls_min_version formatting" This reverts commit 38585927422f73ebf838a7663e566ac245f2a75c. * autoconfig: translate old values for TLSMinVersion * agent: rename var for translated value of deprecated TLS version value * Update agent/config/deprecated.go Co-authored-by: Dan Upton <daniel@floppy.co> * agent: fix lint issue * agent: fixup deprecated config test assertions for updated warning Co-authored-by: Dan Upton <daniel@floppy.co>
229 lines
7.8 KiB
Go
229 lines
7.8 KiB
Go
package types
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
// TLSVersion is a strongly-typed string for TLS versions
|
|
type TLSVersion string
|
|
|
|
const (
|
|
// Error value, excluded from lookup maps
|
|
TLSVersionInvalid TLSVersion = "TLS_INVALID"
|
|
|
|
// Explicit unspecified zero-value to avoid overwriting parent defaults
|
|
TLSVersionUnspecified TLSVersion = ""
|
|
|
|
// Explictly allow implementation to select TLS version
|
|
// May be useful to supercede defaults specified at a higher layer
|
|
TLSVersionAuto TLSVersion = "TLS_AUTO"
|
|
|
|
_ // Placeholder for SSLv3, hopefully we won't have to add this
|
|
|
|
// TLS versions
|
|
TLSv1_0 TLSVersion = "TLSv1_0"
|
|
TLSv1_1 TLSVersion = "TLSv1_1"
|
|
TLSv1_2 TLSVersion = "TLSv1_2"
|
|
TLSv1_3 TLSVersion = "TLSv1_3"
|
|
)
|
|
|
|
var (
|
|
tlsVersions = map[TLSVersion]struct{}{
|
|
TLSVersionAuto: {},
|
|
TLSv1_0: {},
|
|
TLSv1_1: {},
|
|
TLSv1_2: {},
|
|
TLSv1_3: {},
|
|
}
|
|
// NOTE: This interface is deprecated in favor of tlsVersions
|
|
// and should be eventually removed in a future release.
|
|
DeprecatedConsulAgentTLSVersions = map[string]TLSVersion{
|
|
"": TLSVersionAuto,
|
|
"tls10": TLSv1_0,
|
|
"tls11": TLSv1_1,
|
|
"tls12": TLSv1_2,
|
|
"tls13": TLSv1_3,
|
|
}
|
|
// NOTE: these currently map to the deprecated config strings to support the
|
|
// deployment pattern of upgrading servers first. This map should eventually
|
|
// be removed and any lookups updated to instead use the TLSVersion string
|
|
// values directly in a future release.
|
|
ConsulAutoConfigTLSVersionStrings = map[TLSVersion]string{
|
|
TLSVersionAuto: "",
|
|
TLSv1_0: "tls10",
|
|
TLSv1_1: "tls11",
|
|
TLSv1_2: "tls12",
|
|
TLSv1_3: "tls13",
|
|
}
|
|
TLSVersionsWithConfigurableCipherSuites = map[TLSVersion]struct{}{
|
|
// NOTE: these two are implementation-dependent, but it is not expected that
|
|
// either Go or Envoy would default to TLS 1.3 as a minimum version in the
|
|
// near future
|
|
TLSVersionUnspecified: {},
|
|
TLSVersionAuto: {},
|
|
|
|
TLSv1_0: {},
|
|
TLSv1_1: {},
|
|
TLSv1_2: {},
|
|
}
|
|
)
|
|
|
|
func (v *TLSVersion) String() string {
|
|
return string(*v)
|
|
}
|
|
|
|
var tlsVersionComparison = map[TLSVersion]uint{
|
|
TLSv1_0: 1,
|
|
TLSv1_1: 2,
|
|
TLSv1_2: 3,
|
|
TLSv1_3: 4,
|
|
}
|
|
|
|
// Will only return true for concrete versions and won't catch
|
|
// implementation-dependent conflicts with TLSVersionAuto or unspecified values
|
|
func (a TLSVersion) LessThan(b TLSVersion) (error, bool) {
|
|
for _, v := range []TLSVersion{a, b} {
|
|
if _, ok := tlsVersionComparison[v]; !ok {
|
|
return fmt.Errorf("can't compare implementation-dependent values"), false
|
|
}
|
|
}
|
|
|
|
return nil, tlsVersionComparison[a] < tlsVersionComparison[b]
|
|
}
|
|
|
|
func TLSVersions() string {
|
|
versions := []string{}
|
|
for v := range tlsVersions {
|
|
versions = append(versions, string(v))
|
|
}
|
|
sort.Strings(versions)
|
|
|
|
return strings.Join(versions, ", ")
|
|
}
|
|
|
|
func ValidateTLSVersion(v TLSVersion) error {
|
|
if _, ok := tlsVersions[v]; !ok {
|
|
return fmt.Errorf("no matching TLS version found for %s, please specify one of [%s]", v.String(), TLSVersions())
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// IANA cipher suite string constants as defined at
|
|
// https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml
|
|
// This is the total list of TLS 1.2-style cipher suites
|
|
// which are currently supported by either Envoy 1.21 or the Consul agent
|
|
// via Go, and may change as some older suites are removed in future
|
|
// Envoy releases and Consul drops support for older Envoy versions,
|
|
// and as supported cipher suites in the Go runtime change.
|
|
//
|
|
// The naming convention for cipher suites changed in TLS 1.3
|
|
// but constant values should still be globally unqiue.
|
|
//
|
|
// Handling validation on distinct sets of TLS 1.3 and TLS 1.2 TLSCipherSuite
|
|
// constants would be a future exercise if cipher suites for TLS 1.3 ever
|
|
// become configurable in BoringSSL, Envoy, or other implementation.
|
|
type TLSCipherSuite string
|
|
|
|
const (
|
|
// Cipher suites used by both Envoy and Consul agent
|
|
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 = "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
|
|
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 = "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
|
|
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 = "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
|
|
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
|
|
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
|
|
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
|
|
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 = "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
|
|
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
|
|
TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
|
|
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
|
|
|
|
// Older cipher suites not supported for Consul agent TLS,
|
|
// will eventually be removed from Envoy defaults
|
|
TLS_RSA_WITH_AES_128_GCM_SHA256 = "TLS_RSA_WITH_AES_128_GCM_SHA256"
|
|
TLS_RSA_WITH_AES_128_CBC_SHA = "TLS_RSA_WITH_AES_128_CBC_SHA"
|
|
TLS_RSA_WITH_AES_256_GCM_SHA384 = "TLS_RSA_WITH_AES_256_GCM_SHA384"
|
|
TLS_RSA_WITH_AES_256_CBC_SHA = "TLS_RSA_WITH_AES_256_CBC_SHA"
|
|
)
|
|
|
|
var (
|
|
consulAgentTLSCipherSuites = map[TLSCipherSuite]struct{}{
|
|
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: {},
|
|
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: {},
|
|
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: {},
|
|
TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: {},
|
|
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: {},
|
|
|
|
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256: {},
|
|
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA: {},
|
|
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: {},
|
|
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: {},
|
|
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: {},
|
|
}
|
|
envoyTLSCipherSuiteStrings = map[TLSCipherSuite]string{
|
|
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: "ECDHE-ECDSA-AES128-GCM-SHA256",
|
|
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: "ECDHE-ECDSA-CHACHA20-POLY1305",
|
|
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: "ECDHE-RSA-AES128-GCM-SHA256",
|
|
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256: "ECDHE-RSA-CHACHA20-POLY1305",
|
|
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA: "ECDHE-ECDSA-AES128-SHA",
|
|
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA: "ECDHE-RSA-AES128-SHA",
|
|
TLS_RSA_WITH_AES_128_GCM_SHA256: "AES128-GCM-SHA256",
|
|
TLS_RSA_WITH_AES_128_CBC_SHA: "AES128-SHA",
|
|
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: "ECDHE-ECDSA-AES256-GCM-SHA384",
|
|
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: "ECDHE-RSA-AES256-GCM-SHA384",
|
|
TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: "ECDHE-ECDSA-AES256-SHA",
|
|
TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA: "ECDHE-RSA-AES256-SHA",
|
|
TLS_RSA_WITH_AES_256_GCM_SHA384: "AES256-GCM-SHA384",
|
|
TLS_RSA_WITH_AES_256_CBC_SHA: "AES256-SHA",
|
|
}
|
|
)
|
|
|
|
func (c *TLSCipherSuite) String() string {
|
|
return string(*c)
|
|
}
|
|
|
|
func ValidateConsulAgentCipherSuites(cipherSuites []TLSCipherSuite) error {
|
|
var unmatched []string
|
|
|
|
for _, c := range cipherSuites {
|
|
if _, ok := consulAgentTLSCipherSuites[c]; !ok {
|
|
unmatched = append(unmatched, c.String())
|
|
}
|
|
}
|
|
|
|
if len(unmatched) > 0 {
|
|
return fmt.Errorf("no matching Consul Agent TLS cipher suite found for %s", strings.Join(unmatched, ","))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func ValidateEnvoyCipherSuites(cipherSuites []TLSCipherSuite) error {
|
|
var unmatched []string
|
|
|
|
for _, c := range cipherSuites {
|
|
if _, ok := envoyTLSCipherSuiteStrings[c]; !ok {
|
|
unmatched = append(unmatched, c.String())
|
|
}
|
|
}
|
|
|
|
if len(unmatched) > 0 {
|
|
return fmt.Errorf("no matching Envoy TLS cipher suite found for %s", strings.Join(unmatched, ","))
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func MarshalEnvoyTLSCipherSuiteStrings(cipherSuites []TLSCipherSuite) []string {
|
|
cipherSuiteStrings := []string{}
|
|
|
|
for _, c := range cipherSuites {
|
|
if s, ok := envoyTLSCipherSuiteStrings[c]; ok {
|
|
cipherSuiteStrings = append(cipherSuiteStrings, s)
|
|
}
|
|
}
|
|
|
|
return cipherSuiteStrings
|
|
}
|