X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=c4637ff0da387747d39ea49af604e8e85a8355e1;hp=71b29db1e06acb42c0fc359ced67bd589197bfee;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=422be0eece2bf6ee80db1d3c21553cd82efff789 diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index 71b29db1e..c4637ff0d 100644 --- a/src/lib/emailer.cc +++ b/src/lib/emailer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -25,7 +25,6 @@ #include #include #include -#include #include "i18n.h" @@ -34,18 +33,25 @@ using std::min; using std::list; using std::cout; using std::pair; -using boost::shared_ptr; -using dcp::Data; +using std::shared_ptr; +using dcp::ArrayData; Emailer::Emailer (string from, list to, string subject, string body) : _from (from) , _to (to) , _subject (subject) - , _body (body) + , _body (fix (body)) , _offset (0) { - boost::algorithm::replace_all (_body, "\n", "\r\n"); - boost::algorithm::replace_all (_body, "\0", " "); + +} + +string +Emailer::fix (string s) const +{ + boost::algorithm::replace_all (s, "\n", "\r\n"); + boost::algorithm::replace_all (s, "\0", " "); + return s; } void @@ -92,29 +98,27 @@ Emailer::get_data (void* ptr, size_t size, size_t nmemb) } 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[32]; + char date_buffer[128]; time_t now = time (0); 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; - sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), abs (offset.hours()), offset.minutes()); + sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), int(abs(offset.hours())), int(offset.minutes())); - locked_stringstream email; - - email << "Date: " << date_buffer << "\r\n" - << "To: " << address_list (_to) << "\r\n" - << "From: " << _from << "\r\n"; + _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"; + _email += "Cc: " + address_list (_cc) + "\r\n"; } if (!_bcc.empty ()) { - email << "Bcc: " << address_list (_bcc) << "\r\n"; + _email += "Bcc: " + address_list (_bcc) + "\r\n"; } string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; @@ -124,49 +128,47 @@ Emailer::send (string server, int port, string user, string password) } if (!_attachments.empty ()) { - email << "MIME-Version: 1.0\r\n" - << "Content-Type: multipart/mixed; boundary=" << boundary << "\r\n"; + _email += "MIME-Version: 1.0\r\n" + "Content-Type: multipart/mixed; boundary=" + boundary + "\r\n"; } - email << "Subject: " << _subject << "\r\n" - << "User-Agent: DCP-o-matic\r\n" - << "\r\n"; + _email += "Subject: " + _subject + "\r\n" + "User-Agent: DCP-o-matic\r\n" + "\r\n"; if (!_attachments.empty ()) { - email << "--" << boundary << "\r\n" - << "Content-Type: text/plain; charset=utf-8\r\n\r\n"; + _email += "--" + boundary + "\r\n" + + "Content-Type: text/plain; charset=utf-8\r\n\r\n"; } - email << _body; + _email += _body; - BOOST_FOREACH (Attachment i, _attachments) { - email << "\r\n\r\n--" << boundary << "\r\n" - << "Content-Type: " << i.mime_type << "; name=" << i.name << "\r\n" - << "Content-Transfer-Encoding: Base64\r\n" - << "Content-Disposition: attachment; filename=" << i.name << "\r\n\r\n"; + for (auto i: _attachments) { + _email += "\r\n\r\n--" + boundary + "\r\n" + "Content-Type: " + i.mime_type + "; name=" + i.name + "\r\n" + "Content-Transfer-Encoding: Base64\r\n" + "Content-Disposition: attachment; filename=" + i.name + "\r\n\r\n"; BIO* b64 = BIO_new (BIO_f_base64()); BIO* bio = BIO_new (BIO_s_mem()); 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; long int bytes = BIO_get_mem_data (bio, &out); - email << string (out, bytes); + _email += fix (string (out, bytes)); BIO_free_all (b64); } if (!_attachments.empty ()) { - email << "\r\n--" << boundary << "--\r\n"; + _email += "\r\n--" + boundary + "--\r\n"; } - _email = email.str (); - curl_global_init (CURL_GLOBAL_DEFAULT); CURL* curl = curl_easy_init (); @@ -174,7 +176,12 @@ Emailer::send (string server, int port, string user, string password) throw NetworkError ("Could not initialise libcurl"); } - curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtp://%1:%2", server.c_str(), port).c_str()); + if ((protocol == EMAIL_PROTOCOL_AUTO && port == 465) || protocol == EMAIL_PROTOCOL_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()); + } if (!user.empty ()) { curl_easy_setopt (curl, CURLOPT_USERNAME, user.c_str ()); @@ -186,13 +193,13 @@ 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) { + 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()); } @@ -202,7 +209,9 @@ 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 == EMAIL_PROTOCOL_AUTO || protocol == EMAIL_PROTOCOL_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); @@ -211,7 +220,7 @@ Emailer::send (string server, int port, string user, string password) CURLcode const r = curl_easy_perform (curl); if (r != CURLE_OK) { - throw KDMError (String::compose (_("Failed to send email (%1)"), curl_easy_strerror (r))); + throw KDMError (_("Failed to send email"), curl_easy_strerror (r)); } curl_slist_free_all (recipients); @@ -223,7 +232,7 @@ string Emailer::address_list (list addresses) { string o; - BOOST_FOREACH (string i, addresses) { + for (auto i: addresses) { o += i + ", "; }