1
0
mirror of https://github.com/anope/anope.git synced 2026-07-01 05:36:38 +02:00

Improve sending email.

- Use consistent line endings as expected by the email spec.
- Don't require admins to escape . at the start of lines.
- Log the reason why sending email fails.
This commit is contained in:
Sadie Powell
2024-03-18 11:57:08 +00:00
parent 9ac4da0489
commit 60083834f8
3 changed files with 14 additions and 10 deletions
+1 -1
View File
@@ -950,7 +950,7 @@ mail
* If you are running on Windows you should use a Windows sendmail port
* like https://www.glob.com.au/sendmail/ for sending emails.
*/
sendmailpath = "/usr/sbin/sendmail -t"
sendmailpath = "/usr/sbin/sendmail -it"
/*
* This is the email address from which all the emails are to be sent from.
+1 -1
View File
@@ -26,6 +26,7 @@ namespace Mail
: public Thread
{
private:
Anope::string error;
Anope::string sendmail_path;
Anope::string send_from;
Anope::string mail_to;
@@ -35,7 +36,6 @@ namespace Mail
Anope::string content_type;
bool dont_quote_addresses;
bool success = false;
public:
/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
* @param sf Config->SendFrom
+12 -8
View File
@@ -28,18 +28,18 @@ Mail::Message::Message(const Anope::string &sf, const Anope::string &mailto, con
Mail::Message::~Message()
{
if (success)
if (error.empty())
Log(LOG_NORMAL, "mail") << "Successfully delivered mail for " << mail_to << " (" << addr << ")";
else
Log(LOG_NORMAL, "mail") << "Error delivering mail for " << mail_to << " (" << addr << ")";
Log(LOG_NORMAL, "mail") << "Error delivering mail for " << mail_to << " (" << addr << "): " << error;
}
void Mail::Message::Run()
{
FILE *pipe = popen(sendmail_path.c_str(), "w");
auto *pipe = popen(sendmail_path.c_str(), "w");
if (!pipe)
{
error = strerror(errno);
SetExitState();
return;
}
@@ -53,12 +53,16 @@ void Mail::Message::Run()
fprintf(pipe, "Content-Type: %s\r\n", content_type.c_str());
fprintf(pipe, "Content-Transfer-Encoding: 8bit\r\n");
fprintf(pipe, "\r\n");
fprintf(pipe, "%s", message.c_str());
fprintf(pipe, "\r\n.\r\n");
pclose(pipe);
std::stringstream stream(message.str());
for (Anope::string line; std::getline(stream, line.str()); )
fprintf(pipe, "%s\r\n", line.c_str());
fprintf(pipe, "\r\n");
auto result = pclose(pipe);
if (result > 0)
error = "Sendmail exited with code " + Anope::ToString(result);
success = true;
SetExitState();
}