Encode UTF-8 subjects and attachment names properly (#2207).

diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index f906f5a8b320917515fef25db9ad343b0f575c09..e21bbfe2d6ae94ecd988590a8b7eedf936158e10 100644 (file)
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -143,7 +143,7 @@ Emailer::send (string server, int port, EmailProtocol protocol, string user, str
                        "Content-Type: multipart/mixed; boundary=" + boundary + "\r\n";
        }
 
-       _email += "Subject: " + _subject + "\r\n"
+       _email += "Subject: " + encode_rfc1342(_subject) + "\r\n"
                "User-Agent: DCP-o-matic\r\n"
                "\r\n";
 
@@ -156,9 +156,9 @@ Emailer::send (string server, int port, EmailProtocol protocol, string user, str
 
        for (auto i: _attachments) {
                _email += "\r\n\r\n--" + boundary + "\r\n"
-                       "Content-Type: " + i.mime_type + "; name=" + i.name + "\r\n"
+                       "Content-Type: " + i.mime_type + "; name=" + encode_rfc1342(i.name) + "\r\n"
                        "Content-Transfer-Encoding: Base64\r\n"
-                       "Content-Disposition: attachment; filename=" + i.name + "\r\n\r\n";
+                       "Content-Disposition: attachment; filename=" + encode_rfc1342(i.name) + "\r\n\r\n";
 
                auto b64 = BIO_new (BIO_f_base64());
                if (!b64) {
@@ -270,3 +270,31 @@ Emailer::debug (CURL *, curl_infotype type, char* data, size_t size)
        }
        return 0;
 }
+
+
+string
+Emailer::encode_rfc1342 (string subject)
+{
+       auto b64 = BIO_new(BIO_f_base64());
+       if (!b64) {
+               throw std::bad_alloc();
+       }
+
+       auto bio = BIO_new(BIO_s_mem());
+       if (!bio) {
+               throw std::bad_alloc();
+       }
+
+       bio = BIO_push(b64, bio);
+       BIO_write(bio, subject.c_str(), subject.length());
+       (void) BIO_flush(bio);
+
+       char* out;
+       long int bytes = BIO_get_mem_data(bio, &out);
+       string base64_subject(out, bytes);
+       BIO_free_all(b64);
+
+       boost::algorithm::replace_all(base64_subject, "\n", "");
+       return "=?utf-8?B?" + base64_subject + "?=";
+}
+

diff --git a/src/lib/emailer.h b/src/lib/emailer.h
index fa278e535447eb675d0a7767ecec7112a1765073..ef41b032063b863d5230bad876c431806438500e 100644 (file)
--- a/src/lib/emailer.h
+++ b/src/lib/emailer.h
@@ -51,6 +51,7 @@ public:
 private:
 
        std::string fix (std::string s) const;
+       static std::string encode_rfc1342 (std::string subject);
 
        std::string _from;
        std::list<std::string> _to;