3 files changed, 61 insertions, 51 deletions

diff --git a/framework/src/domain/mime/mailcrypto.cpp b/framework/src/domain/mime/mailcrypto.cpp
index 83ce293a..4e20c84b 100644
--- a/framework/src/domain/mime/mailcrypto.cpp
+++ b/framework/src/domain/mime/mailcrypto.cpp
@@ -142,18 +142,19 @@ Expected<GpgME::Error, QByteArray> exportPublicKey(const GpgME::Key &key)
  *
  * Used by the `createSignedEmail` and `createEncryptedEmail` functions.
  */
-Expected<GpgME::Error, KMime::Content *> appendPublicKey(KMime::Content *msg, const GpgME::Key &key)
+Expected<GpgME::Error, std::unique_ptr<KMime::Content>>
+appendPublicKey(std::unique_ptr<KMime::Content> msg, const GpgME::Key &key)
 {
     const auto publicKeyExportResult = exportPublicKey(key);
 
-    if(!publicKeyExportResult) {
+    if (!publicKeyExportResult) {
         // "Could not export public key"
         return makeUnexpected(publicKeyExportResult.error());
     }
 
     const auto publicKeyData = publicKeyExportResult.value();
 
-    auto result = new KMime::Content;
+    auto result = std::unique_ptr<KMime::Content>(new KMime::Content);
     result->contentType()->setMimeType("multipart/mixed");
     result->contentType()->setBoundary(KMime::multiPartBoundary());
 
@@ -166,13 +167,11 @@ Expected<GpgME::Error, KMime::Content *> appendPublicKey(KMime::Content *msg, co
     }
 
     msg->assemble();
-    qWarning() << "Msg:" << msg->encodedContent().constData();
 
-    result->addContent(msg);
+    result->addContent(msg.release());
     result->addContent(keyAttachment);
 
     result->assemble();
-    qDebug() << "Final message:\n" << result->encodedContent().constData();
 
     return result;
 }
@@ -193,8 +192,8 @@ Expected<GpgME::Error, QByteArray> encrypt(const QByteArray &content, const std:
     return resultData;
 }
 
-Expected<GpgME::Error, QByteArray> signAndEncrypt(const QByteArray &content, const std::vector<GpgME::Key> &signingKeys,
-    const std::vector<GpgME::Key> &encryptionKeys)
+Expected<GpgME::Error, QByteArray> signAndEncrypt(const QByteArray &content,
+    const std::vector<GpgME::Key> &signingKeys, const std::vector<GpgME::Key> &encryptionKeys)
 {
     QByteArray resultData;
 
@@ -216,7 +215,7 @@ Expected<GpgME::Error, QByteArray> signAndEncrypt(const QByteArray &content, con
 }
 
 /**
- * Create a message like this (according to RFC 3156 Section 4):
+ * Create a message part like this (according to RFC 3156 Section 4):
  *
  * - multipart/encrypted
  *   - application/pgp-encrypted (version information)
@@ -227,9 +226,9 @@ Expected<GpgME::Error, QByteArray> signAndEncrypt(const QByteArray &content, con
  *
  * The encrypted data can be generated by the `encrypt` or `signAndEncrypt` functions.
  */
-KMime::Content *createEncryptedPart(QByteArray encryptedData)
+std::unique_ptr<KMime::Content> createEncryptedPart(QByteArray encryptedData)
 {
-    KMime::Content *result = new KMime::Content;
+    auto result = std::unique_ptr<KMime::Content>(new KMime::Content);
 
     result->contentType()->setMimeType("multipart/encrypted");
     result->contentType()->setBoundary(KMime::multiPartBoundary());
@@ -276,7 +275,7 @@ KMime::Content *createEncryptedPart(QByteArray encryptedData)
  *   - `application/pgp-keys` (the public key as attachment, which is the first of the
  *     `signingKeys`)
  */
-Expected<GpgME::Error, KMime::Content *>
+Expected<GpgME::Error, std::unique_ptr<KMime::Content>>
 createEncryptedEmail(KMime::Content *content, const std::vector<GpgME::Key> &encryptionKeys,
     const GpgME::Key &attachedKey, const std::vector<GpgME::Key> &signingKeys = {})
 {
@@ -290,21 +289,23 @@ createEncryptedEmail(KMime::Content *content, const std::vector<GpgME::Key> &enc
         return makeUnexpected(encryptionResult.error());
     }
 
-    auto encryptedData = encryptionResult.value();
+    auto encryptedPart = createEncryptedPart(encryptionResult.value());
 
-    KMime::Content *encryptedPart = createEncryptedPart(encryptedData);
+    auto publicKeyAppendResult = appendPublicKey(std::move(encryptedPart), attachedKey);
 
-    auto publicKeyAppendResult = appendPublicKey(encryptedPart, attachedKey);
-
-    // TODO: this is ugly
-    if (!publicKeyAppendResult) {
-        delete encryptedPart;
+    if(publicKeyAppendResult) {
+        publicKeyAppendResult.value()->assemble();
     }
 
     return publicKeyAppendResult;
 }
 
-Expected<GpgME::Error, QByteArray> sign(const QByteArray &content, const std::vector<GpgME::Key> &signingKeys)
+/**
+ * Sign the given content and returns the signing data and the algorithm used
+ * for integrity check in the "pgp-<algorithm>" format.
+ */
+Expected<GpgME::Error, std::pair<QByteArray, QString>>
+sign(const QByteArray &content, const std::vector<GpgME::Key> &signingKeys)
 {
     QByteArray resultData;
 
@@ -317,11 +318,17 @@ Expected<GpgME::Error, QByteArray> sign(const QByteArray &content, const std::ve
         return makeUnexpected(result.error());
     }
 
-    return resultData;
+    auto algo = result.createdSignature(0).hashAlgorithmAsString();
+    // RFC 3156 Section 5:
+    // Hash-symbols are constructed [...] by converting the text name to lower
+    // case and prefixing it with the four characters "pgp-".
+    auto micAlg = (QString("pgp-") + algo).toLower();
+
+    return std::pair<QByteArray, QString>{resultData, micAlg};
 }
 
 /**
- * Create a message like this (according to RFC 3156 Section 5):
+ * Create a message part like this (according to RFC 3156 Section 5):
  *
  * + `multipart/signed`
  *   - whatever the given original `message` is (should be canonicalized)
@@ -332,16 +339,17 @@ Expected<GpgME::Error, QByteArray> sign(const QByteArray &content, const std::ve
  *
  * The signature can be generated by the `sign` function.
  */
-KMime::Content *createSignedPart(KMime::Content *message, const QByteArray &signature, const QString &micAlg)
+std::unique_ptr<KMime::Content> createSignedPart(
+    std::unique_ptr<KMime::Content> message, const QByteArray &signature, const QString &micAlg)
 {
-    KMime::Content *result = new KMime::Content;
+    auto result = std::unique_ptr<KMime::Content>(new KMime::Content);
 
     result->contentType()->setMimeType("multipart/signed");
     result->contentType()->setBoundary(KMime::multiPartBoundary());
     result->contentType()->setParameter("micalg", micAlg);
     result->contentType()->setParameter("protocol", "application/pgp-signature");
 
-    result->addContent(message);
+    result->addContent(message.release());
 
     KMime::Content *signedPartPart = new KMime::Content;
     {
@@ -371,12 +379,13 @@ KMime::Content *createSignedPart(KMime::Content *message, const QByteArray &sign
  *   - `application/pgp-keys` (the public key as attachment, which is the first of the
  *     `signingKeys`)
  */
-Expected<GpgME::Error, KMime::Content *> createSignedEmail(KMime::Content *content,
+Expected<GpgME::Error, std::unique_ptr<KMime::Content>>
+createSignedEmail(std::unique_ptr<KMime::Content> content,
     const std::vector<GpgME::Key> &signingKeys, const GpgME::Key &attachedKey)
 {
     Q_ASSERT(!signingKeys.empty());
 
-    auto contentToSign = canonicalizeContent(content);
+    auto contentToSign = canonicalizeContent(content.get());
 
     auto signingResult = sign(contentToSign, signingKeys);
 
@@ -384,33 +393,29 @@ Expected<GpgME::Error, KMime::Content *> createSignedEmail(KMime::Content *conte
         return makeUnexpected(signingResult.error());
     }
 
-    auto signedData = signingResult.value();
+    QByteArray signingData;
+    QString micAlg;
+    std::tie(signingData, micAlg) = signingResult.value();
 
-    KMime::Content *signedPart = createSignedPart(content, signedData, "TODO: pgp-something");
+    auto signedPart = createSignedPart(std::move(content), signingData, micAlg);
 
-    auto publicKeyAppendResult = appendPublicKey(signedPart, attachedKey);
+    auto publicKeyAppendResult = appendPublicKey(std::move(signedPart), attachedKey);
 
-    // TODO: this is ugly (maybe use a std::unique_ptr for signedPart)
-    if (!publicKeyAppendResult) {
-        delete signedPart;
+    if (publicKeyAppendResult) {
+        publicKeyAppendResult.value()->assemble();
     }
 
     return publicKeyAppendResult;
 }
 
-KMime::Content *MailCrypto::processCrypto(KMime::Content *content,
-    const std::vector<GpgME::Key> &signingKeys, const std::vector<GpgME::Key> &encryptionKeys,
-    const GpgME::Key &attachedKey)
+Expected<GpgME::Error, std::unique_ptr<KMime::Content>>
+MailCrypto::processCrypto(std::unique_ptr<KMime::Content> content, const std::vector<GpgME::Key> &signingKeys,
+    const std::vector<GpgME::Key> &encryptionKeys, const GpgME::Key &attachedKey)
 {
-
-    qDebug() << "Attaching key:" << attachedKey.shortKeyID() << "from processCrypto";
-
-    if(!encryptionKeys.empty()) {
-        // TODO
-        return createEncryptedEmail(content, encryptionKeys, attachedKey, signingKeys).value();
-    } else if(!signingKeys.empty()) {
-        // TODO
-        return createSignedEmail(content, signingKeys, signingKeys[0]).value();
+    if (!encryptionKeys.empty()) {
+        return createEncryptedEmail(content.release(), encryptionKeys, attachedKey, signingKeys);
+    } else if (!signingKeys.empty()) {
+        return createSignedEmail(std::move(content), signingKeys, signingKeys[0]);
     } else {
         qWarning() << "Processing cryptography, but neither signing nor encrypting";
         return content;
diff --git a/framework/src/domain/mime/mailcrypto.h b/framework/src/domain/mime/mailcrypto.h
index 89343fc9..832f68ec 100644
--- a/framework/src/domain/mime/mailcrypto.h
+++ b/framework/src/domain/mime/mailcrypto.h
@@ -19,14 +19,20 @@
 
 #pragma once
 
+#include "framework/src/errors.h"
+
 #include <KMime/Message>
+#include <gpgme++/key.h>
+
 #include <QByteArray>
+
 #include <functional>
-#include <gpgme++/key.h>
+#include <memory>
 
 namespace MailCrypto {
 
-KMime::Content *processCrypto(KMime::Content *content, const std::vector<GpgME::Key> &signingKeys,
+Expected<GpgME::Error, std::unique_ptr<KMime::Content>>
+processCrypto(std::unique_ptr<KMime::Content> content, const std::vector<GpgME::Key> &signingKeys,
     const std::vector<GpgME::Key> &encryptionKeys, const GpgME::Key &attachedKey);
 
 std::vector<GpgME::Key> findKeys(const QStringList &filter, bool findPrivate = false, bool remote = false);
diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index 09932e86..997eb3ae 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -1093,13 +1093,12 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes
 
     QByteArray bodyData;
     if (!signingKeys.empty() || !encryptionKeys.empty()) {
-        auto result = MailCrypto::processCrypto(
-            bodyPart.get(), signingKeys, encryptionKeys, attachedKey);
+        auto result = MailCrypto::processCrypto(std::move(bodyPart), signingKeys, encryptionKeys, attachedKey);
         if (!result) {
-            qWarning() << "Signing failed";
+            qWarning() << "Crypto failed";
             return {};
         }
-        bodyData = result->encodedContent();
+        bodyData = result.value()->encodedContent();
     } else {
         if (!bodyPart->contentType(false)) {
             bodyPart->contentType(true)->setMimeType("text/plain");