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 E3DED1FF0B7 for ; Fri, 13 Nov 2026 16:17:18 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 67A2C21CFB; Fri, 13 Nov 2026 16:10:19 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-mail-forward 53/55] forward mails via notification queue Date: Fri, 13 Nov 2026 16:08:26 +0100 Message-ID: <20261113150828.756836-54-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: 1794582529761 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.201 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: MDKLKWF6YBXHPTHXI76XCVWWSPWWZRCH X-Message-ID-Hash: MDKLKWF6YBXHPTHXI76XCVWWSPWWZRCH 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: Instead of loading the notification configuration and sending the notification directly, submit the forwarded mail to the notification queue of the installed product. The product's notification worker then picks it up and handles matching and delivery like for any other notification. This way, the setuid helper no longer parses the product's notification configuration, including the private part with secrets, and contains none of the sending logic. The product-specific workarounds go away as well, such as the default sendmail target that was added for PBS installations without a notifications.cfg. The helper still has to start as root, since postfix runs it as 'nobody' and the queue must not be world-writable. Root is only used to switch to the user and group that own the queue (www-data for PVE, backup for PBS), and all privileges are dropped permanently before the mail is read. A bug in the code handling the mail can therefore not be used to gain root, and queue files get the ownership the consumer expects. If PVE and PBS are installed on the same host, the mail is now only submitted to the PVE queue. Previously, it was passed to both notification systems, unless PBS had no notifications.cfg of its own. Signed-off-by: Lukas Wagner --- Cargo.toml | 5 +- src/main.rs | 213 +++++++++++++++++++++++++++++----------------------- 2 files changed, 118 insertions(+), 100 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6860f49..d6ba2ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,5 @@ anyhow = "1.0" nix = "0.29" proxmox-log = "1" -proxmox-notify = {version = "2", features = ["mail-forwarder", "pve-context", "pbs-context", "legacy-matchers"] } +proxmox-notify = { version = "2", features = ["queue-submitter"] } proxmox-sys = "1" - -# Not directly used, this is just to force it to the new version: -proxmox-http = "1.0.2" diff --git a/src/main.rs b/src/main.rs index a95d75c..7599553 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,56 +1,101 @@ //! A helper binary that forwards any mail passed via stdin to -//! proxmox_notify. +//! the notification queue of the currently installed Proxmox product. +//! +//! If multiple products are installed side-by-side, only one notification is created. +//! The order of precedence is: +//! - PVE +//! - PBS //! //! The binary's path is added to /root/.forward, which means that //! postfix will invoke it when the local root user receives an email message. //! The message is passed via stdin. -//! The binary is installed with setuid permissions and will thus run as -//! root (euid ~ root, ruid ~ nobody) +//! The binary is installed with setuid permissions and will thus start as +//! root (euid ~ root, ruid ~ nobody). //! -//! The forwarding behavior is the following: -//! - PVE installed: Use PVE's notifications.cfg -//! - PBS installed: Use PBS's notifications.cfg if present. If not, -//! use an empty configuration and add a default sendmail target and -//! a matcher - this is needed because notifications are not yet -//! integrated in PBS. -//! - PVE/PBS co-installed: Use PVE's config *and* PBS's config, but if -//! PBS's config does not exist, a default sendmail target will *not* be -//! added. We assume that PVE's config contains the desired notification -//! behavior for system mails. +//! The setuid permissions are needed since postfix will run the script as +//! `nobody`. If we would not become `root` via a setuid binary, we would need to +//! make the notification submission queue world-writable, which is +//! not what we want. //! +//! Root privileges are only needed to switch to the user that owns the +//! notification queue of the installed product. Once the product has been +//! determined, the binary permanently drops to that user and group before +//! reading the mail from stdin. + use std::io::Read; use std::path::Path; +use anyhow::Context; use anyhow::Error; +use anyhow::bail; +use nix::sys::stat::Mode; +use nix::unistd::Gid; +use nix::unistd::Group; +use nix::unistd::Uid; +use nix::unistd::User; use proxmox_log::LevelFilter; use proxmox_log::Logger; use proxmox_log::error; -use proxmox_notify::Config; -use proxmox_notify::context::pbs::PBS_CONTEXT; -use proxmox_notify::context::pve::PVE_CONTEXT; -use proxmox_sys::fs; +use proxmox_notify::Notification; +use proxmox_notify::Severity; +use proxmox_notify::queue::QueueSubmitter; +use proxmox_sys::fs::CreateOptions; -const PVE_CFG_PATH: &str = "/etc/pve"; -const PVE_PUB_NOTIFICATION_CFG_FILENAME: &str = "/etc/pve/notifications.cfg"; -const PVE_PRIV_NOTIFICATION_CFG_FILENAME: &str = "/etc/pve/priv/notifications.cfg"; +/// Settings needed to submit a notification to a product's queue. +struct Product { + /// Path whose existence indicates that the product is installed. + cfg_path: &'static str, + /// Base directory of the product's notification queue. + notification_state_dir: &'static str, + /// User that owns the notification queue. + user: &'static str, + /// Group that owns the notification queue. + group: &'static str, +} -const PBS_CFG_PATH: &str = "/etc/proxmox-backup"; -const PBS_PUB_NOTIFICATION_CFG_FILENAME: &str = "/etc/proxmox-backup/notifications.cfg"; -const PBS_PRIV_NOTIFICATION_CFG_FILENAME: &str = "/etc/proxmox-backup/notifications-priv.cfg"; +impl Product { + /// Look up the ID of the user that owns the notification queue. + fn uid(&self) -> Result { + let user = self.user; -/// Wrapper around `proxmox_sys::fs::file_read_optional_string` which also returns `None` upon error -/// after logging it. -fn attempt_file_read>(path: P) -> Option { - match fs::file_read_optional_string(path.as_ref()) { - Ok(contents) => contents, - Err(err) => { - error!("unable to read {path:?}: {err:#}", path = path.as_ref()); - None - } + let uid = User::from_name(user) + .with_context(|| format!("could not look up username {user}"))? + .with_context(|| format!("user {user} does not exist"))? + .uid; + + Ok(uid) + } + + /// Look up the ID of the group that owns the notification queue. + fn gid(&self) -> Result { + let group = self.group; + + let gid = Group::from_name(group) + .with_context(|| format!("could not look up group {group}"))? + .with_context(|| format!("group {group} does not exist"))? + .gid; + + Ok(gid) } } +/// Supported products, in order of precedence. +const PRODUCTS: &[Product] = &[ + Product { + cfg_path: "/etc/pve", + notification_state_dir: "/var/lib/pve-manager/notifications/queue", + user: "www-data", + group: "www-data", + }, + Product { + cfg_path: "/etc/proxmox-backup", + notification_state_dir: "/var/lib/proxmox-backup/notifications/queue", + user: "backup", + group: "backup", + }, +]; + /// Read data from stdin, until EOF is encountered. fn read_stdin() -> Result, Error> { let mut input = Vec::new(); @@ -61,55 +106,52 @@ fn read_stdin() -> Result, Error> { Ok(input) } -fn forward_common(mail: &[u8], config: &Config) -> Result<(), Error> { - let real_uid = nix::unistd::getuid(); - // The uid is passed so that `sendmail` can be called as the a correct user. - // (sendmail will show a warning if called from a setuid process) - let notification = - proxmox_notify::Notification::new_forwarded_mail(mail, Some(real_uid.as_raw()))?; +fn installed_product() -> Result<&'static Product, Error> { + PRODUCTS + .iter() + .find(|product| Path::new(product.cfg_path).exists()) + .context("no supported Proxmox product installed") +} - proxmox_notify::api::common::send(config, ¬ification)?; +/// Permanently switch to `uid` and `gid`, dropping all supplementary groups. +/// +/// The real, effective and saved IDs are all set, so that the original privileges cannot be +/// regained afterwards. +fn drop_privileges(uid: Uid, gid: Gid) -> Result<(), Error> { + // Supplementary groups and the group IDs can only be changed while still privileged, so the + // user ID must be changed last. + nix::unistd::setgroups(&[]).context("could not drop supplementary groups")?; + nix::unistd::setresgid(gid, gid, gid).with_context(|| format!("could not set gid to {gid}"))?; + nix::unistd::setresuid(uid, uid, uid).with_context(|| format!("could not set uid to {uid}"))?; + + if uid != Uid::from_raw(0) && nix::unistd::setuid(Uid::from_raw(0)).is_ok() { + bail!("root privileges could be regained after dropping them"); + } Ok(()) } -/// Forward a mail to PVE's notification system -fn forward_for_pve(mail: &[u8]) -> Result<(), Error> { - proxmox_notify::context::set_context(&PVE_CONTEXT); - let config = attempt_file_read(PVE_PUB_NOTIFICATION_CFG_FILENAME).unwrap_or_default(); - let priv_config = attempt_file_read(PVE_PRIV_NOTIFICATION_CFG_FILENAME).unwrap_or_default(); +fn forward_mail_from_stdin() -> Result<(), Error> { + let product = installed_product()?; + drop_privileges(product.uid()?, product.gid()?)?; - let config = Config::new(&config, &priv_config)?; + let mail = read_stdin().context("could not read mail from STDIN")?; - forward_common(mail, &config) -} + // Files are created by the queue's owner now, so only the mode needs to be set explicitly. + let queue = QueueSubmitter::new( + product.notification_state_dir, + CreateOptions::new().perm(Mode::from_bits_truncate(0o0660)), + ); -/// Forward a mail to PBS's notification system -fn forward_for_pbs(mail: &[u8], has_pve: bool) -> Result<(), Error> { - proxmox_notify::context::set_context(&PBS_CONTEXT); + let notification = Notification::forwarded_mail_builder(mail) + .severity(Severity::Unknown) + .field("hostname", proxmox_sys::nodename()) + .field("type", "system-mail") + .build()?; - let config = if Path::new(PBS_PUB_NOTIFICATION_CFG_FILENAME).exists() { - let config = attempt_file_read(PBS_PUB_NOTIFICATION_CFG_FILENAME).unwrap_or_default(); - let priv_config = attempt_file_read(PBS_PRIV_NOTIFICATION_CFG_FILENAME).unwrap_or_default(); - - Config::new(&config, &priv_config)? - } else { - // Instantiate empty config. - // Note: This will contain the default built-in targets/matchers. - let config = Config::new("", "")?; - if has_pve { - // Skip forwarding if we are co-installed with PVE AND - // we do not have our own notifications.cfg file yet - // --> We assume that PVE has a sane matcher configured that - // forwards the mail properly - // TODO: This can be removed once PBS has full notification integration - - return Ok(()); - } - config - }; - - forward_common(mail, &config)?; + queue + .submit(¬ification) + .context("could not submit mail to notification queue")?; Ok(()) } @@ -119,31 +161,10 @@ fn main() { .journald() .init() { - eprintln!("unable to initialize syslog: {err}"); + eprintln!("unable to initialize logging: {err}"); } - // Read the mail that is to be forwarded from stdin - match read_stdin() { - Ok(mail) => { - let mut has_pve = false; - - // Assume a PVE installation if /etc/pve exists - if Path::new(PVE_CFG_PATH).exists() { - has_pve = true; - if let Err(err) = forward_for_pve(&mail) { - error!("could not forward mail for Proxmox VE: {err:#}"); - } - } - - // Assume a PBS installation if /etc/proxmox-backup exists - if Path::new(PBS_CFG_PATH).exists() { - if let Err(err) = forward_for_pbs(&mail, has_pve) { - error!("could not forward mail for Proxmox Backup Server: {err:#}"); - } - } - } - Err(err) => { - error!("could not read mail from STDIN: {err:#}") - } + if let Err(err) = forward_mail_from_stdin() { + error!("proxmox-mail-forward could not forward email: {err:#}"); } } -- 2.47.3