Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

notify: sendmail: always send multi-part message

Browse Source 
Even if we don't have an HTML template available, we always
send an HTML part (the plain text part wrapped in <pre>) to
improve rendering in certain mail clients. This means
we can simply message formatting, since we do not have to
distinguish between single-part and multi-part messages.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2024-06-24 14:31:33 +02:00 committed by Thomas Lamprecht
parent b09ee57341
commit 296e2a2117
1 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
proxmox-notify/src/endpoints/sendmail.rs
View File

@ -140,8 +140,8 @@ impl Endpoint for SendmailEndpoint {
sendmail( sendmail(
&recipients_str, &recipients_str,
&subject, &subject,
Some(&text_part), &text_part,
Some(&html_part), &html_part,
&mailfrom, &mailfrom,
&author, &author,
) )
@ -173,8 +173,8 @@ impl Endpoint for SendmailEndpoint {
fn sendmail( fn sendmail(
mailto: &[&str], mailto: &[&str],
subject: &str, subject: &str,
text: Option<&str>, text: &str,
html: Option<&str>, html: &str,
mailfrom: &str, mailfrom: &str,
author: &str, author: &str,
) -> Result<(), Error> { ) -> Result<(), Error> {
@ -230,26 +230,20 @@ fn format_mail(
mailfrom: &str, mailfrom: &str,
author: &str, author: &str,
subject: &str, subject: &str,
text: Option<&str>, text: &str,
html: Option<&str>, html: &str,
timestamp: i64, timestamp: i64,
) -> Result<String, Error> { ) -> Result<String, Error> {
use std::fmt::Write as _; use std::fmt::Write as _;
let recipients = mailto.join(","); let recipients = mailto.join(",");
let mut is_multipart = false;
if let (Some(_), Some(_)) = (text, html) {
is_multipart = true;
}
let mut body = String::new(); let mut body = String::new();
let boundary = format!("----_=_NextPart_001_{}", timestamp); let boundary = format!("----_=_NextPart_001_{}", timestamp);
if is_multipart { body.push_str("Content-Type: multipart/alternative;\n");
body.push_str("Content-Type: multipart/alternative;\n"); let _ = writeln!(body, "\tboundary=\"{}\"", boundary);
let _ = writeln!(body, "\tboundary=\"{}\"", boundary); body.push_str("MIME-Version: 1.0\n");
body.push_str("MIME-Version: 1.0\n");
} else if !subject.is_ascii() {
body.push_str("MIME-Version: 1.0\n");
}
if !subject.is_ascii() { if !subject.is_ascii() {
let _ = writeln!(body, "Subject: =?utf-8?B?{}?=", base64::encode(subject)); let _ = writeln!(body, "Subject: =?utf-8?B?{}?=", base64::encode(subject));
} else { } else {
@ -261,31 +255,21 @@ fn format_mail(
.map_err(|err| Error::Generic(format!("failed to format time: {err}")))?; .map_err(|err| Error::Generic(format!("failed to format time: {err}")))?;
let _ = writeln!(body, "Date: {}", rfc2822_date); let _ = writeln!(body, "Date: {}", rfc2822_date);
body.push_str("Auto-Submitted: auto-generated;\n"); body.push_str("Auto-Submitted: auto-generated;\n");
if is_multipart { body.push('\n');
body.push('\n'); body.push_str("This is a multi-part message in MIME format.\n");
body.push_str("This is a multi-part message in MIME format.\n"); let _ = write!(body, "\n--{}\n", boundary);
let _ = write!(body, "\n--{}\n", boundary); body.push_str("Content-Type: text/plain;\n");
} body.push_str("\tcharset=\"UTF-8\"\n");
if let Some(text) = text { body.push_str("Content-Transfer-Encoding: 8bit\n");
body.push_str("Content-Type: text/plain;\n"); body.push('\n');
body.push_str("\tcharset=\"UTF-8\"\n"); body.push_str(text);
body.push_str("Content-Transfer-Encoding: 8bit\n"); let _ = write!(body, "\n--{}\n", boundary);
body.push('\n'); body.push_str("Content-Type: text/html;\n");
body.push_str(text); body.push_str("\tcharset=\"UTF-8\"\n");
if is_multipart { body.push_str("Content-Transfer-Encoding: 8bit\n");
let _ = write!(body, "\n--{}\n", boundary); body.push('\n');
} body.push_str(html);
} let _ = write!(body, "\n--{}--", boundary);
if let Some(html) = html {
body.push_str("Content-Type: text/html;\n");
body.push_str("\tcharset=\"UTF-8\"\n");
body.push_str("Content-Transfer-Encoding: 8bit\n");
body.push('\n');
body.push_str(html);
if is_multipart {
let _ = write!(body, "\n--{}--", boundary);
}
}
Ok(body) Ok(body)
} }
@ -343,14 +327,7 @@ mod test {
#[test] #[test]
fn email_without_recipients() { fn email_without_recipients() {
let result = sendmail( let result = sendmail(&[], "Subject2", "", "<b>HTML</b>", "root", "Proxmox");
&[],
"Subject2",
None,
Some("<b>HTML</b>"),
"root",
"Proxmox",
);
assert!(result.is_err()); assert!(result.is_err());
} }
@ -361,8 +338,8 @@ mod test {
"foobar@example.com", "foobar@example.com",
"Fred Oobar", "Fred Oobar",
"This is the subject", "This is the subject",
Some("This is the plain body"), "This is the plain body",
Some("<body>This is the HTML body</body>"), "<body>This is the HTML body</body>",
1718977850, 1718977850,
) )
.expect("format_message failed"); .expect("format_message failed");