Feature: End to End Encrypted Message Handling for Ruqola

.gitignore

@@ -34,4 +34,4 @@ compile_commands.json
 /.vscode/
 .qtcreator/
 .env
-compose.yml
+docker-compose.yml

src/apps/CMakeLists.txt

@@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: 2020-2025 Laurent Montel <montel@kde.org>
 # SPDX-License-Identifier: BSD-3-Clause
+
 include(ECMAddAppIcon)
 
 add_executable(ruqola main.cpp)
@@ -11,6 +12,7 @@ target_link_libraries(ruqola
     KF6::XmlGui
     KF6::IconThemes
 )
+
 if(USE_DBUS)
     target_link_libraries(ruqola KF6::DBusAddons)
 else()
@@ -25,3 +27,4 @@ ecm_add_app_icon(appIcons ICONS "${RUQOLA_ICONS}")
 target_sources(ruqola PRIVATE ${appIcons})
 
 install(TARGETS ruqola ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+

src/core/CMakeLists.txt

@@ -509,6 +509,8 @@ target_sources(libruqolacore PRIVATE
     servererrorinfohistorymanager.cpp
     servererrorinfohistorymanager.h
 
+
+
     localdatabase/localmessagelogger.cpp
     localdatabase/localmessagelogger.h
 
@@ -526,10 +528,13 @@ target_sources(libruqolacore PRIVATE
 
     localdatabase/localdatabasebase.h
     localdatabase/localdatabasebase.cpp
-
+    
     localdatabase/localaccountdatabase.h
     localdatabase/localaccountdatabase.cpp
 
+    localdatabase/e2ekeystore.h
+    localdatabase/e2ekeystore.cpp
+
     localdatabase/globaldatabase.h
     localdatabase/globaldatabase.cpp
 

src/core/autotests/CMakeLists.txt

@@ -1,4 +1,5 @@
-# SPDX-FileCopyrightText: 2020-2025 Laurent Montel <montel@kde.org>
+# SPDX-FileCopyrightText: 2020-2025 Laurent Montel <montel@kde.org>, 
+# SPDX-FileCopyrightText: 2025 Andro Ranogajec <ranogaet@gmail.com>
 # SPDX-License-Identifier: BSD-3-Clause
 add_definitions(-DRUQOLA_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
 add_definitions(-DRUQOLA_BINARY_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data")
@@ -167,6 +168,38 @@ add_ruqola_test(textconvertertest.cpp)
 if(USE_E2E_SUPPORT)
     add_ruqola_test(encryptionutilstest.cpp)
     add_ruqola_test(masterkeytest.cpp)
+    add_ruqola_test(rsapairtest.cpp)
+    add_ruqola_test(sessionkeytest.cpp)
+    add_ruqola_test(messageencryptiondecryptiontest.cpp)
+    add_ruqola_test(uploaddownloadrsakeypairtest.cpp)
+    add_ruqola_test(sessionkeydistributiontest.cpp)
+
+
+target_sources(sessionkeydistributiontest PRIVATE
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest/loginmanager.cpp
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest/envutils.cpp
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest/uploaddownloadrsakeypair.cpp
+)
+
+target_include_directories(sessionkeydistributiontest PRIVATE
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest
+     ${CMAKE_SOURCE_DIR}/src/core/encryption)
+
+target_include_directories(uploaddownloadrsakeypairtest PRIVATE
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest
+    ${CMAKE_SOURCE_DIR}/src/core/encryption
+    ${CMAKE_SOURCE_DIR}/src/rocketchatrestapi-qt
+    ${CMAKE_SOURCE_DIR}/src/rocketchatrestapi-qt/e2e
+    ${CMAKE_BINARY_DIR}/src/core     
+    ${CMAKE_BINARY_DIR}/src/rocketchatrestapi-qt 
+)
+
+target_sources(uploaddownloadrsakeypairtest PRIVATE
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest/loginmanager.cpp
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest/uploaddownloadrsakeypair.cpp
+    ${CMAKE_SOURCE_DIR}/tests/encryptiontest/envutils.cpp
+)
+
 endif()
 
 add_ruqola_test(channelstest.cpp)
@@ -184,3 +217,4 @@ add_ruqola_test(actionbuttonsmanagertest.cpp)
 add_ruqola_test(previewcommandtest.cpp)
 add_ruqola_test(previewcommandutilstest.cpp)
 
+

src/core/autotests/masterkeytest.cpp

@@ -17,7 +17,12 @@ MasterKeyTest::MasterKeyTest(QObject *parent)
 /**
  * @brief This methods to going to test the determinism of the master key.
  *
+ * n, n1 = salt
+ *
+ * m1, m2 = password
+ *
  * if
+ *
  * n == n1 and m == m1
  * then
  * getMasterKey(n, m) == getMasterKey(n1, m1)

src/core/autotests/messageencryptiondecryptiontest.cpp

@@ -0,0 +1,41 @@
+/*
+   SPDX-FileCopyrightText: 2025 Andro Ranogajec <ranogaet@gmail.com>
+
+   SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#include "messageencryptiondecryptiontest.h"
+#include "encryption/encryptionutils.h"
+#include <QTest>
+
+QTEST_GUILESS_MAIN(MessageEncryptionDecryptionTest)
+MessageEncryptionDecryptionTest::MessageEncryptionDecryptionTest(QObject *parent)
+    : QObject(parent)
+{
+}
+
+/**
+ * @brief Tests symmetric encryption and decryption of a message using a session key.
+ *
+ * Verifies that for a message `m` and session key `k`, decryption function `D`
+ * and encryption function `E` the property holds:
+ *
+ *     `D(E(m, k), k) = m`
+ */
+void MessageEncryptionDecryptionTest::messageEncryptionDecryptionTest()
+{
+    auto message = QStringLiteral("This is GSoC 2025, Andro Ranogajec got to the end of 'Phase 1' :)");
+    const QByteArray sessionKey1 = EncryptionUtils::generateSessionKey();
+    const QByteArray sessionKey2 = EncryptionUtils::generateSessionKey();
+    QString decryptedMessage = QString::fromUtf8(EncryptionUtils::decryptMessage(EncryptionUtils::encryptMessage(message.toUtf8(), sessionKey1), sessionKey1));
+    QVERIFY(message == decryptedMessage);
+
+    for (int i = 1; i <= 10; ++i) {
+        QByteArray message = EncryptionUtils::generateRandomText(i).toUtf8();
+        QByteArray encrypted = EncryptionUtils::encryptMessage(message, sessionKey1);
+        QByteArray decryptedWithWrongKey = EncryptionUtils::decryptMessage(encrypted, sessionKey2);
+        QVERIFY(decryptedWithWrongKey.isEmpty() && decryptedWithWrongKey != message);
+    }
+}
+
+#include "moc_messageencryptiondecryptiontest.cpp"

src/core/autotests/messageencryptiondecryptiontest.h

@@ -0,0 +1,20 @@
+/*
+   SPDX-FileCopyrightText: 2025 Andro Ranogajec <ranogaet@gmail.com>
+
+   SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#pragma once
+
+#include <QObject>
+
+class MessageEncryptionDecryptionTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit MessageEncryptionDecryptionTest(QObject *parent = nullptr);
+    ~MessageEncryptionDecryptionTest() override = default;
+
+private Q_SLOTS:
+    void messageEncryptionDecryptionTest();
+};

src/core/autotests/rsapairtest.cpp

@@ -0,0 +1,70 @@
+/*
+   SPDX-FileCopyrightText: 2025 Andro Ranogajec <ranogaet@gmail.com>
+
+   SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#include "rsapairtest.h"
+#include "encryption/encryptionutils.h"
+#include <QTest>
+
+QTEST_GUILESS_MAIN(RsaPairTest)
+RsaPairTest::RsaPairTest(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void RsaPairTest::rsaPairGenerationNonDeterminismTest()
+{
+    EncryptionUtils::RSAKeyPair rsaPair1;
+    EncryptionUtils::RSAKeyPair rsaPair2;
+
+    for (int i = 0; i <= 10; i++) {
+        rsaPair1 = EncryptionUtils::generateRSAKey();
+        rsaPair2 = EncryptionUtils::generateRSAKey();
+        QVERIFY(rsaPair1.publicKey != rsaPair2.publicKey);
+        QVERIFY(rsaPair1.privateKey != rsaPair2.privateKey);
+    }
+}
+
+/**
+ * @brief Tests the determinism of private key encryption and decryption using the master key.
+ *
+ * Definitions:
+ *   - x = master key
+ *
+ *   - y = initial private key
+ *
+ *   - z = encrypt(x, y) = encrypted private key
+ *
+ *   - w = decrypt(x, z) = decrypted private key
+ *
+ * The test verifies:
+ *
+ *   If the same master key x and private key y are used,
+ *     then decrypting the encrypted key yields the original key:
+ *
+ *   - decrypt(x, encrypt(x, y)) = y = initial private key
+ *
+ *   In other words, w = y iff x and y are unchanged.
+ */
+void RsaPairTest::encryptDecryptDeterminismTest()
+{
+    EncryptionUtils::RSAKeyPair rsaPair;
+    QByteArray privateKey;
+    QByteArray masterKey;
+    QByteArray encryptedPrivateKey;
+    QByteArray decryptedPrivateKey;
+
+    for (int i = 0; i <= 10; i++) {
+        rsaPair = EncryptionUtils::generateRSAKey();
+        privateKey = rsaPair.privateKey;
+        masterKey = EncryptionUtils::getMasterKey(EncryptionUtils::generateRandomText(32), EncryptionUtils::generateRandomText(32));
+        encryptedPrivateKey = EncryptionUtils::encryptPrivateKey(rsaPair.privateKey, masterKey);
+        decryptedPrivateKey = EncryptionUtils::decryptPrivateKey(encryptedPrivateKey, masterKey);
+
+        QVERIFY(decryptedPrivateKey == privateKey);
+    }
+}
+
+#include "moc_rsapairtest.cpp"

src/core/autotests/rsapairtest.h

@@ -0,0 +1,22 @@
+
+/*
+   SPDX-FileCopyrightText: 2025 Andro Ranogajec <ranogaet@gmail.com>
+
+   SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#pragma once
+
+#include <QObject>
+
+class RsaPairTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit RsaPairTest(QObject *parent = nullptr);
+    ~RsaPairTest() override = default;
+
+private Q_SLOTS:
+    void rsaPairGenerationNonDeterminismTest();
+    void encryptDecryptDeterminismTest();
+};