aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2024-04-08 11:44:23 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2024-04-09 09:28:55 +0300
commit68ab22aebe9c7b1403d5f13a7becb9afebcf1049 (patch)
tree478083851592a769f312513505f9e10c90d8556e
parentc5b8b9ffdae4b21f2858d870df0001b8e4cbd38a (diff)
Linux: fix incorrect CA certificate file path for qtlicensetool login
The settings value was not read and set for the HttpClient instance used for QtAccount login with qtlicensetool. Fix by parsing the setting similarly as done on daemon side. Pick-to: 3.0 Change-Id: I2dfd7ae34a352534b8b29de9142b7d928a4ea25c Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--src/libs/qlicenseservice/qtaccount.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/qlicenseservice/qtaccount.cpp b/src/libs/qlicenseservice/qtaccount.cpp
index bbf37b8..b838aa2 100644
--- a/src/libs/qlicenseservice/qtaccount.cpp
+++ b/src/libs/qlicenseservice/qtaccount.cpp
@@ -65,6 +65,7 @@ bool QtAccount::performLogin(const std::string &email, const std::string &passwo
const std::string accessPoint = settings.get(sc_loginAccessPoint);
const std::string serverAddr = settings.get(sc_serverAddr);
+ const std::string caBundle = settings.get(sc_caBundlePath);
JsonHandler payload;
setCommonRequestParameters(payload, settings);
@@ -74,6 +75,8 @@ bool QtAccount::performLogin(const std::string &email, const std::string &passwo
HttpClient http(serverAddr);
http.setForceHttps(true);
+ http.setCABundlePath((caBundle == "auto") ? std::string() : caBundle);
+
std::string reply;
if (!http.sendReceive(reply, payload.dump(4), accessPoint, serverAddr)) {
m_error = "Error while performing request";