Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAISTRA-2124: Ssl: avoid tracking "unknown" ciphers #69

Merged
merged 3 commits into from
Feb 10, 2021
Merged

MAISTRA-2124: Ssl: avoid tracking "unknown" ciphers #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a6ce48
Ssl: avoid tracking "unknown" ciphers
Feb 8, 2021
5643085
Strip a few ciphers that behave differently with the openssl lib we t…
Feb 8, 2021
a36a3e5
Merge remote-tracking branch 'upstream/maistra-2.1' into oschaaf-ssl-…
Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions source/extensions/transport_sockets/tls/context_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,16 @@ ContextImpl::ContextImpl(Stats::Scope& scope, const Envoy::Ssl::ContextConfig& c
// contention.

// Ciphers
stat_name_set_->rememberBuiltin("AEAD-AES128-GCM-SHA256");
stat_name_set_->rememberBuiltin("ECDHE-ECDSA-AES128-GCM-SHA256");
stat_name_set_->rememberBuiltin("ECDHE-RSA-AES128-GCM-SHA256");
stat_name_set_->rememberBuiltin("ECDHE-RSA-AES128-SHA");
stat_name_set_->rememberBuiltin("ECDHE-RSA-CHACHA20-POLY1305");
stat_name_set_->rememberBuiltin("TLS_AES_128_GCM_SHA256");

const STACK_OF(SSL_CIPHER) *ciphers = SSL_CTX_get_ciphers(tls_context_.ssl_ctx_.get());
for (size_t i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(ciphers, i);
stat_name_set_->rememberBuiltin(SSL_CIPHER_get_name(cipher));
}
// Add hardcoded cipher suites from the TLS 1.3 spec:
// https://tools.ietf.org/html/rfc8446
stat_name_set_->rememberBuiltins(
{"TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384", "TLS_AES_128_GCM_SHA256"});

// Curves from
// https://github.com/google/boringssl/blob/f4d8b969200f1ee2dd872ffb85802e6a0976afe7/ssl/ssl_key_share.cc#L384
stat_name_set_->rememberBuiltins(
Expand Down
38 changes: 38 additions & 0 deletions test/extensions/transport_sockets/tls/ssl_socket_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5938,6 +5938,44 @@ TEST_P(SslSocketTest, DISABLED_TestConnectionFailsOnMultipleCertificatesNonePass
testUtil(test_options.setExpectedServerStats("ssl.ocsp_staple_failed").enableOcspStapling());
}

// Test a few ciphers and ensure they don't get tracked as "unknown" ciphers.
TEST_P(SslSocketTest, CipherUsageGetsCounted) {
envoy::config::listener::v3::Listener listener;
envoy::config::listener::v3::FilterChain* filter_chain = listener.add_filter_chains();
envoy::extensions::transport_sockets::tls::v3::TlsCertificate* server_cert =
filter_chain->mutable_hidden_envoy_deprecated_tls_context()
->mutable_common_tls_context()
->add_tls_certificates();
server_cert->mutable_certificate_chain()->set_filename(TestEnvironment::substitute(
"{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem"));
server_cert->mutable_private_key()->set_filename(TestEnvironment::substitute(
"{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem"));
envoy::extensions::transport_sockets::tls::v3::TlsParameters* server_params =
filter_chain->mutable_hidden_envoy_deprecated_tls_context()
->mutable_common_tls_context()
->mutable_tls_params();

envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext client;
envoy::extensions::transport_sockets::tls::v3::TlsParameters* client_params =
client.mutable_common_tls_context()->mutable_tls_params();

const std::vector<std::string> ciphers = {
"ECDHE-RSA-CHACHA20-POLY1305", "ECDHE-RSA-AES128-GCM-SHA256",
"ECDHE-RSA-AES256-GCM-SHA384", "AES256-SHA256",
"ECDHE-RSA-AES128-SHA"};
for (const auto& cipher : ciphers) {
const std::string stats = "ssl.ciphers." + cipher;
client_params->clear_cipher_suites();
server_params->clear_cipher_suites();
client_params->add_cipher_suites(cipher);
server_params->add_cipher_suites(cipher);
TestUtilOptionsV2 cipher_test_options(listener, client, true, GetParam());
cipher_test_options.setExpectedCiphersuite(cipher);
cipher_test_options.setExpectedServerStats(stats).setExpectedClientStats(stats);
testUtilV2(cipher_test_options);
}
}

} // namespace Tls
} // namespace TransportSockets
} // namespace Extensions
Expand Down