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>
217 lines
6.6 KiB
Go
217 lines
6.6 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hashicorp/consul/tlsutil"
|
|
"github.com/hashicorp/consul/types"
|
|
)
|
|
|
|
func TestLoad_DeprecatedConfig(t *testing.T) {
|
|
opts := LoadOpts{
|
|
HCL: []string{`
|
|
data_dir = "/foo"
|
|
|
|
acl_datacenter = "dcone"
|
|
|
|
acl_agent_token = "token1"
|
|
acl_token = "token2"
|
|
|
|
acl_replication_token = "token3"
|
|
|
|
acl_default_policy = "deny"
|
|
acl_down_policy = "async-cache"
|
|
|
|
acl_ttl = "3h"
|
|
acl_enable_key_list_policy = true
|
|
|
|
ca_file = "some-ca-file"
|
|
ca_path = "some-ca-path"
|
|
cert_file = "some-cert-file"
|
|
key_file = "some-key-file"
|
|
tls_cipher_suites = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
|
|
tls_min_version = "tls11"
|
|
verify_incoming = true
|
|
verify_incoming_https = false
|
|
verify_incoming_rpc = false
|
|
verify_outgoing = true
|
|
verify_server_hostname = true
|
|
tls_prefer_server_cipher_suites = true
|
|
`},
|
|
}
|
|
patchLoadOptsShims(&opts)
|
|
result, err := Load(opts)
|
|
require.NoError(t, err)
|
|
|
|
expectWarns := []string{
|
|
deprecationWarning("acl_agent_token", "acl.tokens.agent"),
|
|
deprecationWarning("acl_datacenter", "primary_datacenter"),
|
|
deprecationWarning("acl_default_policy", "acl.default_policy"),
|
|
deprecationWarning("acl_down_policy", "acl.down_policy"),
|
|
deprecationWarning("acl_enable_key_list_policy", "acl.enable_key_list_policy"),
|
|
deprecationWarning("acl_replication_token", "acl.tokens.replication"),
|
|
deprecationWarning("acl_token", "acl.tokens.default"),
|
|
deprecationWarning("acl_ttl", "acl.token_ttl"),
|
|
deprecationWarning("ca_file", "tls.defaults.ca_file"),
|
|
deprecationWarning("ca_path", "tls.defaults.ca_path"),
|
|
deprecationWarning("cert_file", "tls.defaults.cert_file"),
|
|
deprecationWarning("key_file", "tls.defaults.key_file"),
|
|
deprecationWarning("tls_cipher_suites", "tls.defaults.tls_cipher_suites"),
|
|
fmt.Sprintf("'tls_min_version' value 'tls11' is deprecated, please specify 'TLSv1_1' instead"),
|
|
deprecationWarning("tls_min_version", "tls.defaults.tls_min_version"),
|
|
deprecationWarning("verify_incoming", "tls.defaults.verify_incoming"),
|
|
deprecationWarning("verify_incoming_https", "tls.https.verify_incoming"),
|
|
deprecationWarning("verify_incoming_rpc", "tls.internal_rpc.verify_incoming"),
|
|
deprecationWarning("verify_outgoing", "tls.defaults.verify_outgoing"),
|
|
deprecationWarning("verify_server_hostname", "tls.internal_rpc.verify_server_hostname"),
|
|
"The 'tls_prefer_server_cipher_suites' field is deprecated and will be ignored.",
|
|
}
|
|
require.ElementsMatch(t, expectWarns, result.Warnings)
|
|
// Ideally this would compare against the entire result.RuntimeConfig, but
|
|
// we have so many non-zero defaults in that response that the noise of those
|
|
// defaults makes this test difficult to read. So as a workaround, compare
|
|
// specific values.
|
|
rt := result.RuntimeConfig
|
|
require.Equal(t, true, rt.ACLsEnabled)
|
|
require.Equal(t, "dcone", rt.PrimaryDatacenter)
|
|
require.Equal(t, "token1", rt.ACLTokens.ACLAgentToken)
|
|
require.Equal(t, "token2", rt.ACLTokens.ACLDefaultToken)
|
|
require.Equal(t, "token3", rt.ACLTokens.ACLReplicationToken)
|
|
require.Equal(t, "deny", rt.ACLResolverSettings.ACLDefaultPolicy)
|
|
require.Equal(t, "async-cache", rt.ACLResolverSettings.ACLDownPolicy)
|
|
require.Equal(t, 3*time.Hour, rt.ACLResolverSettings.ACLTokenTTL)
|
|
require.Equal(t, true, rt.ACLEnableKeyListPolicy)
|
|
|
|
for _, l := range []tlsutil.ProtocolConfig{rt.TLS.InternalRPC, rt.TLS.GRPC, rt.TLS.HTTPS} {
|
|
require.Equal(t, "some-ca-file", l.CAFile)
|
|
require.Equal(t, "some-ca-path", l.CAPath)
|
|
require.Equal(t, "some-cert-file", l.CertFile)
|
|
require.Equal(t, "some-key-file", l.KeyFile)
|
|
require.Equal(t, types.TLSVersion("TLSv1_1"), l.TLSMinVersion)
|
|
require.Equal(t, []types.TLSCipherSuite{types.TLSCipherSuite("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA")}, l.CipherSuites)
|
|
}
|
|
|
|
require.False(t, rt.TLS.InternalRPC.VerifyIncoming)
|
|
require.False(t, rt.TLS.HTTPS.VerifyIncoming)
|
|
require.True(t, rt.TLS.GRPC.VerifyIncoming)
|
|
require.True(t, rt.TLS.InternalRPC.VerifyOutgoing)
|
|
require.True(t, rt.TLS.HTTPS.VerifyOutgoing)
|
|
require.True(t, rt.TLS.InternalRPC.VerifyServerHostname)
|
|
}
|
|
|
|
func TestLoad_DeprecatedConfig_ACLReplication(t *testing.T) {
|
|
opts := LoadOpts{
|
|
HCL: []string{`
|
|
data_dir = "/foo"
|
|
|
|
enable_acl_replication = true
|
|
|
|
`},
|
|
}
|
|
patchLoadOptsShims(&opts)
|
|
result, err := Load(opts)
|
|
require.NoError(t, err)
|
|
|
|
expectWarns := []string{
|
|
deprecationWarning("enable_acl_replication", "acl.enable_token_replication"),
|
|
}
|
|
sort.Strings(result.Warnings)
|
|
require.Equal(t, expectWarns, result.Warnings)
|
|
// Ideally this would compare against the entire result.RuntimeConfig, but
|
|
// we have so many non-zero defaults in that response that the noise of those
|
|
// defaults makes this test difficult to read. So as a workaround, compare
|
|
// specific values.
|
|
rt := result.RuntimeConfig
|
|
require.Equal(t, true, rt.ACLTokenReplication)
|
|
}
|
|
|
|
func TestLoad_DeprecatedConfig_ACLMasterTokens(t *testing.T) {
|
|
t.Run("top-level fields", func(t *testing.T) {
|
|
|
|
opts := LoadOpts{
|
|
HCL: []string{`
|
|
data_dir = "/foo"
|
|
|
|
acl_master_token = "token1"
|
|
acl_agent_master_token = "token2"
|
|
`},
|
|
}
|
|
patchLoadOptsShims(&opts)
|
|
|
|
result, err := Load(opts)
|
|
require.NoError(t, err)
|
|
|
|
expectWarns := []string{
|
|
deprecationWarning("acl_master_token", "acl.tokens.initial_management"),
|
|
deprecationWarning("acl_agent_master_token", "acl.tokens.agent_recovery"),
|
|
}
|
|
require.ElementsMatch(t, expectWarns, result.Warnings)
|
|
|
|
rt := result.RuntimeConfig
|
|
require.Equal(t, "token1", rt.ACLInitialManagementToken)
|
|
require.Equal(t, "token2", rt.ACLTokens.ACLAgentRecoveryToken)
|
|
})
|
|
|
|
t.Run("embedded in tokens struct", func(t *testing.T) {
|
|
|
|
opts := LoadOpts{
|
|
HCL: []string{`
|
|
data_dir = "/foo"
|
|
|
|
acl {
|
|
tokens {
|
|
master = "token1"
|
|
agent_master = "token2"
|
|
}
|
|
}
|
|
`},
|
|
}
|
|
patchLoadOptsShims(&opts)
|
|
|
|
result, err := Load(opts)
|
|
require.NoError(t, err)
|
|
|
|
expectWarns := []string{
|
|
deprecationWarning("acl.tokens.master", "acl.tokens.initial_management"),
|
|
deprecationWarning("acl.tokens.agent_master", "acl.tokens.agent_recovery"),
|
|
}
|
|
require.ElementsMatch(t, expectWarns, result.Warnings)
|
|
|
|
rt := result.RuntimeConfig
|
|
require.Equal(t, "token1", rt.ACLInitialManagementToken)
|
|
require.Equal(t, "token2", rt.ACLTokens.ACLAgentRecoveryToken)
|
|
})
|
|
|
|
t.Run("both", func(t *testing.T) {
|
|
|
|
opts := LoadOpts{
|
|
HCL: []string{`
|
|
data_dir = "/foo"
|
|
|
|
acl_master_token = "token1"
|
|
acl_agent_master_token = "token2"
|
|
|
|
acl {
|
|
tokens {
|
|
master = "token3"
|
|
agent_master = "token4"
|
|
}
|
|
}
|
|
`},
|
|
}
|
|
patchLoadOptsShims(&opts)
|
|
|
|
result, err := Load(opts)
|
|
require.NoError(t, err)
|
|
|
|
rt := result.RuntimeConfig
|
|
require.Equal(t, "token3", rt.ACLInitialManagementToken)
|
|
require.Equal(t, "token4", rt.ACLTokens.ACLAgentRecoveryToken)
|
|
})
|
|
}
|