aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt20
-rw-r--r--README.md14
-rw-r--r--lib/connection.cpp2
-rw-r--r--lib/converters.h18
-rw-r--r--lib/keyverificationsession.cpp22
-rw-r--r--lib/keyverificationsession.h3
-rw-r--r--lib/networkaccessmanager.cpp13
-rw-r--r--lib/util.h2
8 files changed, 66 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c4d9545..0fbb4ef1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ endif(CMAKE_BUILD_TYPE)
message(STATUS "Using compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" )
include(CheckCXXCompilerFlag)
if (MSVC)
- add_compile_options(/Zc:preprocessor /EHsc /W4
+ add_compile_options(/EHsc /W4
/wd4100 /wd4127 /wd4242 /wd4244 /wd4245 /wd4267 /wd4365 /wd4456 /wd4459
/wd4464 /wd4505 /wd4514 /wd4571 /wd4619 /wd4623 /wd4625 /wd4626 /wd4706
/wd4710 /wd4774 /wd4820 /wd4946 /wd5026 /wd5027)
@@ -50,18 +50,22 @@ endif()
if (WIN32)
if (NOT CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR ".")
- endif ()
+ set(CMakeFilesLocation "cmake")
+ else()
+ set(CMakeFilesLocation "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ endif()
if (NOT CMAKE_INSTALL_BINDIR)
set(CMAKE_INSTALL_BINDIR ".")
- endif ()
+ endif()
if (NOT CMAKE_INSTALL_INCLUDEDIR)
set(CMAKE_INSTALL_INCLUDEDIR "include")
- endif ()
+ endif()
else()
include(GNUInstallDirs)
set(INCLUDEDIR_INIT ${PROJECT_NAME})
+ set(CMakeFilesLocation "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
endif(WIN32)
set(${PROJECT_NAME}_INSTALL_INCLUDEDIR
"${CMAKE_INSTALL_INCLUDEDIR}/${INCLUDEDIR_INIT}" CACHE PATH
@@ -294,6 +298,9 @@ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION)
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+if (MSVC)
+ target_compile_options(${PROJECT_NAME} PUBLIC /Zc:preprocessor)
+endif()
# Don't use PCH w/GCC (https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c34)
if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU)
@@ -357,14 +364,13 @@ configure_file(cmake/${PROJECT_NAME}Config.cmake.in
@ONLY
)
-set(ConfigFilesLocation "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
install(EXPORT ${PROJECT_NAME}Targets
- FILE ${PROJECT_NAME}Targets.cmake DESTINATION ${ConfigFilesLocation})
+ FILE ${PROJECT_NAME}Targets.cmake DESTINATION ${CMakeFilesLocation})
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
- DESTINATION ${ConfigFilesLocation}
+ DESTINATION ${CMakeFilesLocation}
)
install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules)
diff --git a/README.md b/README.md
index 8be38b5c..6278535a 100644
--- a/README.md
+++ b/README.md
@@ -173,6 +173,20 @@ by setting `Quotient_INSTALL_TESTS` to `OFF`.
"Qt5Widgets", but CMake did not find one.
```
then you need to set the right `-DCMAKE_PREFIX_PATH` variable, see above.
+
+- If `cmake` fails with a message similar to:
+ ```
+ CMake Error at /usr/lib64/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake:37 (message):
+ Some (but not all) targets in this export set were already defined.
+
+ Targets Defined: Qt::Core
+
+ Targets not yet defined: Qt::CorePrivate
+ ```
+ then you likely have both Qt 5 and Qt 6 on your system, and your client code
+ uses a different major version than Quotient. Make sure you use the client
+ version that matches libQuotient (e.g. you can't configure Quaternion 0.0.95
+ with libQuotient 0.7 in Qt 6 mode).
- If you use GCC and get an "unknown declarator" compilation error in the file
`qtconcurrentthreadengine.h` - unfortunately, it is an actual error in Qt 5.15
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 5003f40c..8ca76ceb 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -380,7 +380,7 @@ public:
{
qCDebug(MAIN) << "Saving access token to keychain for" << q->userId();
auto job = new QKeychain::WritePasswordJob(qAppName());
- job->setAutoDelete(false);
+ job->setAutoDelete(true);
job->setKey(q->userId());
job->setBinaryData(data->accessToken());
job->start();
diff --git a/lib/converters.h b/lib/converters.h
index 688f7bbd..0fb36320 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -37,7 +37,6 @@ struct JsonObjectUnpacker {
// fromJson<T, QJsonObject> specialisation instead of specialising
// the entire JsonConverter; if a different type of JSON value is needed
// (e.g., an array), specialising JsonConverter is inevitable
- static T load(QJsonValueRef jvr) { return fromJson<T>(QJsonValue(jvr)); }
static T load(const QJsonValue& jv) { return fromJson<T>(jv.toObject()); }
static T load(const QJsonDocument& jd) { return fromJson<T>(jd.object()); }
};
@@ -228,7 +227,7 @@ QString flagToJsonString(FlagT v, const FlagStringValuesT& flagValues)
return {};
}
-// JsonConverter<> specialisations
+// Specialisations
template<>
inline bool fromJson(const QJsonValue& jv) { return jv.toBool(); }
@@ -248,7 +247,7 @@ inline qint64 fromJson(const QJsonValue& jv) { return qint64(jv.toDouble()); }
template <>
inline QString fromJson(const QJsonValue& jv) { return jv.toString(); }
-//! Use fromJson<QString> and use toLatin1()/toUtf8()/... to make QByteArray
+//! Use fromJson<QString> and then toLatin1()/toUtf8()/... to make QByteArray
//!
//! QJsonValue can only convert to QString and there's ambiguity whether
//! conversion to QByteArray should use (fast but very limited) toLatin1() or
@@ -348,8 +347,12 @@ struct JsonArrayConverter {
{
VectorT vect;
vect.reserve(typename VectorT::size_type(ja.size()));
- for (const auto& i : ja)
- vect.push_back(fromJson<T>(i));
+ // NB: Make sure to pass QJsonValue to fromJson<> so that it could
+ // hit the correct overload and not fall back to the generic fromJson
+ // that treats everything as an object. See also the explanation in
+ // the commit introducing these lines.
+ for (const QJsonValue v : ja)
+ vect.push_back(fromJson<T>(v));
return vect;
}
static auto load(const QJsonValue& jv) { return load(jv.toArray()); }
@@ -401,8 +404,11 @@ struct HashMapFromJson {
static void fillFrom(const QJsonObject& jo, HashMapT& h)
{
h.reserve(h.size() + jo.size());
+ // NB: the QJsonValue cast below is for the same reason as in
+ // JsonArrayConverter
for (auto it = jo.begin(); it != jo.end(); ++it)
- h[it.key()] = fromJson<typename HashMapT::mapped_type>(it.value());
+ h[it.key()] = fromJson<typename HashMapT::mapped_type>(
+ QJsonValue(it.value()));
}
};
diff --git a/lib/keyverificationsession.cpp b/lib/keyverificationsession.cpp
index cc4428d7..3f76eac1 100644
--- a/lib/keyverificationsession.cpp
+++ b/lib/keyverificationsession.cpp
@@ -256,6 +256,10 @@ void KeyVerificationSession::sendMac()
mac),
m_encrypted);
setState (macReceived ? DONE : WAITINGFORMAC);
+ m_verified = true;
+ if (!m_pendingEdKeyId.isEmpty()) {
+ trustKeys();
+ }
}
void KeyVerificationSession::sendDone()
@@ -313,9 +317,10 @@ void KeyVerificationSession::sendStartSas()
{
startSentByUs = true;
KeyVerificationStartEvent event(m_transactionId, m_connection->deviceId());
- m_startEvent = QJsonDocument(event.contentJson()).toJson(QJsonDocument::Compact);
- m_connection->sendToDevice(m_remoteUserId, m_remoteDeviceId,
- std::move(event), m_encrypted);
+ m_startEvent =
+ QJsonDocument(event.contentJson()).toJson(QJsonDocument::Compact);
+ m_connection->sendToDevice(m_remoteUserId, m_remoteDeviceId, event,
+ m_encrypted);
setState(WAITINGFORACCEPT);
}
@@ -370,7 +375,16 @@ void KeyVerificationSession::handleMac(const KeyVerificationMacEvent& event)
return;
}
- m_connection->database()->setSessionVerified(edKeyId);
+ m_pendingEdKeyId = edKeyId;
+
+ if (m_verified) {
+ trustKeys();
+ }
+}
+
+void KeyVerificationSession::trustKeys()
+{
+ m_connection->database()->setSessionVerified(m_pendingEdKeyId);
emit m_connection->sessionVerified(m_remoteUserId, m_remoteDeviceId);
macReceived = true;
diff --git a/lib/keyverificationsession.h b/lib/keyverificationsession.h
index 9cac1184..32a91cfc 100644
--- a/lib/keyverificationsession.h
+++ b/lib/keyverificationsession.h
@@ -131,6 +131,8 @@ private:
bool macReceived = false;
bool m_encrypted;
QStringList m_remoteSupportedMethods;
+ bool m_verified = false;
+ QString m_pendingEdKeyId{};
void handleReady(const KeyVerificationReadyEvent& event);
void handleStart(const KeyVerificationStartEvent& event);
@@ -141,6 +143,7 @@ private:
void setError(Error error);
static QString errorToString(Error error);
static Error stringToError(const QString& error);
+ void trustKeys();
QByteArray macInfo(bool verifying, const QString& key = "KEY_IDS"_ls);
QString calculateMac(const QString& input, bool verifying, const QString& keyId= "KEY_IDS"_ls);
diff --git a/lib/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index 38ab07cc..78be89bd 100644
--- a/lib/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
@@ -9,7 +9,6 @@
#include "mxcreply.h"
#include <QtCore/QCoreApplication>
-#include <QtCore/QThreadStorage>
#include <QtCore/QSettings>
#include <QtNetwork/QNetworkReply>
@@ -50,9 +49,8 @@ QList<QSslError> NetworkAccessManager::ignoredSslErrors() const
void NetworkAccessManager::ignoreSslErrors(bool ignore) const
{
if (ignore) {
- connect(this, &QNetworkAccessManager::sslErrors, this, [](QNetworkReply *reply, const QList<QSslError> &errors) {
- reply->ignoreSslErrors();
- });
+ connect(this, &QNetworkAccessManager::sslErrors, this,
+ [](QNetworkReply* reply) { reply->ignoreSslErrors(); });
} else {
disconnect(this, &QNetworkAccessManager::sslErrors, this, nullptr);
}
@@ -70,11 +68,8 @@ void NetworkAccessManager::clearIgnoredSslErrors()
NetworkAccessManager* NetworkAccessManager::instance()
{
- static QThreadStorage<NetworkAccessManager*> storage;
- if(!storage.hasLocalData()) {
- storage.setLocalData(new NetworkAccessManager());
- }
- return storage.localData();
+ thread_local NetworkAccessManager nam;
+ return &nam;
}
QNetworkReply* NetworkAccessManager::createRequest(
diff --git a/lib/util.h b/lib/util.h
index 1cb1c0e1..9efda5d1 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -160,7 +160,7 @@ template <typename ImplType, typename TypeToDelete = ImplType, typename... ArgTs
inline ImplPtr<ImplType, TypeToDelete> makeImpl(ArgTs&&... args)
{
return ImplPtr<ImplType, TypeToDelete> {
- new ImplType(std::forward<ArgTs>(args)...),
+ new ImplType{std::forward<ArgTs>(args)...},
[](TypeToDelete* impl) { delete impl; }
};
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-03 00:54:25 +0000