X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=6ef23c3e0c03a3e20cd241df9453dddfea8501aa;hp=2d4cf3976ba1334b62c3628abd75d94ef498d5ad;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=3541f0b68d087998c9f73863f5b7ec7f7ed59523 diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index 2d4cf3976..6ef23c3e0 100644 --- a/src/lib/emailer.cc +++ b/src/lib/emailer.cc @@ -1,65 +1,78 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ + #include "compose.hpp" -#include "job.h" -#include "data.h" #include "config.h" #include "emailer.h" #include "exceptions.h" #include #include #include -#include #include "i18n.h" -using std::string; -using std::stringstream; -using std::min; -using std::list; + using std::cout; +using std::list; +using std::min; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +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"); + } + +string +Emailer::fix (string s) const +{ + boost::algorithm::replace_all (s, "\n", "\r\n"); + boost::algorithm::replace_all (s, "\0", " "); + 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) { @@ -70,51 +83,53 @@ 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) { size_t const t = min (_email.length() - _offset, size * nmemb); - memcpy (ptr, _email.substr(_offset, size * nmemb).c_str(), size * nmemb); + memcpy (ptr, _email.substr (_offset, t).c_str(), t); _offset += t; return t; } + void -Emailer::send (shared_ptr job) +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()); + strftime (date_buffer, sizeof(date_buffer), "%a, %d %b %Y %H:%M:%S ", localtime(&now)); - stringstream email; + 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: " << 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); + if (!_cc.empty()) { + _email += "Cc: " + address_list(_cc) + "\r\n"; } - if (!_bcc.empty ()) { - email << "Bcc: " << address_list (_bcc); + if (!_bcc.empty()) { + _email += "Bcc: " + address_list(_bcc) + "\r\n"; } string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; @@ -124,79 +139,78 @@ Emailer::send (shared_ptr job) } 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()); + auto b64 = BIO_new (BIO_f_base64()); - BIO* bio = BIO_new (BIO_s_mem()); + auto 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 (); + auto curl = curl_easy_init (); if (!curl) { throw NetworkError ("Could not initialise libcurl"); } - curl_easy_setopt (curl, CURLOPT_URL, String::compose ( - "smtp://%1:%2", - Config::instance()->mail_server().c_str(), - Config::instance()->mail_port() - ).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()); + } - if (!Config::instance()->mail_user().empty ()) { - curl_easy_setopt (curl, CURLOPT_USERNAME, Config::instance()->mail_user().c_str()); + if (!user.empty ()) { + curl_easy_setopt (curl, CURLOPT_USERNAME, user.c_str ()); } - if (!Config::instance()->mail_password().empty ()) { - curl_easy_setopt (curl, CURLOPT_PASSWORD, Config::instance()->mail_password().c_str()); + if (!password.empty ()) { + curl_easy_setopt (curl, CURLOPT_PASSWORD, password.c_str()); } 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()); } @@ -206,16 +220,18 @@ Emailer::send (shared_ptr job) 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 (String::compose (_("Failed to send KDM email (%1)"), curl_easy_strerror (r))); + throw KDMError (_("Failed to send email"), curl_easy_strerror (r)); } curl_slist_free_all (recipients); @@ -223,17 +239,19 @@ Emailer::send (shared_ptr job) curl_global_cleanup (); } + string Emailer::address_list (list 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) {