fix: Error 554 5.0.0: failed to create parser: unexpected EOF. Issue #43

Author: jeremydumais

.gitignore

@@ -16,4 +16,5 @@ Session.vim
 .vimspector.json
 .ccls-cache
 .idea
-cmake-build-debug
+cmake-build-debug
+compile_commands.json

src/attachment.cpp

@@ -1,9 +1,13 @@
 #include "attachment.h"
+#include <algorithm>
 #include <cstdint>
+#include <fstream>
 #include <ios>
 #include <iostream>
 #include <limits>
+#include <sstream>
 #include <string>
+#include "base64.h"
 #include "stringutils.h"
 
 using namespace jed_utils;
@@ -141,8 +145,10 @@ const char *Attachment::getBase64EncodedFile() const {
             in.read(&contents[0], static_cast<std::streamsize>(contents.size()));
             in.close();
             std::string base64_result = Base64::Encode(reinterpret_cast<const unsigned char*>(contents.c_str()), contents.length());
-            auto *base64_file = new char[base64_result.length() + 1];
-            strncpy(base64_file, base64_result.c_str(), base64_result.length() + 1);
+            // Make sure that the line length are limited to 76 chars (RFC5322)
+            std::string base64Wrapped = wrap_rfc5322(base64_result);
+            auto *base64_file = new char[base64Wrapped.length() + 1];
+            strncpy(base64_file, base64Wrapped.c_str(), base64Wrapped.length() + 1);
             return base64_file;
         }
         in.close();
@@ -328,3 +334,18 @@ const char *Attachment::getMimeType() const {
 
     return "";
 }
+
+std::string Attachment::wrap_rfc5322(const std::string& input,
+                                     size_t max_line_length) const {
+    std::ostringstream wrapped;
+    size_t pos = 0;
+
+    while (pos < input.size()) {
+        size_t len = std::min(max_line_length, input.size() - pos);
+    wrapped.write(&input[pos], static_cast<int64_t>(len));
+        wrapped << "\r\n";
+        pos += len;
+    }
+
+    return wrapped.str();
+}

src/attachment.h

@@ -2,8 +2,7 @@
 #define ATTACHMENT_H
 
 #include <cstring>
-#include <fstream>
-#include "base64.h"
+#include <string>
 
 #ifdef _WIN32
     #ifdef SMTPCLIENT_STATIC
@@ -71,6 +70,8 @@ class ATTACHMENT_API Attachment {
     char *mName;
     char *mFilename;
     char *mContentId;
+    std::string wrap_rfc5322(const std::string& input,
+                             size_t max_line_length = 76) const;
 };
 }  // namespace jed_utils
 

src/smtpclientbase.cpp

@@ -961,7 +961,6 @@ int SMTPClientBase::setMailBody(const Message &pMsg) {
     std::ostringstream body_ss;
     body_ss << "--sep\r\nContent-Type: " << pMsg.getMimeType() << "; charset=UTF-8\r\n\r\n" << pMsg.getBody() << "\r\n";
     std::string body_real = body_ss.str();
-    addCommunicationLogItem(body_real.c_str());
 
     // If there's attachments, prepare the attachments text content
     Attachment** arr_attachment = pMsg.getAttachments();
@@ -982,18 +981,21 @@ int SMTPClientBase::setMailBody(const Message &pMsg) {
             }
             int body_part_ret_code = (*this.*sendCommandPtr)(body_real.substr(index_start, length).c_str(), CLIENT_SENDMAIL_BODYPART_ERROR);
             if (body_part_ret_code != 0) {
+                addCommunicationLogItem(body_real.c_str());
                 return body_part_ret_code;
             }
         }
     } else {
         int body_ret_code = (*this.*sendCommandPtr)(body_real.c_str(), CLIENT_SENDMAIL_BODY_ERROR);
         if (body_ret_code != 0) {
+            addCommunicationLogItem(body_real.c_str());
             return body_ret_code;
         }
     }
+    addCommunicationLogItem(body_real.c_str());
 
     // End of data
-    std::string end_data_command { "\r\n.\r\n" };
+    std::string end_data_command { "\r\n--sep--\r\n.\r\n" };
     addCommunicationLogItem(end_data_command.c_str());
     int end_data_ret_code = (*this.*sendCommandWithFeedbackPtr)(end_data_command.c_str(), CLIENT_SENDMAIL_END_DATA_ERROR, CLIENT_SENDMAIL_END_DATA_TIMEOUT);
     if (end_data_ret_code != STATUS_CODE_REQUESTED_MAIL_ACTION_OK_OR_COMPLETED) {
@@ -1061,7 +1063,7 @@ std::string SMTPClientBase::createAttachmentsText(const std::vector<Attachment*>
             delete[] b64;
         }
     }
-    retval += "\r\n--sep--";
+    retval += "\r\n";
     return retval;
 }