aboutsummaryrefslogtreecommitdiff
path: root/autotests/testolmaccount.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'autotests/testolmaccount.cpp')
-rw-r--r--autotests/testolmaccount.cpp136
1 files changed, 61 insertions, 75 deletions
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 9989665a..4b32393d 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -10,7 +10,7 @@
#include <e2ee/qolmaccount.h>
#include <e2ee/qolmutility.h>
#include <events/encryptionevent.h>
-#include <events/encryptedfile.h>
+#include <events/filesourceinfo.h>
#include <networkaccessmanager.h>
#include <room.h>
@@ -21,7 +21,7 @@ void TestOlmAccount::pickleUnpickledTest()
QOlmAccount olmAccount(QStringLiteral("@foo:bar.com"), QStringLiteral("QuotientTestDevice"));
olmAccount.createNewAccount();
auto identityKeys = olmAccount.identityKeys();
- auto pickled = std::get<QByteArray>(olmAccount.pickle(Unencrypted{}));
+ auto pickled = olmAccount.pickle(Unencrypted{}).value();
QOlmAccount olmAccount2(QStringLiteral("@foo:bar.com"), QStringLiteral("QuotientTestDevice"));
olmAccount2.unpickle(pickled, Unencrypted{});
auto identityKeys2 = olmAccount2.identityKeys();
@@ -57,8 +57,7 @@ void TestOlmAccount::signatureValid()
const auto identityKeys = olmAccount.identityKeys();
const auto ed25519Key = identityKeys.ed25519;
const auto verify = utility.ed25519Verify(ed25519Key, message, signature);
- QVERIFY(std::holds_alternative<bool>(verify));
- QVERIFY(std::get<bool>(verify) == true);
+ QVERIFY(verify.value_or(false));
}
void TestOlmAccount::oneTimeKeysValid()
@@ -157,8 +156,7 @@ void TestOlmAccount::encryptedFile()
"sha256": "fdSLu/YkRx3Wyh3KQabP3rd6+SFiKg5lsJZQHtkSAYA"
}})");
- EncryptedFile file;
- JsonObjectConverter<EncryptedFile>::fillFrom(doc.object(), file);
+ const auto file = fromJson<EncryptedFileMetadata>(doc);
QCOMPARE(file.v, "v2");
QCOMPARE(file.iv, "w+sE15fzSc0AAAAAAAAAAA");
@@ -199,13 +197,16 @@ void TestOlmAccount::uploadIdentityKey()
QVERIFY(idKeys.curve25519.size() > 10);
- OneTimeKeys unused;
+ UnsignedOneTimeKeys unused;
auto request = olmAccount->createUploadKeyRequest(unused);
connect(request, &BaseJob::result, this, [request, conn] {
- QCOMPARE(request->oneTimeKeyCounts().size(), 0);
- });
- connect(request, &BaseJob::failure, this, [] {
- QFAIL("upload failed");
+ if (!request->status().good())
+ QFAIL("upload failed");
+ const auto& oneTimeKeyCounts = request->oneTimeKeyCounts();
+ // Allow the response to have entries with zero counts
+ QCOMPARE(std::accumulate(oneTimeKeyCounts.begin(),
+ oneTimeKeyCounts.end(), 0),
+ 0);
});
conn->run(request);
QSignalSpy spy3(request, &BaseJob::result);
@@ -222,19 +223,17 @@ void TestOlmAccount::uploadOneTimeKeys()
auto oneTimeKeys = olmAccount->oneTimeKeys();
- QHash<QString, QVariant> oneTimeKeysHash;
+ OneTimeKeys oneTimeKeysHash;
const auto curve = oneTimeKeys.curve25519();
for (const auto &[keyId, key] : asKeyValueRange(curve)) {
oneTimeKeysHash["curve25519:"+keyId] = key;
}
auto request = new UploadKeysJob(none, oneTimeKeysHash);
connect(request, &BaseJob::result, this, [request, conn] {
- QCOMPARE(request->oneTimeKeyCounts().size(), 1);
+ if (!request->status().good())
+ QFAIL("upload failed");
QCOMPARE(request->oneTimeKeyCounts().value(Curve25519Key), 5);
});
- connect(request, &BaseJob::failure, this, [] {
- QFAIL("upload failed");
- });
conn->run(request);
QSignalSpy spy3(request, &BaseJob::result);
QVERIFY(spy3.wait(10000));
@@ -248,21 +247,17 @@ void TestOlmAccount::uploadSignedOneTimeKeys()
QCOMPARE(nKeys, 5);
auto oneTimeKeys = olmAccount->oneTimeKeys();
- QHash<QString, QVariant> oneTimeKeysHash;
+ OneTimeKeys oneTimeKeysHash;
const auto signedKey = olmAccount->signOneTimeKeys(oneTimeKeys);
for (const auto &[keyId, key] : asKeyValueRange(signedKey)) {
- QVariant var;
- var.setValue(key);
- oneTimeKeysHash[keyId] = var;
+ oneTimeKeysHash[keyId] = key;
}
auto request = new UploadKeysJob(none, oneTimeKeysHash);
connect(request, &BaseJob::result, this, [request, nKeys, conn] {
- QCOMPARE(request->oneTimeKeyCounts().size(), 1);
+ if (!request->status().good())
+ QFAIL("upload failed");
QCOMPARE(request->oneTimeKeyCounts().value(SignedCurve25519Key), nKeys);
});
- connect(request, &BaseJob::failure, this, [] {
- QFAIL("upload failed");
- });
conn->run(request);
QSignalSpy spy3(request, &BaseJob::result);
QVERIFY(spy3.wait(10000));
@@ -277,12 +272,10 @@ void TestOlmAccount::uploadKeys()
auto otks = olmAccount->oneTimeKeys();
auto request = olmAccount->createUploadKeyRequest(otks);
connect(request, &BaseJob::result, this, [request, conn] {
- QCOMPARE(request->oneTimeKeyCounts().size(), 1);
+ if (!request->status().good())
+ QFAIL("upload failed");
QCOMPARE(request->oneTimeKeyCounts().value(SignedCurve25519Key), 1);
});
- connect(request, &BaseJob::failure, this, [] {
- QFAIL("upload failed");
- });
conn->run(request);
QSignalSpy spy3(request, &BaseJob::result);
QVERIFY(spy3.wait(10000));
@@ -298,7 +291,6 @@ void TestOlmAccount::queryTest()
aliceOlm->generateOneTimeKeys(1);
auto aliceRes = aliceOlm->createUploadKeyRequest(aliceOlm->oneTimeKeys());
connect(aliceRes, &BaseJob::result, this, [aliceRes] {
- QCOMPARE(aliceRes->oneTimeKeyCounts().size(), 1);
QCOMPARE(aliceRes->oneTimeKeyCounts().value(SignedCurve25519Key), 1);
});
QSignalSpy spy(aliceRes, &BaseJob::result);
@@ -309,7 +301,6 @@ void TestOlmAccount::queryTest()
bobOlm->generateOneTimeKeys(1);
auto bobRes = bobOlm->createUploadKeyRequest(aliceOlm->oneTimeKeys());
connect(bobRes, &BaseJob::result, this, [bobRes] {
- QCOMPARE(bobRes->oneTimeKeyCounts().size(), 1);
QCOMPARE(bobRes->oneTimeKeyCounts().value(SignedCurve25519Key), 1);
});
QSignalSpy spy1(bobRes, &BaseJob::result);
@@ -369,7 +360,6 @@ void TestOlmAccount::claimKeys()
auto request = bobOlm->createUploadKeyRequest(bobOlm->oneTimeKeys());
connect(request, &BaseJob::result, this, [request, bob] {
- QCOMPARE(request->oneTimeKeyCounts().size(), 1);
QCOMPARE(request->oneTimeKeyCounts().value(SignedCurve25519Key), 1);
});
bob->run(request);
@@ -380,47 +370,47 @@ void TestOlmAccount::claimKeys()
// Alice retrieves bob's keys & claims one signed one-time key.
QHash<QString, QStringList> deviceKeys;
deviceKeys[bob->userId()] = QStringList();
- auto job = alice->callApi<QueryKeysJob>(deviceKeys);
- connect(job, &BaseJob::result, this, [bob, alice, job, this] {
- const auto& bobDevices = job->deviceKeys().value(bob->userId());
- QVERIFY(!bobDevices.empty());
-
- // Retrieve the identity key for the current device.
- const auto& bobEd25519 =
- bobDevices.value(bob->deviceId()).keys["ed25519:" + bob->deviceId()];
-
- const auto currentDevice = bobDevices[bob->deviceId()];
-
- // Verify signature.
- QVERIFY(verifyIdentitySignature(currentDevice, bob->deviceId(),
- bob->userId()));
-
- QHash<QString, QHash<QString, QString>> oneTimeKeys;
- oneTimeKeys[bob->userId()] = QHash<QString, QString>();
- oneTimeKeys[bob->userId()][bob->deviceId()] = SignedCurve25519Key;
-
- auto job = alice->callApi<ClaimKeysJob>(oneTimeKeys);
- connect(job, &BaseJob::result, this, [bob, bobEd25519, job] {
- const auto userId = bob->userId();
- const auto deviceId = bob->deviceId();
-
- // The device exists.
- QCOMPARE(job->oneTimeKeys().size(), 1);
- QCOMPARE(job->oneTimeKeys().value(userId).size(), 1);
-
- // The key is the one bob sent.
- const auto& oneTimeKey =
- job->oneTimeKeys().value(userId).value(deviceId);
- QVERIFY(oneTimeKey.canConvert<QVariantMap>());
-
- const auto varMap = oneTimeKey.toMap();
- QVERIFY(std::any_of(varMap.constKeyValueBegin(),
- varMap.constKeyValueEnd(), [](const auto& kv) {
- return kv.first.startsWith(
- SignedCurve25519Key);
- }));
- });
+ auto queryKeysJob = alice->callApi<QueryKeysJob>(deviceKeys);
+ QSignalSpy requestSpy2(queryKeysJob, &BaseJob::result);
+ QVERIFY(requestSpy2.wait(10000));
+
+ const auto& bobDevices = queryKeysJob->deviceKeys().value(bob->userId());
+ QVERIFY(!bobDevices.empty());
+
+ const auto currentDevice = bobDevices[bob->deviceId()];
+
+ // Verify signature.
+ QVERIFY(verifyIdentitySignature(currentDevice, bob->deviceId(),
+ bob->userId()));
+ // Retrieve the identity key for the current device.
+ const auto& bobEd25519 =
+ bobDevices.value(bob->deviceId()).keys["ed25519:" + bob->deviceId()];
+
+ QHash<QString, QHash<QString, QString>> oneTimeKeys;
+ oneTimeKeys[bob->userId()] = QHash<QString, QString>();
+ oneTimeKeys[bob->userId()][bob->deviceId()] = SignedCurve25519Key;
+
+ auto claimKeysJob = alice->callApi<ClaimKeysJob>(oneTimeKeys);
+ connect(claimKeysJob, &BaseJob::result, this, [bob, bobEd25519, claimKeysJob] {
+ const auto userId = bob->userId();
+ const auto deviceId = bob->deviceId();
+
+ // The device exists.
+ QCOMPARE(claimKeysJob->oneTimeKeys().size(), 1);
+ QCOMPARE(claimKeysJob->oneTimeKeys().value(userId).size(), 1);
+
+ // The key is the one bob sent.
+ const auto& oneTimeKeys =
+ claimKeysJob->oneTimeKeys().value(userId).value(deviceId);
+ for (auto it = oneTimeKeys.begin(); it != oneTimeKeys.end(); ++it) {
+ if (it.key().startsWith(SignedCurve25519Key)
+ && std::holds_alternative<SignedOneTimeKey>(it.value()))
+ return;
+ }
+ QFAIL("The claimed one time key is not in /claim response");
});
+ QSignalSpy completionSpy(claimKeysJob, &BaseJob::result);
+ QVERIFY(completionSpy.wait(10000));
}
void TestOlmAccount::claimMultipleKeys()
@@ -435,7 +425,6 @@ void TestOlmAccount::claimMultipleKeys()
auto res = olm->createUploadKeyRequest(olm->oneTimeKeys());
QSignalSpy spy(res, &BaseJob::result);
connect(res, &BaseJob::result, this, [res] {
- QCOMPARE(res->oneTimeKeyCounts().size(), 1);
QCOMPARE(res->oneTimeKeyCounts().value(SignedCurve25519Key), 10);
});
alice->run(res);
@@ -446,7 +435,6 @@ void TestOlmAccount::claimMultipleKeys()
auto res1 = olm1->createUploadKeyRequest(olm1->oneTimeKeys());
QSignalSpy spy1(res1, &BaseJob::result);
connect(res1, &BaseJob::result, this, [res1] {
- QCOMPARE(res1->oneTimeKeyCounts().size(), 1);
QCOMPARE(res1->oneTimeKeyCounts().value(SignedCurve25519Key), 10);
});
alice1->run(res1);
@@ -457,7 +445,6 @@ void TestOlmAccount::claimMultipleKeys()
auto res2 = olm2->createUploadKeyRequest(olm2->oneTimeKeys());
QSignalSpy spy2(res2, &BaseJob::result);
connect(res2, &BaseJob::result, this, [res2] {
- QCOMPARE(res2->oneTimeKeyCounts().size(), 1);
QCOMPARE(res2->oneTimeKeyCounts().value(SignedCurve25519Key), 10);
});
alice2->run(res2);
@@ -481,7 +468,6 @@ void TestOlmAccount::claimMultipleKeys()
QVERIFY(jobSpy.wait(10000));
const auto userId = alice->userId();
- QCOMPARE(job->oneTimeKeys().size(), 1);
QCOMPARE(job->oneTimeKeys().value(userId).size(), 3);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-03 20:30:41 +0000