Skip to content

ssl: require non-empty "cipher_suites" in configuration. #776

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

Closed
PiotrSikora wants to merge 1 commit into from
Closed

ssl: require non-empty "cipher_suites" in configuration. #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions source/common/json/config_schemas.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const std::string Json::Schema::LISTENER_SCHEMA(R"EOF(
"type" : "string"
}
},
"cipher_suites" : {"type" : "string"},
"cipher_suites" : {"type" : "string", "minLength" : 1},
"ecdh_curves" : {"type" : "string", "minLength" : 1}
},
"required": ["cert_chain_file", "private_key_file"],
Expand Down Expand Up @@ -1099,7 +1099,7 @@ const std::string Json::Schema::CLUSTER_SCHEMA(R"EOF(
"type" : "string"
}
},
"cipher_suites" : {"type" : "string"},
"cipher_suites" : {"type" : "string", "minLength" : 1},
"ecdh_curves" : {"type" : "string", "minLength" : 1},
"sni" : {"type" :"string"}
},
Expand Down
26 changes: 12 additions & 14 deletions source/common/ssl/context_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,23 @@ ContextImpl::ContextImpl(ContextManagerImpl& parent, Stats::Scope& scope, Contex
: parent_(parent), ctx_(SSL_CTX_new(SSLv23_method())), scope_(scope),
stats_(generateStats(scope)) {
RELEASE_ASSERT(ctx_);
// the list of ciphers that will be supported
if (!config.cipherSuites().empty()) {
const std::string& cipher_suites = config.cipherSuites();

if (!SSL_CTX_set_cipher_list(ctx_.get(), cipher_suites.c_str())) {
throw EnvoyException(fmt::format("Failed to initialize cipher suites {}", cipher_suites));
}
const std::string& cipher_suites = config.cipherSuites();

if (!SSL_CTX_set_cipher_list(ctx_.get(), cipher_suites.c_str())) {
throw EnvoyException(fmt::format("Failed to initialize cipher suites {}", cipher_suites));
}

// verify that all of the specified ciphers were understood by openssl
ssize_t num_configured = std::count(cipher_suites.begin(), cipher_suites.end(), ':') + 1;
// verify that all of the specified ciphers were understood by openssl
ssize_t num_configured = std::count(cipher_suites.begin(), cipher_suites.end(), ':') + 1;
#ifdef OPENSSL_IS_BORINGSSL
num_configured += std::count(cipher_suites.begin(), cipher_suites.end(), '|');
if (sk_SSL_CIPHER_num(ctx_->cipher_list->ciphers) < static_cast<size_t>(num_configured)) {
num_configured += std::count(cipher_suites.begin(), cipher_suites.end(), '|');
if (sk_SSL_CIPHER_num(ctx_->cipher_list->ciphers) < static_cast<size_t>(num_configured)) {
#else
if (sk_SSL_CIPHER_num(ctx_->cipher_list) < num_configured) {
if (sk_SSL_CIPHER_num(ctx_->cipher_list) < num_configured) {
#endif
throw EnvoyException(
fmt::format("Unknown cipher specified in cipher suites {}", config.cipherSuites()));
}
throw EnvoyException(
fmt::format("Unknown cipher specified in cipher suites {}", config.cipherSuites()));
}

if (!SSL_CTX_set1_curves_list(ctx_.get(), config.ecdhCurves().c_str())) {
Expand Down