Daniel García
5 years ago
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
2 changed files with
4 additions and
4 deletions
-
src/api/core/two_factor/email.rs
-
src/mail.rs
|
|
@ -273,8 +273,8 @@ impl EmailTokenData { |
|
|
|
pub fn obscure_email(email: &str) -> String { |
|
|
|
let split: Vec<&str> = email.rsplitn(2, '@').collect(); |
|
|
|
|
|
|
|
let mut name = split[0].to_string(); |
|
|
|
let domain = &split[1]; |
|
|
|
let mut name = split[1].to_string(); |
|
|
|
let domain = &split[0]; |
|
|
|
|
|
|
|
let name_size = name.chars().count(); |
|
|
|
|
|
|
|
|
|
@ -264,12 +264,12 @@ fn send_email(address: &str, subject: &str, body_html: &str, body_text: &str) -> |
|
|
|
err!("Invalid email address (no @)"); |
|
|
|
} |
|
|
|
|
|
|
|
let domain_puny = match idna::domain_to_ascii_strict(address_split[1]) { |
|
|
|
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[0], domain_puny); |
|
|
|
let address = format!("{}@{}", address_split[1], domain_puny); |
|
|
|
|
|
|
|
let html = PartBuilder::new() |
|
|
|
.body(encode_to_str(body_html)) |
|
|
|