From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AA928F0B3 for ; Thu, 20 Jul 2023 16:33:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 17E27148F1 for ; Thu, 20 Jul 2023 16:33:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 20 Jul 2023 16:33:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0FF3E41E92 for ; Thu, 20 Jul 2023 16:33:06 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 20 Jul 2023 16:31:46 +0200 Message-Id: <20230720143236.652292-20-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720143236.652292-1-l.wagner@proxmox.com> References: <20230720143236.652292-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.096 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 proxmox 19/69] notify: sendmail: query default author/mailfrom from context X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jul 2023 14:33:41 -0000 Signed-off-by: Lukas Wagner --- proxmox-notify/src/context.rs | 2 ++ proxmox-notify/src/endpoints/sendmail.rs | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/proxmox-notify/src/context.rs b/proxmox-notify/src/context.rs index c31a243b..4643f987 100644 --- a/proxmox-notify/src/context.rs +++ b/proxmox-notify/src/context.rs @@ -3,6 +3,8 @@ use std::fmt::Debug; pub trait Context: Send + Sync + Debug { fn lookup_email_for_user(&self, user: &str) -> Option; + fn default_sendmail_author(&self) -> String; + fn default_sendmail_from(&self) -> String; } static CONTEXT: OnceCell<&'static dyn Context> = OnceCell::new(); diff --git a/proxmox-notify/src/endpoints/sendmail.rs b/proxmox-notify/src/endpoints/sendmail.rs index 4e412a43..aba7150c 100644 --- a/proxmox-notify/src/endpoints/sendmail.rs +++ b/proxmox-notify/src/endpoints/sendmail.rs @@ -112,9 +112,17 @@ impl Endpoint for SendmailEndpoint { let text_part = renderer::render_template(TemplateRenderer::Plaintext, ¬ification.body, properties)?; - // proxmox_sys::email::sendmail will set the author to - // "Proxmox Backup Server" if it is not set. - let author = self.config.author.as_deref().or(Some("")); + let author = self + .config + .author + .clone() + .unwrap_or_else(|| context().default_sendmail_author()); + + let mailfrom = self + .config + .from_address + .clone() + .unwrap_or_else(|| context().default_sendmail_from()); let recipients_str: Vec<&str> = recipients.iter().map(String::as_str).collect(); @@ -123,8 +131,8 @@ impl Endpoint for SendmailEndpoint { &subject, Some(&text_part), Some(&html_part), - self.config.from_address.as_deref(), - author, + Some(&mailfrom), + Some(&author), ) .map_err(|err| Error::NotifyFailed(self.config.name.clone(), err.into())) } -- 2.39.2