From 48925f8d5a7d560833566e6f7c7d5ab5b2f03e5a Mon Sep 17 00:00:00 2001
From: Rainshaw <rxg@live.com>
Date: Mon, 23 Nov 2020 15:44:34 +0800
Subject: [PATCH] feat: add email bcc option

---
 src/config.rs | 10 ++++++++++
 src/mail.rs   | 45 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 60dc317c..6aa0f5b0 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -426,6 +426,10 @@ make_config! {
         smtp_from:                     String, true,   def,     String::new();
         /// From Name
         smtp_from_name:                String, true,   def,     "Bitwarden_RS".to_string();
+        /// Enable BCC
+        smtp_bcc:                      bool,   true,   def,     false;
+        /// BCC Address
+        smtp_bcc_address:              String, true,   option;
         /// Username
         smtp_username:                 String, true,   option;
         /// Password
@@ -514,6 +518,12 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
             err!("Both `SMTP_USERNAME` and `SMTP_PASSWORD` need to be set to enable email authentication")
         }
 
+        if cfg.smtp_bcc {
+            if !cfg.smtp_bcc_address.is_some(){
+                err!("To enable email BCC, `SMTP_BCC_ADDRESS` must be configured")
+            }
+        }
+
         if cfg._enable_email_2fa && (!cfg._enable_smtp || cfg.smtp_host.is_none()) {
             err!("To enable email 2FA, SMTP must be configured")
         }
diff --git a/src/mail.rs b/src/mail.rs
index 7419169a..31a9f1d6 100644
--- a/src/mail.rs
+++ b/src/mail.rs
@@ -333,15 +333,42 @@ fn send_email(address: &str, subject: &str, body_html: &str, body_text: &str) ->
     let alternative = MultiPart::alternative().boundary(boundary).singlepart(text).singlepart(html);
     let smtp_from = &CONFIG.smtp_from();
 
-    let email = Message::builder()
-        .message_id(Some(format!("<{}.{}>", unique_id, smtp_from)))
-        .to(Mailbox::new(None, Address::from_str(&address)?))
-        .from(Mailbox::new(
-            Some(CONFIG.smtp_from_name()),
-            Address::from_str(smtp_from)?,
-        ))
-        .subject(subject)
-        .multipart(alternative)?;
+    let email = if CONFIG.smtp_bcc() {
+        let bcc_address = CONFIG.smtp_bcc_address().unwrap();
+
+        let bcc_address_split: Vec<&str> = bcc_address.rsplitn(2, '@').collect();
+        if bcc_address_split.len() != 2 {
+            err!("Invalid email bcc_address (no @)");
+        }
+
+        let bcc_domain_puny = match idna::domain_to_ascii_strict(bcc_address_split[0]) {
+            Ok(d) => d,
+            Err(_) => err!("Can't convert bcc email domain to ASCII representation"),
+        };
+
+        let bcc_address = format!("{}@{}", bcc_address_split[1], bcc_domain_puny);
+
+        Message::builder()
+            .message_id(Some(format!("<{}.{}>", unique_id, smtp_from)))
+            .to(Mailbox::new(None, Address::from_str(&address)?))
+            .bcc(Mailbox::new(None, Address::from_str(&bcc_address)?))
+            .from(Mailbox::new(
+                Some(CONFIG.smtp_from_name()),
+                Address::from_str(smtp_from)?,
+            ))
+            .subject(subject)
+            .multipart(alternative)?
+    } else {
+        Message::builder()
+            .message_id(Some(format!("<{}.{}>", unique_id, smtp_from)))
+            .to(Mailbox::new(None, Address::from_str(&address)?))
+            .from(Mailbox::new(
+                Some(CONFIG.smtp_from_name()),
+                Address::from_str(smtp_from)?,
+            ))
+            .subject(subject)
+            .multipart(alternative)?
+    };
 
     match mailer().send(&email) {
         Ok(_) => Ok(()),