diff options
author | Shauren <shauren.trinity@gmail.com> | 2023-09-16 00:41:07 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2023-09-16 00:41:07 +0200 |
commit | 1fe73cd5322657bf8bd1f4f64eecc9e886d96ec3 (patch) | |
tree | 7a8ef8c299e6cee3c237054933216302d08f9a29 /src/server/bnetserver/Server/SslContext.cpp | |
parent | c32b8ac7b9cb8b914b61212de0419fc096df94fc (diff) |
Core/SSL: Support more certificate formats
Diffstat (limited to 'src/server/bnetserver/Server/SslContext.cpp')
-rw-r--r-- | src/server/bnetserver/Server/SslContext.cpp | 89 |
1 files changed, 85 insertions, 4 deletions
diff --git a/src/server/bnetserver/Server/SslContext.cpp b/src/server/bnetserver/Server/SslContext.cpp index 69cb1b1f8db..69d36f92a51 100644 --- a/src/server/bnetserver/Server/SslContext.cpp +++ b/src/server/bnetserver/Server/SslContext.cpp @@ -18,11 +18,47 @@ #include "SslContext.h" #include "Config.h" #include "Log.h" +#include "Memory.h" +#include <boost/filesystem/operations.hpp> +#include <boost/filesystem/path.hpp> +#include <openssl/store.h> +#include <openssl/ui.h> + +namespace +{ +auto CreatePasswordUiMethodFromPemCallback(::pem_password_cb* callback) +{ + return Trinity::make_unique_ptr_with_deleter(UI_UTIL_wrap_read_pem_callback(callback, 0), ::UI_destroy_method); +} + +auto OpenOpenSSLStore(boost::filesystem::path const& storePath, UI_METHOD const* passwordCallback, void* passwordCallbackData) +{ + std::string uri; + uri.reserve(6 + storePath.size()); + + uri += "file:"; + std::string genericPath = storePath.generic_string(); + if (!genericPath.empty() && !genericPath.starts_with('/')) + uri += '/'; // ensure the path starts with / (windows special case, unix absolute paths already do) + + uri += genericPath; + + return Trinity::make_unique_ptr_with_deleter(OSSL_STORE_open(uri.c_str(), passwordCallback, passwordCallbackData, nullptr, nullptr), ::OSSL_STORE_close); +} + +boost::system::error_code GetLastOpenSSLError() +{ + auto ossl_error = ::ERR_get_error(); + if (ERR_SYSTEM_ERROR(ossl_error)) + return boost::system::error_code(static_cast<int>(::ERR_GET_REASON(ossl_error)), boost::asio::error::get_system_category()); + + return boost::system::error_code(static_cast<int>(ossl_error), boost::asio::error::get_ssl_category()); +} +} bool Battlenet::SslContext::Initialize() { boost::system::error_code err; - #define LOAD_CHECK(fn) do { fn; \ if (err) \ { \ @@ -31,7 +67,6 @@ bool Battlenet::SslContext::Initialize() } } while (0) std::string certificateChainFile = sConfigMgr->GetStringDefault("CertificatesFile", "./bnetserver.cert.pem"); - std::string privateKeyFile = sConfigMgr->GetStringDefault("PrivateKeyFile", "./bnetserver.key.pem"); auto passwordCallback = [](std::size_t /*max_length*/, boost::asio::ssl::context::password_purpose /*purpose*/) -> std::string { @@ -39,8 +74,54 @@ bool Battlenet::SslContext::Initialize() }; LOAD_CHECK(instance().set_password_callback(passwordCallback, err)); - LOAD_CHECK(instance().use_certificate_chain_file(certificateChainFile, err)); - LOAD_CHECK(instance().use_private_key_file(privateKeyFile, boost::asio::ssl::context::pem, err)); + + SSL_CTX* nativeContext = instance().native_handle(); + auto password_ui_method = CreatePasswordUiMethodFromPemCallback(SSL_CTX_get_default_passwd_cb(nativeContext)); + + auto store = OpenOpenSSLStore(boost::filesystem::absolute(certificateChainFile), + password_ui_method.get(), SSL_CTX_get_default_passwd_cb_userdata(nativeContext)); + + if (!store) + { + err = GetLastOpenSSLError(); + TC_LOG_ERROR("server.ssl", "OSSL_STORE_open failed: {}", err.message()); + return false; + } + + EVP_PKEY* key = nullptr; + STACK_OF(X509)* certs = sk_X509_new_null(); + while (!OSSL_STORE_eof(store.get())) + { + OSSL_STORE_INFO* info = OSSL_STORE_load(store.get()); + if (!info) + continue; + + switch (OSSL_STORE_INFO_get_type(info)) + { + case OSSL_STORE_INFO_PKEY: + key = OSSL_STORE_INFO_get1_PKEY(info); + break; + case OSSL_STORE_INFO_CERT: + sk_X509_push(certs, OSSL_STORE_INFO_get1_CERT(info)); + break; + default: + break; + } + } + + if (sk_X509_num(certs) > 0) + { + X509* cert = sk_X509_shift(certs); + SSL_CTX_use_cert_and_key(nativeContext, cert, key, certs, 1); + } + + sk_X509_free(certs); + + if (!key) + { + std::string privateKeyFile = sConfigMgr->GetStringDefault("PrivateKeyFile", "./bnetserver.key.pem"); + LOAD_CHECK(instance().use_private_key_file(privateKeyFile, boost::asio::ssl::context::pem, err)); + } #undef LOAD_CHECK |