From 12612da75e3635c3c7d5aedf89115847d310a12f Mon Sep 17 00:00:00 2001
From: Paolo Barbolini <paolo@paolo565.org>
Date: Sat, 4 Jun 2022 14:58:45 +0200
Subject: [PATCH] Remove manual IDN handling

---
 Cargo.lock  |  1 -
 Cargo.toml  |  1 -
 src/mail.rs | 14 +-------------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6691f50b..5eb6ab8c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3662,7 +3662,6 @@ dependencies = [
  "governor",
  "handlebars",
  "html5gum",
- "idna 0.2.3",
  "job_scheduler",
  "jsonwebtoken",
  "lettre",
diff --git a/Cargo.toml b/Cargo.toml
index 3278c70d..09bd99c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -108,7 +108,6 @@ webauthn-rs = "0.3.2"
 url = "2.2.2"
 
 # 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 }
 percent-encoding = "2.1.0" # URL encoding library used for URL's in the emails
 
diff --git a/src/mail.rs b/src/mail.rs
index ef6c3b8d..b6668747 100644
--- a/src/mail.rs
+++ b/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 {
-    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 email = Message::builder()
         .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)?))
         .subject(subject)
         .multipart(MultiPart::alternative_plain_html(body_text, body_html))?;