From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 12E0B1FF0B7 for ; Fri, 13 Nov 2026 16:12:06 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C0904218F8; Fri, 13 Nov 2026 16:09:47 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox 28/55] notify: forwarded mails: don't hardcode severity and metadata fields Date: Fri, 13 Nov 2026 16:08:01 +0100 Message-ID: <20261113150828.756836-29-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113150828.756836-1-l.wagner@proxmox.com> References: <20261113150828.756836-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794582526580 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.209 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: NMQBD4BPVO377GUPKGUZILCXPTQGECEF X-Message-ID-Hash: NMQBD4BPVO377GUPKGUZILCXPTQGECEF X-MailFrom: l.wagner@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: These should rather be passed by proxmox-mail-forward as function parameters. Also, since we need to take ownership of the mail contents, pass a Vec directly instead of calling `.into()`. Signed-off-by: Lukas Wagner --- proxmox-notify/src/notification.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/proxmox-notify/src/notification.rs b/proxmox-notify/src/notification.rs index f5b6ab6a6..e814ce97f 100644 --- a/proxmox-notify/src/notification.rs +++ b/proxmox-notify/src/notification.rs @@ -116,22 +116,17 @@ impl Notification { } } - pub fn new_forwarded_mail(raw_mail: &[u8], uid: Option) -> Result { - let mut additional_fields = HashMap::new(); - additional_fields.insert("hostname".into(), proxmox_sys::nodename().into()); - additional_fields.insert("type".into(), "system-mail".into()); - + pub fn new_forwarded_mail( + severity: Severity, + raw_mail: Vec, + fields: HashMap, + uid: Option, + ) -> Result { Ok(Self { - // Unfortunately we cannot reasonably infer the severity from the - // mail contents, so just set it to the highest for now so that - // it is not filtered out. - content: Content::ForwardedMail { - raw: raw_mail.into(), - uid, - }, + content: Content::ForwardedMail { raw: raw_mail, uid }, metadata: Metadata { - severity: Severity::Unknown, - additional_fields, + severity, + additional_fields: fields, timestamp: proxmox_time::epoch_i64(), }, id: Uuid::generate(), -- 2.47.3