Merge #568: Add autotest for key verification and fix several edge-cases

4 files changed, 94 insertions, 20 deletions

diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index c11901bf..48edb168 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -19,4 +19,5 @@ if(${PROJECT_NAME}_ENABLE_E2EE)
     quotient_add_test(NAME testolmsession)
     quotient_add_test(NAME testolmutility)
     quotient_add_test(NAME testfilecrypto)
+    quotient_add_test(NAME testkeyverification)
 endif()
diff --git a/autotests/testkeyverification.cpp b/autotests/testkeyverification.cpp
new file mode 100644
index 00000000..1fa6d8c6
--- /dev/null
+++ b/autotests/testkeyverification.cpp
@@ -0,0 +1,59 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+
+#include <QTest>
+#include "testutils.h"
+#include <qt_connection_util.h>
+
+class TestKeyVerificationSession : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void testVerification()
+    {
+        CREATE_CONNECTION(a, "alice1", "secret", "AliceDesktop")
+        CREATE_CONNECTION(b, "alice1", "secret", "AlicePhone")
+
+        QPointer<KeyVerificationSession> aSession{};
+        connect(a.get(), &Connection::newKeyVerificationSession, this, [&](KeyVerificationSession* session) {
+            aSession = session;
+            QVERIFY(session->remoteDeviceId() == b->deviceId());
+            QVERIFY(session->state() == KeyVerificationSession::WAITINGFORREADY);
+            connectSingleShot(session, &KeyVerificationSession::stateChanged, this, [=](){
+                QVERIFY(session->state() == KeyVerificationSession::ACCEPTED || session->state() == KeyVerificationSession::READY);
+                connectSingleShot(session, &KeyVerificationSession::stateChanged, this, [=](){
+                    QVERIFY(session->state() == KeyVerificationSession::WAITINGFORVERIFICATION);
+                    session->sendMac();
+                });
+            });
+        });
+        a->startKeyVerificationSession(b->deviceId());
+        connect(b.get(), &Connection::newKeyVerificationSession, this, [=](KeyVerificationSession* session) {
+            QVERIFY(session->remoteDeviceId() == a->deviceId());
+            QVERIFY(session->state() == KeyVerificationSession::INCOMING);
+            session->sendReady();
+            // KeyVerificationSession::READY is skipped because we have only one method
+            QVERIFY(session->state() == KeyVerificationSession::WAITINGFORACCEPT);
+            connectSingleShot(session, &KeyVerificationSession::stateChanged, this, [=](){
+                QVERIFY(session->state() == KeyVerificationSession::WAITINGFORKEY || session->state() == KeyVerificationSession::ACCEPTED);
+                connectSingleShot(session, &KeyVerificationSession::stateChanged, this, [=]() {
+                    QVERIFY(session->state() == KeyVerificationSession::WAITINGFORVERIFICATION);
+                    QVERIFY(aSession);
+                    QVERIFY(aSession->sasEmojis() == session->sasEmojis());
+                    session->sendMac();
+                    QVERIFY(session->state() == KeyVerificationSession::WAITINGFORMAC);
+                });
+            });
+
+        });
+        b->syncLoop();
+        a->syncLoop();
+        QSignalSpy spy(aSession, &KeyVerificationSession::finished);
+        spy.wait(10000);
+    }
+};
+QTEST_GUILESS_MAIN(TestKeyVerificationSession)
+#include "testkeyverification.moc"
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 4b32393d..280705d0 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -14,6 +14,8 @@
 #include <networkaccessmanager.h>
 #include <room.h>
 
+#include "testutils.h"
+
 using namespace Quotient;
 
 void TestOlmAccount::pickleUnpickledTest()
@@ -168,26 +170,6 @@ void TestOlmAccount::encryptedFile()
     QCOMPARE(file.key.kty, "oct");
 }
 
-#define CREATE_CONNECTION(VAR, USERNAME, SECRET, DEVICE_NAME)                  \
-    NetworkAccessManager::instance()->ignoreSslErrors(true);                   \
-    auto VAR = std::make_shared<Connection>();                                 \
-    (VAR)->resolveServer("@" USERNAME ":localhost:1234");                      \
-    connect((VAR).get(), &Connection::loginFlowsChanged, this, [=] {           \
-        (VAR)->loginWithPassword((USERNAME), SECRET, DEVICE_NAME, "");         \
-    });                                                                        \
-    connect((VAR).get(), &Connection::networkError, [](const QString& error) { \
-        QWARN(qUtf8Printable(error));                                          \
-        QFAIL("Network error: make sure synapse is running");                  \
-    });                                                                        \
-    connect((VAR).get(), &Connection::loginError, [](const QString& error) {   \
-        QWARN(qUtf8Printable(error));                                          \
-        QFAIL("Login failed");                                                 \
-    });                                                                        \
-    QSignalSpy spy##VAR((VAR).get(), &Connection::loginFlowsChanged);          \
-    QSignalSpy spy2##VAR((VAR).get(), &Connection::connected);                 \
-    QVERIFY(spy##VAR.wait(10000));                                             \
-    QVERIFY(spy2##VAR.wait(10000));
-
 void TestOlmAccount::uploadIdentityKey()
 {
     CREATE_CONNECTION(conn, "alice1", "secret", "AlicePhone")
diff --git a/autotests/testutils.h b/autotests/testutils.h
new file mode 100644
index 00000000..7d016a34
--- /dev/null
+++ b/autotests/testutils.h
@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <connection.h>
+#include <networkaccessmanager.h>
+
+#include <QtTest/QSignalSpy>
+
+using namespace Quotient;
+
+#define CREATE_CONNECTION(VAR, USERNAME, SECRET, DEVICE_NAME)                  \
+    NetworkAccessManager::instance()->ignoreSslErrors(true);                   \
+    auto VAR = std::make_shared<Connection>();                                 \
+    (VAR)->resolveServer("@" USERNAME ":localhost:1234");                      \
+    connect((VAR).get(), &Connection::loginFlowsChanged, this, [=] {           \
+        (VAR)->loginWithPassword((USERNAME), SECRET, DEVICE_NAME, "");         \
+    });                                                                        \
+    connect((VAR).get(), &Connection::networkError, [](const QString& error) { \
+        QWARN(qUtf8Printable(error));                                          \
+        QFAIL("Network error: make sure synapse is running");                  \
+    });                                                                        \
+    connect((VAR).get(), &Connection::loginError, [](const QString& error) {   \
+        QWARN(qUtf8Printable(error));                                          \
+        QFAIL("Login failed");                                                 \
+    });                                                                        \
+    QSignalSpy spy##VAR((VAR).get(), &Connection::loginFlowsChanged);          \
+    QSignalSpy spy2##VAR((VAR).get(), &Connection::connected);                 \
+    QVERIFY(spy##VAR.wait(10000));                                             \
+    QVERIFY(spy2##VAR.wait(10000));