walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'nghttpx-unrecognized-sni'

This commit is contained in:
Tatsuhiro Tsujikawa 2017-04-27 22:57:54 +09:00
parent d7581525ac 1085f68018
commit a885315ef5
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shrpx_tls.cc
View File

@ -153,13 +153,13 @@ int servername_callback(SSL *ssl, int *al, void *arg) {
auto rawhost = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); auto rawhost = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
if (rawhost == nullptr) { if (rawhost == nullptr) {
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_NOACK;
} }
auto len = strlen(rawhost); auto len = strlen(rawhost);
// NI_MAXHOST includes terminal NULL. // NI_MAXHOST includes terminal NULL.
if (len == 0 || len + 1 > NI_MAXHOST) { if (len == 0 || len + 1 > NI_MAXHOST) {
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_NOACK;
} }
std::array<uint8_t, NI_MAXHOST> buf; std::array<uint8_t, NI_MAXHOST> buf;
@ -170,18 +170,15 @@ int servername_callback(SSL *ssl, int *al, void *arg) {
auto hostname = StringRef{std::begin(buf), end_buf}; auto hostname = StringRef{std::begin(buf), end_buf};
handler->set_tls_sni(hostname);
auto cert_tree = worker->get_cert_lookup_tree(); auto cert_tree = worker->get_cert_lookup_tree();
if (!cert_tree) {
return SSL_TLSEXT_ERR_OK;
}
auto idx = cert_tree->lookup(hostname); auto idx = cert_tree->lookup(hostname);
if (idx == -1) { if (idx == -1) {
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_NOACK;
} }
handler->set_tls_sni(hostname);
auto conn_handler = worker->get_connection_handler(); auto conn_handler = worker->get_connection_handler();
const auto &ssl_ctx_list = conn_handler->get_indexed_ssl_ctx(idx); const auto &ssl_ctx_list = conn_handler->get_indexed_ssl_ctx(idx);
@ -1675,15 +1672,7 @@ setup_server_ssl_context(std::vector<SSL_CTX *> &all_ssl_ctx,
all_ssl_ctx.push_back(ssl_ctx); all_ssl_ctx.push_back(ssl_ctx);
if (tlsconf.subcerts.empty()) { assert(cert_tree);
return ssl_ctx;
}
if (!cert_tree) {
LOG(WARN) << "We have multiple additional certificates (--subcert), but "
"cert_tree is not given. SNI may not work.";
return ssl_ctx;
}
if (cert_lookup_tree_add_ssl_ctx(cert_tree, indexed_ssl_ctx, ssl_ctx) == -1) { if (cert_lookup_tree_add_ssl_ctx(cert_tree, indexed_ssl_ctx, ssl_ctx) == -1) {
LOG(FATAL) << "Failed to add default certificate."; LOG(FATAL) << "Failed to add default certificate.";
@ -1742,7 +1731,7 @@ void setup_downstream_http1_alpn(SSL *ssl) {
std::unique_ptr<CertLookupTree> create_cert_lookup_tree() { std::unique_ptr<CertLookupTree> create_cert_lookup_tree() {
auto config = get_config(); auto config = get_config();
if (!upstream_tls_enabled(config->conn) || config->tls.subcerts.empty()) { if (!upstream_tls_enabled(config->conn)) {
return nullptr; return nullptr;
} }
return make_unique<CertLookupTree>(); return make_unique<CertLookupTree>();