aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml6
-rw-r--r--CMakeLists.txt10
-rw-r--r--cmake/QuotientConfig.cmake.in (renamed from cmake/QuotientConfig.cmake)5
-rw-r--r--lib/connection.cpp37
-rw-r--r--tests/quotest.cpp3
5 files changed, 31 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index 2449c003..74b2d0da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ install:
- git clone https://gitlab.matrix.org/matrix-org/olm.git
- pushd olm
- _cmake_config
-- _cmake_build # TODO: add --target install when the patch lands in olm
+- _cmake_build --target install
- popd
- git clone https://github.com/quotient-im/matrix-doc.git
- git clone --recursive https://github.com/KitsuneRal/gtad.git
@@ -63,13 +63,13 @@ install:
- popd
before_script:
-- _cmake_config -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DOlm_DIR=olm/build $E2EE
+- _cmake_config -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" $E2EE
- _cmake_build --target update-api
script:
- _cmake_build --target install
# Build quotest with the installed libQuotient
-- cmake $CMAKE_ARGS tests -Bbuild-test -DOlm_DIR=olm/build
+- cmake $CMAKE_ARGS tests -Bbuild-test
- cmake --build build-test --target all
# Build with qmake
- qmake quotest.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/lib" "LIBS += -Lolm/build"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9975af91..46ce64c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE)
if (${PROJECT_NAME}_ENABLE_E2EE)
if ((NOT DEFINED USE_INTREE_LIBQOLM OR USE_INTREE_LIBQOLM)
AND EXISTS ${PROJECT_SOURCE_DIR}/3rdparty/libQtOlm/lib/utils.h)
- add_subdirectory(3rdparty/libQtOlm EXCLUDE_FROM_ALL)
+ add_subdirectory(3rdparty/libQtOlm)
include_directories(3rdparty/libQtOlm)
if (NOT DEFINED USE_INTREE_LIBQOLM)
set (USE_INTREE_LIBQOLM 1)
@@ -252,6 +252,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
)
if (${PROJECT_NAME}_ENABLE_E2EE)
target_link_libraries(${PROJECT_NAME} QtOlm)
+ set(FIND_DEPS "find_dependency(QtOlm)") # For QuotientConfig.cmake.in
endif()
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Gui Qt5::Multimedia)
@@ -282,16 +283,17 @@ write_basic_package_version_file(
export(PACKAGE ${PROJECT_NAME})
export(EXPORT ${PROJECT_NAME}Targets
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake")
-configure_file(cmake/${PROJECT_NAME}Config.cmake
+configure_file(cmake/${PROJECT_NAME}Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
- COPYONLY
+ @ONLY
)
set(ConfigFilesLocation "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
install(EXPORT ${PROJECT_NAME}Targets
FILE ${PROJECT_NAME}Targets.cmake DESTINATION ${ConfigFilesLocation})
-install(FILES cmake/${PROJECT_NAME}Config.cmake
+install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
DESTINATION ${ConfigFilesLocation}
)
diff --git a/cmake/QuotientConfig.cmake b/cmake/QuotientConfig.cmake.in
index 31ed4db6..798fa87a 100644
--- a/cmake/QuotientConfig.cmake
+++ b/cmake/QuotientConfig.cmake.in
@@ -1,6 +1,5 @@
include(CMakeFindDependencyMacro)
-if (Quotient_ENABLE_E2EE)
- find_dependency(QtOlm)
-endif()
+@FIND_DEPS@
+
include("${CMAKE_CURRENT_LIST_DIR}/QuotientTargets.cmake")
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 98515617..021ff5dd 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -165,25 +165,24 @@ public:
return q->stateCacheDir().filePath("state.json");
}
- RoomEventPtr sessionDecryptMessage(const EncryptedEvent& encryptedEvent)
+ EventPtr sessionDecryptMessage(const EncryptedEvent& encryptedEvent)
{
#ifndef Quotient_E2EE_ENABLED
qCWarning(E2EE) << "End-to-end encryption (E2EE) support is turned off.";
return {};
#else // Quotient_E2EE_ENABLED
if (encryptedEvent.algorithm() != OlmV1Curve25519AesSha2AlgoKey)
- {
return {};
- }
- QString identityKey =
+
+ const auto identityKey =
encryptionManager->account()->curve25519IdentityKey();
- QJsonObject personalCipherObject =
+ const auto personalCipherObject =
encryptedEvent.ciphertext(identityKey);
if (personalCipherObject.isEmpty()) {
qCDebug(E2EE) << "Encrypted event is not for the current device";
return {};
}
- QString decrypted = encryptionManager->sessionDecryptMessage(
+ const auto decrypted = encryptionManager->sessionDecryptMessage(
personalCipherObject, encryptedEvent.senderKey().toLatin1());
if (decrypted.isEmpty()) {
qCDebug(E2EE) << "Problem with new session from senderKey:"
@@ -192,29 +191,29 @@ public:
return {};
}
- RoomEventPtr decryptedEvent = makeEvent<RoomMessageEvent>(
- QJsonDocument::fromJson(decrypted.toUtf8()).object());
+ auto&& decryptedEvent =
+ fromJson<EventPtr>(QJsonDocument::fromJson(decrypted.toUtf8()));
- if (decryptedEvent->senderId() != encryptedEvent.senderId()) {
- qCDebug(E2EE) << "Found user" << decryptedEvent->senderId()
+ if (auto sender = decryptedEvent->fullJson()["sender"_ls].toString();
+ sender != encryptedEvent.senderId()) {
+ qCWarning(E2EE) << "Found user" << sender
<< "instead of sender" << encryptedEvent.senderId()
<< "in Olm plaintext";
return {};
}
// TODO: keys to constants
- QJsonObject decryptedEventObject = decryptedEvent->fullJson();
- QString recipient =
+ const auto decryptedEventObject = decryptedEvent->fullJson();
+ const auto recipient =
decryptedEventObject.value("recipient"_ls).toString();
if (recipient != data->userId()) {
qCDebug(E2EE) << "Found user" << recipient << "instead of us"
<< data->userId() << "in Olm plaintext";
return {};
}
- QString ourKey = decryptedEventObject.value("recipient_keys"_ls)
- .toObject()
- .value(Ed25519Key)
- .toString();
+ const auto ourKey =
+ decryptedEventObject.value("recipient_keys"_ls).toObject()
+ .value(Ed25519Key).toString();
if (ourKey
!= QString::fromUtf8(
encryptionManager->account()->ed25519IdentityKey())) {
@@ -225,7 +224,7 @@ public:
return {};
}
- return decryptedEvent;
+ return std::move(decryptedEvent);
#endif // Quotient_E2EE_ENABLED
}
};
@@ -390,8 +389,8 @@ void Connection::Private::loginToServer(LoginArgTs&&... loginArgs)
#ifndef Quotient_E2EE_ENABLED
qCWarning(E2EE) << "End-to-end encryption (E2EE) support is turned off.";
#else // Quotient_E2EE_ENABLED
- encryptionManager->uploadIdentityKeys(this);
- encryptionManager->uploadOneTimeKeys(this);
+ encryptionManager->uploadIdentityKeys(q);
+ encryptionManager->uploadOneTimeKeys(q);
#endif // Quotient_E2EE_ENABLED
});
connect(loginJob, &BaseJob::failure, q, [this, loginJob] {
diff --git a/tests/quotest.cpp b/tests/quotest.cpp
index 194c6a69..4f7c4026 100644
--- a/tests/quotest.cpp
+++ b/tests/quotest.cpp
@@ -46,7 +46,8 @@ private:
};
using TestToken = QByteArray; // return value of QMetaMethod::name
-Q_DECLARE_METATYPE(TestToken);
+Q_DECLARE_METATYPE(TestToken)
+
// For now, the token itself is the test name but that may change.
const char* testName(const TestToken& token) { return token.constData(); }
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 04:43:03 +0000