Search for openssl cert store on app init, if the store is not present.

fixes  #3851
This commit is contained in:
tamasmeszaros 2020-03-25 09:38:51 +01:00
parent c3a9915fa1
commit 1123689a22
3 changed files with 65 additions and 4 deletions

View File

@ -55,7 +55,12 @@ ExternalProject_Add(dep_libcurl
--enable-versioned-symbols --enable-versioned-symbols
--enable-threaded-resolver --enable-threaded-resolver
--with-random=/dev/urandom --with-random=/dev/urandom
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
# CA root certificate paths will be set for openssl at runtime.
--without-ca-bundle
--without-ca-path
--with-ca-fallback # to look for the ssl backend's ca store
--disable-ldap --disable-ldap
--disable-ldaps --disable-ldaps
--disable-manual --disable-manual

View File

@ -197,6 +197,10 @@ if(APPLE)
target_link_libraries(libslic3r_gui ${DISKARBITRATION_LIBRARY}) target_link_libraries(libslic3r_gui ${DISKARBITRATION_LIBRARY})
endif() endif()
if (SLIC3R_STATIC)
target_compile_definitions(libslic3r_gui PRIVATE OPENSSL_CERT_OVERRIDE)
endif ()
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE) add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
endif () endif ()

View File

@ -7,10 +7,17 @@
#include <sstream> #include <sstream>
#include <exception> #include <exception>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/log/trivial.hpp>
#include <curl/curl.h> #include <curl/curl.h>
#ifdef OPENSSL_CERT_OVERRIDE
#include <openssl/x509.h>
#endif
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
@ -22,14 +29,56 @@ namespace Slic3r {
// Private // Private
class CurlGlobalInit struct CurlGlobalInit
{ {
static const CurlGlobalInit instance; static std::unique_ptr<CurlGlobalInit> instance;
CurlGlobalInit() { ::curl_global_init(CURL_GLOBAL_DEFAULT); } CurlGlobalInit()
{
#ifdef OPENSSL_CERT_OVERRIDE // defined if SLIC3R_STATIC=ON
// Look for a set of distro specific directories. Don't change the
// order: https://bugzilla.redhat.com/show_bug.cgi?id=1053882
static const char * CA_BUNDLES[] = {
"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL 6
"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
"/usr/share/ssl/certs/ca-bundle.crt",
"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD
"/etc/ssl/cert.pem",
"/etc/ssl/ca-bundle.pem" // OpenSUSE Tumbleweed
};
namespace fs = boost::filesystem;
// Env var name for the OpenSSL CA bundle (SSL_CERT_FILE nomally)
const char *const SSL_CA_FILE = X509_get_default_cert_file_env();
const char * ssl_cafile = ::getenv(SSL_CA_FILE);
if (!ssl_cafile)
ssl_cafile = X509_get_default_cert_file();
int replace = true;
if (!ssl_cafile || !fs::exists(fs::path(ssl_cafile)))
for (const char * bundle : CA_BUNDLES) {
if (fs::exists(fs::path(bundle))) {
::setenv(SSL_CA_FILE, bundle, replace);
break;
}
}
BOOST_LOG_TRIVIAL(info)
<< "Detected OpenSSL root CA store: " << ::getenv(SSL_CA_FILE);
#endif
::curl_global_init(CURL_GLOBAL_DEFAULT);
}
~CurlGlobalInit() { ::curl_global_cleanup(); } ~CurlGlobalInit() { ::curl_global_cleanup(); }
}; };
std::unique_ptr<CurlGlobalInit> CurlGlobalInit::instance;
struct Http::priv struct Http::priv
{ {
enum { enum {
@ -83,6 +132,9 @@ Http::priv::priv(const std::string &url)
, limit(0) , limit(0)
, cancel(false) , cancel(false)
{ {
if (!CurlGlobalInit::instance)
CurlGlobalInit::instance = std::make_unique<CurlGlobalInit>();
if (curl == nullptr) { if (curl == nullptr) {
throw std::runtime_error(std::string("Could not construct Curl object")); throw std::runtime_error(std::string("Could not construct Curl object"));
} }