From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 585401FF15F for ; Mon, 2 Dec 2024 13:59:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0188217A0E; Mon, 2 Dec 2024 13:59:42 +0100 (CET) From: Shannon Sterz To: pbs-devel@lists.proxmox.com Date: Mon, 2 Dec 2024 13:58:58 +0100 Message-Id: <20241202125859.191455-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241202125859.191455-1-s.sterz@proxmox.com> References: <20241202125859.191455-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.038 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox v2 3/4] sendmail: add mail-forwarder feature X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" this moves the mail forwarding implementation from `proxmox-notify` into `proxmox-sendmail` to cover more `sendmail` related use-cases in one place. Signed-off-by: Shannon Sterz --- proxmox-sendmail/Cargo.toml | 4 +++ proxmox-sendmail/src/lib.rs | 57 +++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/proxmox-sendmail/Cargo.toml b/proxmox-sendmail/Cargo.toml index 790b324b..e04e2595 100644 --- a/proxmox-sendmail/Cargo.toml +++ b/proxmox-sendmail/Cargo.toml @@ -14,3 +14,7 @@ anyhow = { workspace = true } base64 = { workspace = true } percent-encoding = { workspace = true } proxmox-time = { workspace = true } + +[features] +default = [] +mail-forwarder = [] diff --git a/proxmox-sendmail/src/lib.rs b/proxmox-sendmail/src/lib.rs index a42bb0cd..e1ddc63d 100644 --- a/proxmox-sendmail/src/lib.rs +++ b/proxmox-sendmail/src/lib.rs @@ -287,6 +287,56 @@ impl<'a> Mail<'a> { Ok(()) } + /// Forwards an email message to a given list of recipients. + /// + /// `message` must be compatible with ``sendmail`` (the message is piped into stdin unmodified). + #[cfg(feature = "mail-forwarder")] + pub fn forward( + mailto: &[&str], + mailfrom: &str, + message: &[u8], + uid: Option, + ) -> Result<(), Error> { + use std::os::unix::process::CommandExt; + + if mailto.is_empty() { + bail!("At least one recipient has to be specified!"); + } + + let mut builder = Command::new("/usr/sbin/sendmail"); + + builder + .args([ + "-N", "never", // never send DSN (avoid mail loops) + "-f", mailfrom, "--", + ]) + .args(mailto) + .stdin(Stdio::piped()) + .stdout(Stdio::null()) + .stderr(Stdio::null()); + + if let Some(uid) = uid { + builder.uid(uid); + } + + let mut sendmail_process = builder + .spawn() + .with_context(|| "could not spawn sendmail process")?; + + sendmail_process + .stdin + .take() + .unwrap() + .write_all(message) + .with_context(|| "couldn't write to sendmail stdin")?; + + sendmail_process + .wait() + .with_context(|| "sendmail did not exit successfully")?; + + Ok(()) + } + fn format_mail(&self, now: i64) -> Result { let file_boundary = format!("----_=_NextPart_001_{}", now); let html_boundary = format!("----_=_NextPart_002_{}", now); @@ -432,6 +482,13 @@ mod test { assert!(result.is_err()); } + #[test] + #[cfg(feature = "mail-forwarder")] + fn forwarding_without_recipients_fails() { + let result = Mail::forward(&[], "me@example.com", String::from("text").as_bytes(), None); + assert!(result.is_err()); + } + #[test] fn simple_ascii_text_mail() { let mail = Mail::new( -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel