New upstream version 0.7.0

1 files changed, 128 insertions, 0 deletions

diff --git a/autotests/testolmutility.cpp b/autotests/testolmutility.cpp
new file mode 100644
index 00000000..4de5afdf
--- /dev/null
+++ b/autotests/testolmutility.cpp
@@ -0,0 +1,128 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "testolmutility.h"
+#include "e2ee/qolmaccount.h"
+#include "e2ee/qolmutility.h"
+
+#include <olm/olm.h>
+
+using namespace Quotient;
+
+void TestOlmUtility::canonicalJSON()
+{
+    // Examples taken from
+    // https://matrix.org/docs/spec/appendices.html#canonical-json
+    auto data = QJsonDocument::fromJson(QByteArrayLiteral(R"({
+    "auth": {
+      "success": true,
+      "mxid": "@john.doe:example.com",
+      "profile": {
+        "display_name": "John Doe",
+        "three_pids": [{
+          "medium": "email",
+          "address": "john.doe@example.org"
+        }, {
+          "medium": "msisdn",
+          "address": "123456789"
+        }]
+      }}})"));
+
+    QCOMPARE(data.toJson(QJsonDocument::Compact),
+      "{\"auth\":{\"mxid\":\"@john.doe:example.com\",\"profile\":{\"display_name\":\"John "
+      "Doe\",\"three_pids\":[{\"address\":\"john.doe@example.org\",\"medium\":\"email\"},{"
+      "\"address\":\"123456789\",\"medium\":\"msisdn\"}]},\"success\":true}}");
+
+    auto data0 = QJsonDocument::fromJson(QByteArrayLiteral(R"({"b":"2","a":"1"})"));
+    QCOMPARE(data0.toJson(QJsonDocument::Compact), "{\"a\":\"1\",\"b\":\"2\"}");
+
+    auto data1 = QJsonDocument::fromJson(QByteArrayLiteral(R"({ "本": 2, "日": 1 })"));
+    QCOMPARE(data1.toJson(QJsonDocument::Compact), "{\"日\":1,\"本\":2}");
+
+    auto data2 = QJsonDocument::fromJson(QByteArrayLiteral(R"({"a": "\u65E5"})"));
+    QCOMPARE(data2.toJson(QJsonDocument::Compact), "{\"a\":\"日\"}");
+
+    auto data3 = QJsonDocument::fromJson(QByteArrayLiteral(R"({ "a": null })"));
+    QCOMPARE(data3.toJson(QJsonDocument::Compact), "{\"a\":null}");
+}
+
+void TestOlmUtility::verifySignedOneTimeKey()
+{
+    QOlmAccount aliceOlm { u"@alice:matrix.org", u"aliceDevice" };
+    aliceOlm.createNewAccount();
+    aliceOlm.generateOneTimeKeys(1);
+    auto keys = aliceOlm.oneTimeKeys();
+
+    auto firstKey = *keys.curve25519().begin();
+    auto msgObj = QJsonObject({{"key", firstKey}});
+    auto sig = aliceOlm.sign(msgObj);
+
+    auto msg = QJsonDocument(msgObj).toJson(QJsonDocument::Compact);
+
+    auto utilityBuf = new uint8_t[olm_utility_size()];
+    auto utility = olm_utility(utilityBuf);
+
+
+    QByteArray signatureBuf1(sig.length(), '\0');
+    std::copy(sig.begin(), sig.end(), signatureBuf1.begin());
+
+    auto res =
+        olm_ed25519_verify(utility, aliceOlm.identityKeys().ed25519.data(),
+                           aliceOlm.identityKeys().ed25519.size(), msg.data(),
+                           msg.size(), sig.data(), sig.size());
+
+    QCOMPARE(std::string(olm_utility_last_error(utility)), "SUCCESS");
+    QCOMPARE(res, 0);
+
+    delete[](reinterpret_cast<uint8_t *>(utility));
+
+    QOlmUtility utility2;
+    auto res2 = utility2.ed25519Verify(aliceOlm.identityKeys().ed25519, msg,
+                                       signatureBuf1);
+
+    //QCOMPARE(std::string(olm_utility_last_error(utility)), "SUCCESS");
+    QVERIFY(res2);
+}
+
+void TestOlmUtility::validUploadKeysRequest()
+{
+    const auto userId = QStringLiteral("@alice:matrix.org");
+    const auto deviceId = QStringLiteral("FKALSOCCC");
+
+    QOlmAccount alice { userId, deviceId };
+    alice.createNewAccount();
+    alice.generateOneTimeKeys(1);
+
+    auto idSig = alice.signIdentityKeys();
+
+    QJsonObject body
+    {
+        {"algorithms", QJsonArray{"m.olm.v1.curve25519-aes-sha2", "m.megolm.v1.aes-sha2"}},
+        {"user_id", userId},
+        {"device_id", deviceId},
+        {"keys",
+            QJsonObject{
+                {QStringLiteral("curve25519:") + deviceId, QString::fromUtf8(alice.identityKeys().curve25519)},
+                {QStringLiteral("ed25519:") + deviceId, QString::fromUtf8(alice.identityKeys().ed25519)}
+            }
+        },
+        {"signatures",
+            QJsonObject{
+                {userId,
+                    QJsonObject{
+                        {"ed25519:" + deviceId, QString::fromUtf8(idSig)}
+                    }
+                }
+            }
+        }
+    };
+
+    DeviceKeys deviceKeys = alice.deviceKeys();
+    QCOMPARE(QJsonDocument(toJson(deviceKeys)).toJson(QJsonDocument::Compact),
+            QJsonDocument(body).toJson(QJsonDocument::Compact));
+
+    QVERIFY(verifyIdentitySignature(fromJson<DeviceKeys>(body), deviceId, userId));
+    QVERIFY(verifyIdentitySignature(deviceKeys, deviceId, userId));
+}
+QTEST_GUILESS_MAIN(TestOlmUtility)