FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTTP: allow CAINFO to be set

Browse Source 
Env var is SIMGEAR_TLS_CERT_PATH
This commit is contained in:
James Turner
2020-08-03 14:25:58 +01:00
committed by Automatic Release Builder
parent 02cfd941c9
commit 08108d9cf1
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/io/HTTPClient.cxx
+9
View File
@@ -107,6 +107,8 @@ public:
unsigned int bytesTransferred; unsigned int bytesTransferred;
unsigned int lastTransferRate; unsigned int lastTransferRate;
uint64_t totalBytesDownloaded; uint64_t totalBytesDownloaded;
SGPath tlsCertificatePath;
}; };
Client::Client() : Client::Client() :
@@ -122,6 +124,8 @@ Client::Client() :
d->maxPipelineDepth = 5; d->maxPipelineDepth = 5;
setUserAgent("SimGear-" SG_STRINGIZE(SIMGEAR_VERSION)); setUserAgent("SimGear-" SG_STRINGIZE(SIMGEAR_VERSION));
d->tlsCertificatePath = SGPath::fromEnv("SIMGEAR_TLS_CERT_PATH");
static bool didInitCurlGlobal = false; static bool didInitCurlGlobal = false;
if (!didInitCurlGlobal) { if (!didInitCurlGlobal) {
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
@@ -275,6 +279,11 @@ void Client::makeRequest(const Request_ptr& r)
curl_easy_setopt(curlRequest, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(curlRequest, CURLOPT_FOLLOWLOCATION, 1);
if (!d->tlsCertificatePath.isNull()) {
const auto utf8 = d->tlsCertificatePath.utf8Str();
curl_easy_setopt(curlRequest, CURLOPT_CAINFO, utf8.c_str());
}
if (!d->proxy.empty()) { if (!d->proxy.empty()) {
curl_easy_setopt(curlRequest, CURLOPT_PROXY, d->proxy.c_str()); curl_easy_setopt(curlRequest, CURLOPT_PROXY, d->proxy.c_str());
curl_easy_setopt(curlRequest, CURLOPT_PROXYPORT, d->proxyPort); curl_easy_setopt(curlRequest, CURLOPT_PROXYPORT, d->proxyPort);