From bad165851667c08ae4547374e21865c3b4f1c13a Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 27 Jun 2024 16:13:45 +0200 Subject: Instead of ssl.termination, the condition should depend on ssl.enable So that we fall back from storage.ssl.*_file_path to ssl.*_file_path when ssl.enable=true, because in this case we can expect that these fallbacks exist. Otherwise we do not fall back. ssl.termination does not matter. Signed-off-by: Andras Timar Change-Id: I6ca86c5ce5849fffcd5c41f0ce2a54977ab50faa --- wsd/Storage.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index 6fe39bb6e6..056b18cffe 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -135,18 +135,18 @@ void StorageBase::initialize() if (SSLEnabled || SSLAsScheme) { - if (COOLWSD::isSSLTermination()) - { - sslClientParams.certificateFile = COOLWSD::getPathFromConfig("storage.ssl.cert_file_path"); - sslClientParams.privateKeyFile = COOLWSD::getPathFromConfig("storage.ssl.key_file_path"); - sslClientParams.caLocation = COOLWSD::getPathFromConfig("storage.ssl.ca_file_path"); - } - else + if (COOLWSD::isSSLEnabled()) { sslClientParams.certificateFile = COOLWSD::getPathFromConfigWithFallback("storage.ssl.cert_file_path", "ssl.cert_file_path"); sslClientParams.privateKeyFile = COOLWSD::getPathFromConfigWithFallback("storage.ssl.key_file_path", "ssl.key_file_path"); sslClientParams.caLocation = COOLWSD::getPathFromConfigWithFallback("storage.ssl.ca_file_path", "ssl.ca_file_path"); } + else + { + sslClientParams.certificateFile = COOLWSD::getPathFromConfig("storage.ssl.cert_file_path"); + sslClientParams.privateKeyFile = COOLWSD::getPathFromConfig("storage.ssl.key_file_path"); + sslClientParams.caLocation = COOLWSD::getPathFromConfig("storage.ssl.ca_file_path"); + } sslClientParams.cipherList = COOLWSD::getPathFromConfigWithFallback("storage.ssl.cipher_list", "ssl.cipher_list"); const bool sslVerification = COOLWSD::getConfigValue("ssl.ssl_verification", true); sslClientParams.verificationMode = !sslVerification ? Poco::Net::Context::VERIFY_NONE : Poco::Net::Context::VERIFY_STRICT; -- cgit