Corrections on env and naming.

src/config.rs

@@ -886,8 +886,8 @@ make_config! {
         smtp_username:                 String, true,   option;
         /// Password
         smtp_password:                 Pass,   true,   option;
-        /// Dkim signature (type:privatekey). Private must be base64-encoded ed key or PKCS#1 format RSA key.
+        /// Dkim private key (type:privatekey). Private must be base64-encoded ed key or PKCS#1 format RSA key.
-        dkim_signature:                String, true,   option;
+        dkim_privatekey:                String, true,   option;
         /// Dkim algo (true if RSA else ed25519)
         dkim_use_rsa:                  bool,   true,   def,   false;
         /// Dkim infos (selector:domain)

src/mail.rs

@@ -14,14 +14,10 @@ use lettre::{
 };
 
 use crate::{
-    api::EmptyResult,
+    CONFIG, api::EmptyResult, auth::{
-    auth::{
         encode_jwt, generate_delete_claims, generate_emergency_access_invite_claims, generate_invite_claims,
         generate_verify_email_claims,
-    },
+    }, db::models::{Device, DeviceType, EmergencyAccessId, MembershipId, OrganizationId, User, UserId}, error::Error, util::get_env
-    db::models::{Device, DeviceType, EmergencyAccessId, MembershipId, OrganizationId, User, UserId},
-    error::Error,
-    CONFIG,
 };
 
 fn sendmail_transport() -> AsyncSendmailTransport<Tokio1Executor> {
@@ -707,23 +703,11 @@ async fn send_with_selected_transport(email: Message) -> EmptyResult {
     }
 }
 pub fn check_dkim() -> Result<Option<DkimConfig>, String> {
-    match (CONFIG.dkim_signature(), CONFIG.dkim_infos()) {
+    match (get_env::<String>("dkim_privatekey"), CONFIG.dkim_infos()) {
-        (Some(sig), Some(infos)) => {
+        (Some(pk), Some(infos)) => {
-            let config = {
                 let algo = if CONFIG.dkim_use_rsa() {DkimSigningAlgorithm::Rsa } else { DkimSigningAlgorithm::Ed25519 };
-                let sig = match std::fs::read_to_string(sig) {
+                let (selector, domain, privatekey) = match (DkimSigningKey::new(pk.as_str(), algo), infos.split(':').collect::<Vec<&str>>()) {
-                    Err(e) => {
+                    (Ok(sig), split2) if split2.len() == 2 => {
-                        return Err(format!("Cannot read DKIM key. Err is {:?}", e));
-                    }
-                    Ok(key) => match DkimSigningKey::new(&key, algo) {
-                        Ok(d) => d,
-                        Err(e) => {
-                            return Err(format!("DKIM key is invalid. Err is {:?}", e));
-                        }
-                    },
-                };
-                match (sig, infos.split(':').collect::<Vec<&str>>()) {
-                    (sig, split2) if split2.len() == 2 => {
                         let (selector, domain, sig) =
                             (String::from(*split2.first().unwrap()), String::from(*split2.last().unwrap()), sig);
                         (selector, domain, sig)
@@ -731,10 +715,9 @@ pub fn check_dkim() -> Result<Option<DkimConfig>, String> {
                     _ => {
                         return Err("DKIM issue, invalid domain, selector.".to_string());
                     }
-                }
                 };
-            Ok(Some(DkimConfig::default_config(config.0, config.1, config.2)))
+                return Ok(Some(DkimConfig::default_config(selector, domain, privatekey)));
-        }
+        },
         (None, None) => Ok(None),
         _ => {
             Err("DKIM setting is badly implemented. One config is missing (DKIM signature or DKIM infos).".to_string())