X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=6ef23c3e0c03a3e20cd241df9453dddfea8501aa;hp=ceb26caf6ae15e12ea1c42cb93e1d9e358812647;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=ceb0456d3dd141ec9ac4ddb99f42b0df390d1c6e

diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index ceb26caf6..6ef23c3e0 100644
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "compose.hpp"
 #include "config.h"
 #include "emailer.h"
@@ -25,17 +26,18 @@
 #include <curl/curl.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/c_local_time_adjustor.hpp>
-#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
-using std::string;
-using std::min;
-using std::list;
+
 using std::cout;
+using std::list;
+using std::min;
 using std::pair;
-using boost::shared_ptr;
-using dcp::Data;
+using std::shared_ptr;
+using std::string;
+using dcp::ArrayData;
+
 
 Emailer::Emailer (string from, list<string> to, string subject, string body)
 	: _from (from)
@@ -47,6 +49,7 @@ Emailer::Emailer (string from, list<string> 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<Emailer*>(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<Emailer*>(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[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));
+	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<boost::posix_time::ptime>::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());
+	auto const utc_now = boost::posix_time::second_clock::universal_time ();
+	auto const local_now = boost::date_time::c_local_adjustor<boost::posix_time::ptime>::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";
@@ -144,19 +154,19 @@ 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-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;
@@ -172,12 +182,17 @@ 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");
 	}
 
-	curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtp://%1:%2", server.c_str(), 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 (!user.empty ()) {
 		curl_easy_setopt (curl, CURLOPT_USERNAME, user.c_str ());
@@ -188,14 +203,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());
 	}
 
@@ -205,16 +220,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 (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);
@@ -222,17 +239,19 @@ Emailer::send (string server, int port, string user, string password)
 	curl_global_cleanup ();
 }
 
+
 string
 Emailer::address_list (list<string> 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)
 {