public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox v2 28/63] notify: fold mail-forwarder feature into send-impl
Date: Wed, 18 Nov 2026 10:43:12 +0100	[thread overview]
Message-ID: <20261118094348.273646-29-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261118094348.273646-1-l.wagner@proxmox.com>

In the future, all users of proxmox-notify will use a single
notification worker to process queued notifications, which includes
forwarded mails as well. Hence it makes sense to merge both features.
The subject and body of the forwarded mail is now only parsed when the
mail is actually processed by an endpoint implementation. This makes
sure that the basic Notification type does not depend on the mail-parser
crate.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 proxmox-notify/Cargo.toml                   |  3 ++-
 proxmox-notify/src/endpoints/common/mail.rs | 13 +++++++++++++
 proxmox-notify/src/endpoints/gotify.rs      |  5 +++--
 proxmox-notify/src/endpoints/sendmail.rs    |  1 -
 proxmox-notify/src/endpoints/smtp.rs        |  3 ---
 proxmox-notify/src/endpoints/webhook.rs     |  5 +++--
 proxmox-notify/src/notification.rs          | 16 +---------------
 7 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/proxmox-notify/Cargo.toml b/proxmox-notify/Cargo.toml
index ca5dc5d45..1971f5b60 100644
--- a/proxmox-notify/Cargo.toml
+++ b/proxmox-notify/Cargo.toml
@@ -66,6 +66,7 @@ send-impl = [
     "dep:lettre",
     "dep:handlebars",
     "dep:proxmox-config-digest",
+    "dep:mail-parser",
     "dep:percent-encoding",
     "dep:proxmox-base64",
     "dep:proxmox-http",
@@ -73,9 +74,9 @@ send-impl = [
     "dep:proxmox-human-byte",
     "dep:proxmox-section-config",
     "dep:proxmox-sendmail",
+    "proxmox-sendmail/mail-forwarder",
     "dep:proxmox-sys",
 ]
-mail-forwarder = ["dep:mail-parser", "dep:proxmox-sys", "proxmox-sendmail/mail-forwarder"]
 pve-context = ["dep:proxmox-sys", "legacy-matchers"]
 pbs-context = ["dep:proxmox-sys", "legacy-matchers"]
 legacy-matchers = []
diff --git a/proxmox-notify/src/endpoints/common/mail.rs b/proxmox-notify/src/endpoints/common/mail.rs
index 736f2ac66..fac4e759c 100644
--- a/proxmox-notify/src/endpoints/common/mail.rs
+++ b/proxmox-notify/src/endpoints/common/mail.rs
@@ -1,4 +1,5 @@
 use crate::Context;
+use crate::Error;
 
 /// Get list of email recipients from a list of email addresses and users.
 ///
@@ -34,6 +35,18 @@ pub(crate) fn get_recipients(
     recipients
 }
 
+/// Parse raw email message and return subject and plaintext body
+pub(crate) fn parse_subject_and_plaintext_body(raw_mail: &[u8]) -> Result<(String, String), Error> {
+    let message = mail_parser::MessageParser::default()
+        .parse(raw_mail)
+        .ok_or_else(|| Error::invalid_forwarded_message("could not parse forwarded email"))?;
+
+    let title = message.subject().unwrap_or_default().into();
+    let body = message.body_text(0).unwrap_or_default().into();
+
+    Ok((title, body))
+}
+
 #[cfg(test)]
 mod tests {
     use crate::context::test;
diff --git a/proxmox-notify/src/endpoints/gotify.rs b/proxmox-notify/src/endpoints/gotify.rs
index cf7d4cc68..bdb1e487d 100644
--- a/proxmox-notify/src/endpoints/gotify.rs
+++ b/proxmox-notify/src/endpoints/gotify.rs
@@ -7,6 +7,7 @@ use proxmox_http::client::sync::Client;
 use proxmox_http::{HttpClient, HttpOptions};
 
 use crate::api_types::{GotifyConfig, GotifyPrivateConfig};
+use crate::endpoints::common::mail;
 use crate::renderer::TemplateType;
 use crate::{Content, Context, Error, Notification, Severity, renderer};
 
@@ -48,8 +49,8 @@ impl Endpoint for GotifyEndpoint {
 
                 (rendered_title, rendered_message)
             }
-            #[cfg(feature = "mail-forwarder")]
-            Content::ForwardedMail { title, body, .. } => (title.clone(), body.clone()),
+
+            Content::ForwardedMail { raw, .. } => mail::parse_subject_and_plaintext_body(raw)?,
         };
 
         // We don't have a TemplateRenderer::Markdown yet, so simply put everything
diff --git a/proxmox-notify/src/endpoints/sendmail.rs b/proxmox-notify/src/endpoints/sendmail.rs
index bbed31b4f..0bad792f7 100644
--- a/proxmox-notify/src/endpoints/sendmail.rs
+++ b/proxmox-notify/src/endpoints/sendmail.rs
@@ -63,7 +63,6 @@ impl Endpoint for SendmailEndpoint {
                     Error::other_with_source("could not send mail via sendmail", err)
                 })
             }
-            #[cfg(feature = "mail-forwarder")]
             Content::ForwardedMail { raw, uid, .. } => {
                 Mail::forward(&recipients_str, &mailfrom, raw, *uid).map_err(|err| {
                     Error::other_with_source("could not forward mail via sendmail", err)
diff --git a/proxmox-notify/src/endpoints/smtp.rs b/proxmox-notify/src/endpoints/smtp.rs
index fa0810fbb..43dc1f7f4 100644
--- a/proxmox-notify/src/endpoints/smtp.rs
+++ b/proxmox-notify/src/endpoints/smtp.rs
@@ -132,7 +132,6 @@ impl Endpoint for SmtpEndpoint {
                         Error::invalid_config_with_source("could not build email message", err)
                     })?
             }
-            #[cfg(feature = "mail-forwarder")]
             Content::ForwardedMail { raw, .. } => build_forwarded_message(email_builder, raw)?,
         };
 
@@ -161,7 +160,6 @@ impl Endpoint for SmtpEndpoint {
 }
 
 /// Construct a lettre `Message` from a raw email message.
-#[cfg(feature = "mail-forwarder")]
 fn build_forwarded_message(
     email_builder: lettre::message::MessageBuilder,
     raw: &[u8],
@@ -312,7 +310,6 @@ mod tests {
         );
     }
 
-    #[cfg(feature = "mail-forwarder")]
     #[test]
     fn test_forward_message_from_raw() {
         use lettre::message::header::Date;
diff --git a/proxmox-notify/src/endpoints/webhook.rs b/proxmox-notify/src/endpoints/webhook.rs
index da2e189b4..2eaa71633 100644
--- a/proxmox-notify/src/endpoints/webhook.rs
+++ b/proxmox-notify/src/endpoints/webhook.rs
@@ -21,6 +21,7 @@ use proxmox_http::client::sync::Client;
 use proxmox_http::{HttpClient, HttpOptions};
 
 use crate::api_types::{HttpMethod, WebhookConfig, WebhookPrivateConfig};
+use crate::endpoints::common::mail;
 use crate::renderer::TemplateType;
 use crate::{Content, Context, Error, Notification, renderer};
 
@@ -93,8 +94,8 @@ impl WebhookEndpoint {
 
                 (rendered_title, rendered_message)
             }
-            #[cfg(feature = "mail-forwarder")]
-            Content::ForwardedMail { title, body, .. } => (title.clone(), body.clone()),
+
+            Content::ForwardedMail { raw, .. } => mail::parse_subject_and_plaintext_body(raw)?,
         };
 
         let mut fields = Map::new();
diff --git a/proxmox-notify/src/notification.rs b/proxmox-notify/src/notification.rs
index 426a2259a..f5b6ab6a6 100644
--- a/proxmox-notify/src/notification.rs
+++ b/proxmox-notify/src/notification.rs
@@ -62,15 +62,10 @@ pub enum Content {
         /// Data that can be used for template rendering.
         data: Value,
     },
-    #[cfg(feature = "mail-forwarder")]
     #[serde(rename_all = "kebab-case")]
     ForwardedMail {
         /// Raw mail contents
         raw: Vec<u8>,
-        /// Fallback title
-        title: String,
-        /// Fallback body
-        body: String,
         /// UID to use when calling sendmail
         #[allow(dead_code)] // Unused in some feature flag permutations
         uid: Option<u32>,
@@ -120,15 +115,8 @@ impl Notification {
             id: Uuid::generate(),
         }
     }
-    #[cfg(feature = "mail-forwarder")]
+
     pub fn new_forwarded_mail(raw_mail: &[u8], uid: Option<u32>) -> Result<Self, Error> {
-        let message = mail_parser::MessageParser::default()
-            .parse(raw_mail)
-            .ok_or_else(|| Error::invalid_forwarded_message("could not parse forwarded email"))?;
-
-        let title = message.subject().unwrap_or_default().into();
-        let body = message.body_text(0).unwrap_or_default().into();
-
         let mut additional_fields = HashMap::new();
         additional_fields.insert("hostname".into(), proxmox_sys::nodename().into());
         additional_fields.insert("type".into(), "system-mail".into());
@@ -139,8 +127,6 @@ impl Notification {
             // it is not filtered out.
             content: Content::ForwardedMail {
                 raw: raw_mail.into(),
-                title,
-                body,
                 uid,
             },
             metadata: Metadata {
-- 
2.47.3





  parent reply	other threads:[~2026-11-18  9:48 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18  9:42 [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 01/63] notify: disallow `unsafe` code Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 02/63] notify: refactor error type Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 03/63] notify: move `Endpoint` trait to endpoint module as pub(crate) Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 04/63] notify: use ConfigDigest instead of raw byte arrays Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 05/63] notify: remove static context and pass context as parameter Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 06/63] notify: matcher: drop unused field matcher verifiers Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 07/63] notify: introduce 'send-impl', 'api-impl' and 'api-types' features Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 08/63] notify: matcher: make matcher validation methods public Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 09/63] notify: matcher: stub CalendarMatcher::matches on wasm32 Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 10/63] notify: make SendmailEndpoint and SmtpEndpoint private types Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 11/63] notify: move `send`, `test_target` and `Bus` to new `send` module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 12/63] notify: move Origin type to api_types module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 13/63] notify: move Target " Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 14/63] notify: move Config to config module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 15/63] notify: move Notification and sub-types to `notification` module Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 16/63] notify: move schema module to api_types Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 17/63] notify: move check_matches from api_types::matcher to send::Bus Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 18/63] notify: move TemplateSource to context module Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 19/63] notify: config: cleanup helper names and visibility Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 20/63] notify: config: rename section config parser/writer methods Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 21/63] notify: config: pass builtins explicitly when parsing section config Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 22/63] notify: implement PartialEq for all Config types Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 23/63] notify: use typed SectionConfigData Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 24/63] notify: api: api types: rename Deleteable* -> Deletable* Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 25/63] notify: context: parse builtin config only once Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 26/63] notify: context: parse proxy config in trait impl, not at the callsite Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 27/63] notify: gate sub-modules with the appropriate feature flags Lukas Wagner
2026-11-18  9:43 ` Lukas Wagner [this message]
2026-11-18  9:43 ` [PATCH proxmox v2 29/63] notify: forwarded mails: don't hardcode severity and metadata fields Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 30/63] notify: don't pass uid when instantiating forwarded mail notifications Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 31/63] notify: derive PartialEq for Notification type Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 32/63] notify: add getters for severity and fields on " Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 33/63] notify: add test suite for " Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 34/63] notify: serialize raw, forwarded mail content as base64 Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 35/63] notify: unify code paths for legacy-sendmail and regular notifications Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 36/63] notify: add backwards-compat note to Notification type Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 37/63] notify: remove 'test_target' API Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 38/63] notify: replace notification instantiation with builder pattern Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 39/63] notify: add send receipts Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 40/63] notify: make sure that template name matches SAFE_ID_REGEX Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 41/63] notify: implement notification queue submitter Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 42/63] notify: context: add read_config Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 43/63] notify: queue: add queue consumer Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 44/63] notify: queue: add worker task Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 45/63] notifications: don't ignore verification errors in legacy-sendmail mode Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 46/63] notifications: adapt to proxmox-notify API changes Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 47/63] api: notification: send test notification via proxmox_notify::send Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 48/63] notifications: send all notifications via proxmox-notify's queue Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-perl-rs v2 49/63] pve: notify: adapt to changes in the public API of proxmox-notify Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-perl-rs v2 50/63] pve: notify: add `PVE::RS::Notify::enqueue` method Lukas Wagner
2026-11-18  9:43 ` [PATCH pve-cluster v2 51/63] notify: send notifications via notification queue Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 52/63] vzdump: send legacy-sendmail notifications via simplified API Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 53/63] debian: create notification queue directory via tmpfiles Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 54/63] debian: add 'pve-notify-worker' as dependecy Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 55/63] api: services: add 'pve-notify-worker' as known service Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 56/63] services: request pve-notify-worker.service via Wants Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 57/63] forward mails via notification queue Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 58/63] use return code to signal permanent or temporary failure Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 59/63] limit size of mail read from stdin Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 60/63] cargo: move mail forwarder into a workspace member crate Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 61/63] add crate for code shared between the mail-forwarder and the worker Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 62/63] add pve-notify-worker crate and package Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 63/63] debian: add versioned break for pve-manager and proxmox-backup-server Lukas Wagner
2026-11-18 21:44 ` [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Thomas Lamprecht
2026-11-19 10:45   ` Lukas Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261118094348.273646-29-l.wagner@proxmox.com \
    --to=l.wagner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal