X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=f580e3c56a64361a46229a13b8d0c9794ebe3884;hp=57b06ed616663cc05e4b2cecb38a2ad3d9e20567;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=5c9e39df078aab9f03ae186d0758d4d710f90bab diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index 57b06ed61..f580e3c56 100644 --- a/src/lib/emailer.cc +++ b/src/lib/emailer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "compose.hpp" #include "config.h" #include "emailer.h" @@ -25,19 +26,20 @@ #include #include #include -#include #include "i18n.h" -using std::string; -using std::min; -using std::list; + using std::cout; +using std::min; using std::pair; -using boost::shared_ptr; -using dcp::Data; +using std::shared_ptr; +using std::string; +using std::vector; +using dcp::ArrayData; -Emailer::Emailer (string from, list to, string subject, string body) + +Emailer::Emailer(string from, vector to, string subject, string body) : _from (from) , _to (to) , _subject (subject) @@ -47,6 +49,7 @@ Emailer::Emailer (string from, list to, string subject, string body) } + string Emailer::fix (string s) const { @@ -55,18 +58,21 @@ Emailer::fix (string s) const return s; } + void Emailer::add_cc (string cc) { _cc.push_back (cc); } + void Emailer::add_bcc (string bcc) { _bcc.push_back (bcc); } + void Emailer::add_attachment (boost::filesystem::path file, string name, string mime_type) { @@ -77,18 +83,21 @@ Emailer::add_attachment (boost::filesystem::path file, string name, string mime_ _attachments.push_back (a); } + static size_t curl_data_shim (void* ptr, size_t size, size_t nmemb, void* userp) { return reinterpret_cast(userp)->get_data (ptr, size, nmemb); } + static int curl_debug_shim (CURL* curl, curl_infotype type, char* data, size_t size, void* userp) { return reinterpret_cast(userp)->debug (curl, type, data, size); } + size_t Emailer::get_data (void* ptr, size_t size, size_t nmemb) { @@ -98,28 +107,29 @@ Emailer::get_data (void* ptr, size_t size, size_t nmemb) return t; } + void -Emailer::send (string server, int port, string user, string password) +Emailer::send (string server, int port, EmailProtocol protocol, string user, string password) { char date_buffer[128]; time_t now = time (0); - strftime (date_buffer, sizeof(date_buffer), "%a, %d %b %Y %H:%M:%S ", localtime (&now)); + strftime (date_buffer, sizeof(date_buffer), "%a, %d %b %Y %H:%M:%S ", localtime(&now)); - boost::posix_time::ptime const utc_now = boost::posix_time::second_clock::universal_time (); - boost::posix_time::ptime const local_now = boost::date_time::c_local_adjustor::utc_to_local (utc_now); - boost::posix_time::time_duration offset = local_now - utc_now; + auto const utc_now = boost::posix_time::second_clock::universal_time (); + auto const local_now = boost::date_time::c_local_adjustor::utc_to_local (utc_now); + auto offset = local_now - utc_now; sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), int(abs(offset.hours())), int(offset.minutes())); _email = "Date: " + string(date_buffer) + "\r\n" "To: " + address_list (_to) + "\r\n" "From: " + _from + "\r\n"; - if (!_cc.empty ()) { - _email += "Cc: " + address_list (_cc) + "\r\n"; + if (!_cc.empty()) { + _email += "Cc: " + address_list(_cc) + "\r\n"; } - if (!_bcc.empty ()) { - _email += "Bcc: " + address_list (_bcc) + "\r\n"; + if (!_bcc.empty()) { + _email += "Bcc: " + address_list(_bcc) + "\r\n"; } string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; @@ -133,7 +143,7 @@ Emailer::send (string server, int port, string user, string password) "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"; @@ -144,19 +154,25 @@ Emailer::send (string server, int port, string user, string password) _email += _body; - BOOST_FOREACH (Attachment i, _attachments) { + 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"; - BIO* b64 = BIO_new (BIO_f_base64()); + auto b64 = BIO_new (BIO_f_base64()); + if (!b64) { + throw std::bad_alloc(); + } - BIO* bio = BIO_new (BIO_s_mem()); + auto bio = BIO_new (BIO_s_mem()); + if (!bio) { + throw std::bad_alloc(); + } bio = BIO_push (b64, bio); - Data data (i.file); - BIO_write (bio, data.data().get(), data.size()); + ArrayData data (i.file); + BIO_write (bio, data.data(), data.size()); (void) BIO_flush (bio); char* out; @@ -172,16 +188,16 @@ Emailer::send (string server, int port, string user, string password) curl_global_init (CURL_GLOBAL_DEFAULT); - CURL* curl = curl_easy_init (); + auto curl = curl_easy_init (); if (!curl) { throw NetworkError ("Could not initialise libcurl"); } - if (port == 465) { - /* "Implicit TLS"; I think curl wants us to use smtps here */ - curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtps://%1:465", server).c_str()); + if ((protocol == EmailProtocol::AUTO && port == 465) || protocol == EmailProtocol::SSL) { + /* "SSL" or "Implicit TLS"; I think curl wants us to use smtps here */ + curl_easy_setopt (curl, CURLOPT_URL, String::compose("smtps://%1:%2", server, port).c_str()); } else { - curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtp://%1:%2", server, port).c_str()); + curl_easy_setopt (curl, CURLOPT_URL, String::compose("smtp://%1:%2", server, port).c_str()); } if (!user.empty ()) { @@ -193,14 +209,14 @@ Emailer::send (string server, int port, string user, string password) curl_easy_setopt (curl, CURLOPT_MAIL_FROM, _from.c_str()); - struct curl_slist* recipients = 0; - BOOST_FOREACH (string i, _to) { + struct curl_slist* recipients = nullptr; + for (auto i: _to) { recipients = curl_slist_append (recipients, i.c_str()); } - BOOST_FOREACH (string i, _cc) { + for (auto i: _cc) { recipients = curl_slist_append (recipients, i.c_str()); } - BOOST_FOREACH (string i, _bcc) { + for (auto i: _bcc) { recipients = curl_slist_append (recipients, i.c_str()); } @@ -210,16 +226,18 @@ Emailer::send (string server, int port, string user, string password) curl_easy_setopt (curl, CURLOPT_READDATA, this); curl_easy_setopt (curl, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (curl, CURLOPT_USE_SSL, (long) CURLUSESSL_TRY); + if (protocol == EmailProtocol::AUTO || protocol == EmailProtocol::STARTTLS) { + curl_easy_setopt (curl, CURLOPT_USE_SSL, (long) CURLUSESSL_TRY); + } curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0L); curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0L); curl_easy_setopt (curl, CURLOPT_VERBOSE, 1L); curl_easy_setopt (curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim); curl_easy_setopt (curl, CURLOPT_DEBUGDATA, this); - CURLcode const r = curl_easy_perform (curl); + auto const r = curl_easy_perform (curl); if (r != CURLE_OK) { - throw KDMError (_("Failed to send email"), curl_easy_strerror (r)); + throw NetworkError (_("Failed to send email"), string(curl_easy_strerror(r))); } curl_slist_free_all (recipients); @@ -227,17 +245,19 @@ Emailer::send (string server, int port, string user, string password) curl_global_cleanup (); } + string -Emailer::address_list (list addresses) +Emailer::address_list(vector addresses) { string o; - BOOST_FOREACH (string i, addresses) { + for (auto i: addresses) { o += i + ", "; } return o.substr (0, o.length() - 2); } + int Emailer::debug (CURL *, curl_infotype type, char* data, size_t size) { @@ -250,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 + "?="; +} +