From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 5942A1FF138 for ; Mon, 15 Jun 2026 11:20:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E0DABE3E6; Mon, 15 Jun 2026 11:20:48 +0200 (CEST) From: Nicolas Frey To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox 1/1] sendmail: add additional header map Date: Mon, 15 Jun 2026 11:20:15 +0200 Message-ID: <20260615092015.101174-1-n.frey@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.138 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs] Message-ID-Hash: 5HUNWACTUKCLAEJSOZ6UBQ5H6Y2EVD6Z X-Message-ID-Hash: 5HUNWACTUKCLAEJSOZ6UBQ5H6Y2EVD6Z X-MailFrom: nfrey@miso.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: with corresponding methods to add them. this does not check for duplicates for the ones already set by other fields/defaults (e.g. To, From, Content-Type, etc.) Signed-off-by: Nicolas Frey --- proxmox-sendmail/src/lib.rs | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/proxmox-sendmail/src/lib.rs b/proxmox-sendmail/src/lib.rs index db751305..355a84c2 100644 --- a/proxmox-sendmail/src/lib.rs +++ b/proxmox-sendmail/src/lib.rs @@ -3,6 +3,7 @@ //! and alternative html parts to one or multiple receivers via ``sendmail``. //! +use std::collections::HashMap; use std::io::Write; use std::process::{Command, Stdio}; @@ -247,6 +248,7 @@ pub struct Mail<'a> { attachments: Vec>, mask_participants: bool, noreply: Option, + additional_headers: HashMap, } impl<'a> Mail<'a> { @@ -265,6 +267,7 @@ impl<'a> Mail<'a> { attachments: Vec::new(), mask_participants: true, noreply: None, + additional_headers: HashMap::new(), } } @@ -393,6 +396,20 @@ impl<'a> Mail<'a> { self } + /// Set an arbitrary header to be sent in addition to the default ones already set up by other + /// methods. + pub fn set_header(&mut self, name: S, body: S) { + self.additional_headers + .insert(name.to_string(), body.to_string()); + } + + /// Builder-style method to set an arbitrary header in addition to the default ones already + /// set up by other methods. + pub fn with_header(mut self, name: S, body: S) -> Self { + self.set_header(name, body); + self + } + /// Sends the email. This will fail if no recipients have been added. /// /// Note: An `Auto-Submitted: auto-generated` header is added to avoid triggering OOO and @@ -584,6 +601,11 @@ impl<'a> Mail<'a> { let rfc2822_date = proxmox_time::epoch_to_rfc2822(now) .with_context(|| "could not convert epoch to rfc2822 date")?; writeln!(header, "Date: {rfc2822_date}")?; + + for (name, body) in &self.additional_headers { + writeln!(header, "{name}: {body}")?; + } + header.push_str("Auto-Submitted: auto-generated;\n"); Ok(header) @@ -681,6 +703,31 @@ mod test { assert!(result.is_err()); } + #[test] + fn additional_headers() { + let mail = Mail::new("Sender", "mail@example.com", "hi", "body") + .with_recipient_and_name("Jane Doe", "j.doe@example.com") + .with_header("Reply-To", "mail@example.com") + .with_header("CC", "cc1@example.com,cc2@example.com"); + let body = mail.format_mail(0).expect("could not format mail"); + + assert_lines_equal_ignore_date( + &body, + r#"Subject: hi +From: Sender +To: Jane Doe +Date: Thu, 01 Jan 1970 01:00:00 +0100 +Reply-To: mail@example.com +CC: cc1@example.com,cc2@example.com +Auto-Submitted: auto-generated; +Content-Type: text/plain; + charset="UTF-8" +Content-Transfer-Encoding: 7bit + +body"#, + ) + } + #[test] fn simple_ascii_text_mail() { let mail = Mail::new( -- 2.47.3