Merge pull request #1294 from doanac/ssl-certs

httpclient: Always set path to CA certs
advancedtelematic · Aug 29, 2019 · d5d0c65 · d5d0c65
2 parents ffc150d + 84247e9
commit d5d0c65
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/libaktualizr/http/httpclient.cc b/src/libaktualizr/http/httpclient.cc
@@ -45,6 +45,7 @@ HttpClient::HttpClient(const std::vector<std::string>* extra_headers) {
   curlEasySetoptWrapper(curl, CURLOPT_NOSIGNAL, 1L);
   curlEasySetoptWrapper(curl, CURLOPT_TIMEOUT, 60L);
   curlEasySetoptWrapper(curl, CURLOPT_CONNECTTIMEOUT, 60L);
+  curlEasySetoptWrapper(curl, CURLOPT_CAPATH, Utils::getCaPath());
 
   // let curl use our write function
   curlEasySetoptWrapper(curl, CURLOPT_WRITEFUNCTION, writeString);

diff --git a/src/libaktualizr/utilities/utils.cc b/src/libaktualizr/utilities/utils.cc
@@ -777,6 +777,12 @@ const char *Utils::getUserAgent() {
 
 std::string Utils::user_agent_;
 
+void Utils::setCaPath(boost::filesystem::path path) { ca_path_ = std::move(path); }
+
+const char *Utils::getCaPath() { return ca_path_.c_str(); }
+
+boost::filesystem::path Utils::ca_path_{"/etc/ssl/certs"};
+
 TemporaryFile::TemporaryFile(const std::string &hint)
     : tmp_name_(SafeTempRoot::Get() / boost::filesystem::unique_path(std::string("%%%%-%%%%-").append(hint))) {}
 

diff --git a/src/libaktualizr/utilities/utils.h b/src/libaktualizr/utilities/utils.h
@@ -53,9 +53,13 @@ struct Utils {
   static void setUserAgent(std::string user_agent);
   static const char *getUserAgent();
 
+  static void setCaPath(boost::filesystem::path path);
+  static const char *getCaPath();
+
  private:
   static std::string storage_root_path_;
   static std::string user_agent_;
+  static boost::filesystem::path ca_path_;
 };
 
 /**