Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
SSL cert loading: replace instead of add + validation.
kishorenc063d7911b401
diff --git a/include/http_server.h b/include/http_server.hindex 12b1edd0..c5288829 100644--- a/include/http_server.h+++ b/include/http_server.h@@ -93,6 +93,8 @@ private:int setup_ssl(const char *cert_file, const char *key_file);+ static bool initialize_ssl_ctx(const char *cert_file, const char *key_file, h2o_accept_ctx_t* accept_ctx);+static void on_ssl_refresh_timeout(h2o_timer_t *entry);static void on_metrics_refresh_timeout(h2o_timer_t *entry);diff --git a/src/http_server.cpp b/src/http_server.cppindex 4af81fda..f42e7bf7 100644--- a/src/http_server.cpp+++ b/src/http_server.cpp@@ -34,6 +34,8 @@ HttpServer::HttpServer(const std::string & version, const std::string & listen_assl_refresh_timer.timer.expire_at = 0; // used during destructormetrics_refresh_timer.timer.expire_at = 0; // used during destructor++ accept_ctx->ssl_ctx = nullptr;}void HttpServer::on_accept(h2o_socket_t *listener, const char *err) {@@ -72,12 +74,8 @@ void HttpServer::on_ssl_refresh_timeout(h2o_timer_t *entry) {LOG(INFO) << "Refreshing SSL certs from disk.";HttpServer *hs = static_cast<HttpServer*>(custom_timer->data);- SSL_CTX *ssl_ctx = hs->accept_ctx->ssl_ctx;-- if (SSL_CTX_use_certificate_chain_file(ssl_ctx, hs->ssl_cert_path.c_str()) != 1) {- LOG(ERROR) << "Error while refreshing SSL certificate file:" << hs->ssl_cert_path;- } else if (SSL_CTX_use_PrivateKey_file(ssl_ctx, hs->ssl_cert_key_path.c_str(), SSL_FILETYPE_PEM) != 1) {- LOG(ERROR) << "Error while refreshing SSL private key file: " << hs->ssl_cert_key_path;+ if(!initialize_ssl_ctx(hs->ssl_cert_path.c_str(), hs->ssl_cert_key_path.c_str(), hs->accept_ctx)) {+ LOG(ERROR) << "SSL cert refresh failed.";}// link the timer for the next cycle@@ -94,44 +92,10 @@ int HttpServer::setup_ssl(const char *cert_file, const char *key_file) {h2o_timer_init(&ssl_refresh_timer.timer, on_ssl_refresh_timeout);h2o_timer_link(ctx.loop, SSL_REFRESH_INTERVAL_MS, &ssl_refresh_timer.timer); // every 8 hours- accept_ctx->ssl_ctx = SSL_CTX_new(SSLv23_server_method());-- // As recommended by:- // https://github.com/ssllabs/research/wiki/SSL-and-TLS-Deployment-Best-Practices#23-use-secure-cipher-suites- SSL_CTX_set_cipher_list(accept_ctx->ssl_ctx, "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:"- "ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:"- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:"- "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:"- "DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256");-- // Without this, DH and ECDH ciphers will be ignored by OpenSSL- int nid = NID_X9_62_prime256v1;- EC_KEY *key = EC_KEY_new_by_curve_name(nid);- if (key == NULL) {- LOG(ERROR) << "Failed to create DH/ECDH.";- return -1;- }-- SSL_CTX_set_tmp_ecdh(accept_ctx->ssl_ctx, key);- EC_KEY_free(key);-- SSL_CTX_set_options(accept_ctx->ssl_ctx, SSL_OP_NO_SSLv2);- SSL_CTX_set_options(accept_ctx->ssl_ctx, SSL_OP_NO_SSLv3);- SSL_CTX_set_options(accept_ctx->ssl_ctx, SSL_OP_NO_TLSv1);- SSL_CTX_set_options(accept_ctx->ssl_ctx, SSL_OP_NO_TLSv1_1);-- SSL_CTX_set_options(accept_ctx->ssl_ctx, SSL_OP_SINGLE_ECDH_USE);-- if (SSL_CTX_use_certificate_chain_file(accept_ctx->ssl_ctx, cert_file) != 1) {- LOG(ERROR) << "An error occurred while trying to load server certificate file: " << cert_file;- return -1;- }- if (SSL_CTX_use_PrivateKey_file(accept_ctx->ssl_ctx, key_file, SSL_FILETYPE_PEM) != 1) {- LOG(ERROR) << "An error occurred while trying to load private key file: " << key_file;+ if(!initialize_ssl_ctx(cert_file, key_file, accept_ctx)) {return -1;}- h2o_ssl_register_alpn_protocols(accept_ctx->ssl_ctx, h2o_http2_alpn_protocols);return 0;}@@ -872,3 +836,63 @@ bool HttpServer::trigger_vote() {ThreadPool* HttpServer::get_thread_pool() const {return thread_pool;}++bool HttpServer::initialize_ssl_ctx(const char *cert_file, const char *key_file, h2o_accept_ctx_t* accept_ctx) {+ SSL_CTX* new_ctx = SSL_CTX_new(SSLv23_server_method());++ // As recommended by:+ // https://github.com/ssllabs/research/wiki/SSL-and-TLS-Deployment-Best-Practices#23-use-secure-cipher-suites+ SSL_CTX_set_cipher_list(new_ctx, "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:"+ "ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:"+ "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:"+ "ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:"+ "DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256");++ // Without this, DH and ECDH ciphers will be ignored by OpenSSL+ int nid = NID_X9_62_prime256v1;+ EC_KEY *key = EC_KEY_new_by_curve_name(nid);+ if (key == nullptr) {+ LOG(ERROR) << "Failed to create DH/ECDH.";+ return -1;+ }++ SSL_CTX_set_tmp_ecdh(new_ctx, key);+ EC_KEY_free(key);++ SSL_CTX_set_options(new_ctx, SSL_OP_NO_SSLv2);+ SSL_CTX_set_options(new_ctx, SSL_OP_NO_SSLv3);+ SSL_CTX_set_options(new_ctx, SSL_OP_NO_TLSv1);+ SSL_CTX_set_options(new_ctx, SSL_OP_NO_TLSv1_1);++ SSL_CTX_set_options(new_ctx, SSL_OP_SINGLE_ECDH_USE);++ if (SSL_CTX_use_certificate_chain_file(new_ctx, cert_file) != 1) {+ LOG(ERROR) << "An error occurred while trying to load server certificate file: " << cert_file;+ SSL_CTX_free(new_ctx);+ return false;+ }++ if (SSL_CTX_use_PrivateKey_file(new_ctx, key_file, SSL_FILETYPE_PEM) != 1) {+ LOG(ERROR) << "An error occurred while trying to load private key file: " << key_file;+ SSL_CTX_free(new_ctx);+ return false;+ }++ if(SSL_CTX_check_private_key(new_ctx) != 1) {+ LOG(ERROR) << "Private key validation failed for: " << key_file;+ SSL_CTX_free(new_ctx);+ return false;+ }++ h2o_ssl_register_alpn_protocols(new_ctx, h2o_http2_alpn_protocols);++ SSL_CTX* old_ctx = accept_ctx->ssl_ctx;+ accept_ctx->ssl_ctx = new_ctx;++ if(old_ctx != nullptr) {+ SSL_CTX_free(old_ctx);+ }++ return true;+}+diff --git a/test/collection_test.cpp b/test/collection_test.cppindex 72a48a1f..12dcf7cf 100644--- a/test/collection_test.cpp+++ b/test/collection_test.cpp@@ -2994,13 +2994,12 @@ TEST_F(CollectionTest, MultiFieldRelevance5) {spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "", 40, {}, {}, {}, 0,"<mark>", "</mark>", {1, 1, 1}).get();- LOG(INFO) << results;-ASSERT_EQ(3, results["found"].get<size_t>());ASSERT_EQ(3, results["hits"].size());ASSERT_STREQ("0", results["hits"][0]["document"]["id"].get<std::string>().c_str());- //ASSERT_STREQ("1", results["hits"][1]["document"]["id"].get<std::string>().c_str());+ ASSERT_STREQ("2", results["hits"][1]["document"]["id"].get<std::string>().c_str());+ ASSERT_STREQ("1", results["hits"][2]["document"]["id"].get<std::string>().c_str());collectionManager.drop_collection("coll1");}