More tests

3 files changed, 86 insertions, 5 deletions

diff --git a/lib/crypto/e2ee.h b/lib/crypto/e2ee.h
index 73dd7f65..2d280185 100644
--- a/lib/crypto/e2ee.h
+++ b/lib/crypto/e2ee.h
@@ -7,10 +7,13 @@
 
 #include <optional>
 #include <string>
+#include "converters.h"
 #include <variant>
 
 #include <QMap>
+#include <QHash>
 #include <QStringList>
+#include <QMetaType>
 
 #include "util.h"
 
@@ -68,16 +71,56 @@ struct OneTimeKeys
 };
 
 //! Struct representing the signed one-time keys.
-struct SignedOneTimeKey
+class SignedOneTimeKey
 {
+public:
+    SignedOneTimeKey() = default;
+    SignedOneTimeKey(const SignedOneTimeKey &) = default;
+    SignedOneTimeKey &operator=(const SignedOneTimeKey &) = default;
     //! Required. The unpadded Base64-encoded 32-byte Curve25519 public key.
     QString key;
 
     //! Required. Signatures of the key object.
     //! The signature is calculated using the process described at Signing JSON.
-    QMap<QString, QMap<QString, QString>> signatures;
+    QHash<QString, QHash<QString, QString>> signatures;
+};
+
+
+template <>
+struct JsonObjectConverter<SignedOneTimeKey> {
+    static void fillFrom(const QJsonObject& jo,
+                         SignedOneTimeKey& result)
+    {
+        fromJson(jo.value("key"_ls), result.key);
+        fromJson(jo.value("signatures"_ls), result.signatures);
+    }
+
+    static void dumpTo(QJsonObject &jo, const SignedOneTimeKey &result)
+    {
+        addParam<>(jo, QStringLiteral("key"), result.key);
+        addParam<>(jo, QStringLiteral("signatures"), result.signatures);
+    }
 };
 
 bool operator==(const IdentityKeys& lhs, const IdentityKeys& rhs);
 
+template <typename T>
+class asKeyValueRange
+{
+public:
+    asKeyValueRange(T &data)
+        : m_data{data}
+    {
+    }
+
+    auto begin() { return m_data.keyValueBegin(); }
+
+    auto end() { return m_data.keyValueEnd(); }
+
+private:
+    T &m_data;
+};
+
 } // namespace Quotient
+
+Q_DECLARE_METATYPE(Quotient::SignedOneTimeKey)
diff --git a/lib/crypto/qolmaccount.cpp b/lib/crypto/qolmaccount.cpp
index 76b0a263..fb91c906 100644
--- a/lib/crypto/qolmaccount.cpp
+++ b/lib/crypto/qolmaccount.cpp
@@ -4,6 +4,8 @@
 
 #ifdef Quotient_E2EE_ENABLED
 #include "qolmaccount.h"
+#include "connection.h"
+#include "csapi/keys.h"
 #include "crypto/qolmutils.h"
 #include <QJsonObject>
 #include <QJsonDocument>
@@ -138,7 +140,7 @@ size_t QOlmAccount::maxNumberOfOneTimeKeys() const
     return olm_account_max_number_of_one_time_keys(m_account);
 }
 
-void QOlmAccount::generateOneTimeKeys(size_t numberOfKeys) const
+size_t QOlmAccount::generateOneTimeKeys(size_t numberOfKeys) const
 {
     const size_t randomLen = olm_account_generate_one_time_keys_random_length(m_account, numberOfKeys);
     QByteArray randomBuffer = getRandom(randomLen);
@@ -147,6 +149,7 @@ void QOlmAccount::generateOneTimeKeys(size_t numberOfKeys) const
     if (error == olm_error()) {
         throw lastError(m_account);
     }
+    return error;
 }
 
 OneTimeKeys QOlmAccount::oneTimeKeys() const
@@ -212,6 +215,37 @@ OlmAccount *Quotient::QOlmAccount::data()
     return m_account;
 }
 
+UploadKeysJob *QOlmAccount::createUploadKeyRequest(const OneTimeKeys &oneTimeKeys)
+{
+
+    DeviceKeys deviceKeys;
+    deviceKeys.userId = m_userId;
+    deviceKeys.deviceId = m_deviceId;
+    deviceKeys.algorithms = QStringList {"m.olm.v1.curve25519-aes-sha2", "m.megolm.v1.aes-sha2"};
+
+    const auto idKeys = identityKeys();
+    deviceKeys.keys["curve25519:" + m_deviceId] = idKeys.curve25519;
+    deviceKeys.keys["ed25519:" + m_deviceId] = idKeys.ed25519;
+
+    const auto sign = signIdentityKeys();
+    deviceKeys.signatures[m_userId]["ed25519:" + m_deviceId] = sign;
+
+    if (oneTimeKeys.curve25519().isEmpty()) {
+        return new UploadKeysJob(deviceKeys);
+    }
+
+    // Sign & append the one time keys.
+    auto temp = signOneTimeKeys(oneTimeKeys);
+    QHash<QString, QVariant> oneTimeKeysSigned;
+    for (const auto &[keyId, key] : asKeyValueRange(temp)) {
+        QVariant keyVar;
+        keyVar.setValue(key);
+        oneTimeKeysSigned[keyId] = keyVar;
+    }
+
+    return new UploadKeysJob(deviceKeys, oneTimeKeysSigned);
+}
+
 std::variant<std::unique_ptr<QOlmSession>, QOlmError> QOlmAccount::createInboundSession(const QOlmMessage &preKeyMessage)
 {
     Q_ASSERT(preKeyMessage.type() == QOlmMessage::PreKey);
diff --git a/lib/crypto/qolmaccount.h b/lib/crypto/qolmaccount.h
index 4398214a..d61c8748 100644
--- a/lib/crypto/qolmaccount.h
+++ b/lib/crypto/qolmaccount.h
@@ -4,6 +4,7 @@
 #pragma once
 #ifdef Quotient_E2EE_ENABLED
 
+#include "csapi/keys.h"
 #include "crypto/e2ee.h"
 #include "crypto/qolmerrors.h"
 #include "crypto/qolmmessage.h"
@@ -15,6 +16,7 @@ struct OlmAccount;
 namespace Quotient {
 
 class QOlmSession;
+class Connection;
 
 //! An olm account manages all cryptographic keys used on a device.
 //! \code{.cpp}
@@ -55,7 +57,7 @@ public:
     size_t maxNumberOfOneTimeKeys() const;
 
     //! Generates the supplied number of one time keys.
-    void generateOneTimeKeys(size_t numberOfKeys) const;
+    size_t generateOneTimeKeys(size_t numberOfKeys) const;
 
     //! Gets the OlmAccount's one time keys formatted as JSON.
     OneTimeKeys oneTimeKeys() const;
@@ -68,6 +70,8 @@ public:
 
     SignedOneTimeKey signedOneTimeKey(const QByteArray &key, const QString &signature) const;
 
+    UploadKeysJob *createUploadKeyRequest(const OneTimeKeys &oneTimeKeys);
+
     //! Remove the one time key used to create the supplied session.
     [[nodiscard]] std::optional<QOlmError> removeOneTimeKeys(const std::unique_ptr<QOlmSession> &session) const;
 
@@ -90,7 +94,7 @@ public:
     QOlmAccount(OlmAccount *account);
     OlmAccount *data();
 private:
-    OlmAccount *m_account = nullptr;
+    OlmAccount *m_account = nullptr; // owning
     QString m_userId;
     QString m_deviceId;
 };