kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

mail: set content-transfer-encoding to 8bit 

This is a workaround to a lettre bug, which sets Content-Type in emails
to "text/plain; charset=utf-8", but doesn't set the transfer encoding
accordingly. This rarely causes errors, but we should strive to be
correct.

See related issue:
https://gitlab.com/hagrid-keyserver/hagrid/-/issues/144

Upstream issue:
https://github.com/lettre/lettre/issues/400
This commit is contained in:
Vincent Breitmoser 2020-03-28 09:52:54 +01:00
parent 619f9f9554
commit 1082339c77
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mail.rs
View File

@ -3,7 +3,7 @@ use std::path::PathBuf;
use failure;
use handlebars::Handlebars;
use lettre::{Transport as LettreTransport, SendmailTransport, file::FileTransport};
use lettre::builder::{EmailBuilder, Mailbox};
use lettre::builder::{EmailBuilder, PartBuilder, Mailbox, MimeMultipartType};
use url;
use serde::Serialize;
use uuid::Uuid;
@ -208,11 +208,27 @@ impl Service {
println!("{}", &txt);
}
// build this ourselves, as a temporary workaround for https://github.com/lettre/lettre/issues/400
let text = PartBuilder::new()
.body(txt)
.header(("Content-Type", "text/plain; charset=utf-8"))
.header(("Content-Transfer-Encoding", "8bit"))
.build();
let html = PartBuilder::new()
.body(html)
.header(("Content-Type", "text/html; charset=utf-8"))
.header(("Content-Transfer-Encoding", "8bit"))
.build();
let email = EmailBuilder::new()
.from(self.from.clone())
.subject(rfc2047_encode(subject))
.alternative(html, txt)
.message_id(format!("<{}@{}>", Uuid::new_v4(), self.domain));
.message_id(format!("<{}@{}>", Uuid::new_v4(), self.domain))
.message_type(MimeMultipartType::Alternative)
.header(("Content-Transfer-Encoding", "8bit"))
.child(text)
.child(html);
let email = to.iter().fold(email, |email, to| email.to(to.to_string()));