Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-16 04:12:53 +01:00
Remove manual IDN handling
Dieser Commit ist enthalten in:
Ursprung
68ec5f2a18
Commit
12612da75e
3 geänderte Dateien mit 1 neuen und 15 gelöschten Zeilen
1
Cargo.lock
generiert
1
Cargo.lock
generiert
|
@ -3662,7 +3662,6 @@ dependencies = [
|
||||||
"governor",
|
"governor",
|
||||||
"handlebars",
|
"handlebars",
|
||||||
"html5gum",
|
"html5gum",
|
||||||
"idna 0.2.3",
|
|
||||||
"job_scheduler",
|
"job_scheduler",
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
"lettre",
|
"lettre",
|
||||||
|
|
|
@ -108,7 +108,6 @@ webauthn-rs = "0.3.2"
|
||||||
url = "2.2.2"
|
url = "2.2.2"
|
||||||
|
|
||||||
# Email libraries
|
# Email libraries
|
||||||
idna = "0.2.3" # Punycode conversion
|
|
||||||
lettre = { version = "0.10.0-rc.6", features = ["smtp-transport", "builder", "serde", "native-tls", "hostname", "tracing"], default-features = false }
|
lettre = { version = "0.10.0-rc.6", features = ["smtp-transport", "builder", "serde", "native-tls", "hostname", "tracing"], default-features = false }
|
||||||
percent-encoding = "2.1.0" # URL encoding library used for URL's in the emails
|
percent-encoding = "2.1.0" # URL encoding library used for URL's in the emails
|
||||||
|
|
||||||
|
|
14
src/mail.rs
14
src/mail.rs
|
@ -467,22 +467,10 @@ pub fn send_test(address: &str) -> EmptyResult {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn send_email(address: &str, subject: &str, body_html: String, body_text: String) -> EmptyResult {
|
fn send_email(address: &str, subject: &str, body_html: String, body_text: String) -> EmptyResult {
|
||||||
let address_split: Vec<&str> = address.rsplitn(2, '@').collect();
|
|
||||||
if address_split.len() != 2 {
|
|
||||||
err!("Invalid email address (no @)");
|
|
||||||
}
|
|
||||||
|
|
||||||
let domain_puny = match idna::domain_to_ascii_strict(address_split[0]) {
|
|
||||||
Ok(d) => d,
|
|
||||||
Err(_) => err!("Can't convert email domain to ASCII representation"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let address = format!("{}@{}", address_split[1], domain_puny);
|
|
||||||
|
|
||||||
let smtp_from = &CONFIG.smtp_from();
|
let smtp_from = &CONFIG.smtp_from();
|
||||||
let email = Message::builder()
|
let email = Message::builder()
|
||||||
.message_id(Some(format!("<{}@{}>", crate::util::get_uuid(), smtp_from.split('@').collect::<Vec<&str>>()[1])))
|
.message_id(Some(format!("<{}@{}>", crate::util::get_uuid(), smtp_from.split('@').collect::<Vec<&str>>()[1])))
|
||||||
.to(Mailbox::new(None, Address::from_str(&address)?))
|
.to(Mailbox::new(None, Address::from_str(address)?))
|
||||||
.from(Mailbox::new(Some(CONFIG.smtp_from_name()), Address::from_str(smtp_from)?))
|
.from(Mailbox::new(Some(CONFIG.smtp_from_name()), Address::from_str(smtp_from)?))
|
||||||
.subject(subject)
|
.subject(subject)
|
||||||
.multipart(MultiPart::alternative_plain_html(body_text, body_html))?;
|
.multipart(MultiPart::alternative_plain_html(body_text, body_html))?;
|
||||||
|
|
Laden …
In neuem Issue referenzieren