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 5496F1FF348 for ; Wed, 17 Apr 2024 16:35:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 61B8AB088; Wed, 17 Apr 2024 16:35:27 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Wed, 17 Apr 2024 16:34:36 +0200 Message-Id: <20240417143514.346233-6-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240417143514.346233-1-l.wagner@proxmox.com> References: <20240417143514.346233-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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 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 05/43] notify: sys: move 'email' module from proxmox_sys to proxmox_notify 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" Now that PBS stopped using the proxmox_sys::email module due to the switch to proxmox_notify, we can move the email module to proxmox_notify to make the proxmox_sys crate a bit leaner. Signed-off-by: Lukas Wagner --- proxmox-notify/Cargo.toml | 3 ++- proxmox-notify/src/endpoints/common/mod.rs | 3 +++ .../src/endpoints/common/sendmail_impl.rs | 10 ++++++---- proxmox-notify/src/endpoints/sendmail.rs | 5 +++-- proxmox-sys/src/lib.rs | 1 - 5 files changed, 14 insertions(+), 8 deletions(-) rename proxmox-sys/src/email.rs => proxmox-notify/src/endpoints/common/sendmail_impl.rs (96%) diff --git a/proxmox-notify/Cargo.toml b/proxmox-notify/Cargo.toml index 3a97847..0156fe6 100644 --- a/proxmox-notify/Cargo.toml +++ b/proxmox-notify/Cargo.toml @@ -9,6 +9,7 @@ exclude.workspace = true [dependencies] anyhow.workspace = true +base64 = { workspace = true, optional = true } const_format.workspace = true handlebars = { workspace = true } lettre = { workspace = true, optional = true } @@ -32,7 +33,7 @@ proxmox-uuid = { workspace = true, features = ["serde"] } [features] default = ["sendmail", "gotify", "smtp"] mail-forwarder = ["dep:mail-parser", "dep:proxmox-sys"] -sendmail = ["dep:proxmox-sys"] +sendmail = ["dep:base64"] gotify = ["dep:proxmox-http"] pve-context = ["dep:proxmox-sys"] pbs-context = ["dep:proxmox-sys"] diff --git a/proxmox-notify/src/endpoints/common/mod.rs b/proxmox-notify/src/endpoints/common/mod.rs index 60e0761..561b138 100644 --- a/proxmox-notify/src/endpoints/common/mod.rs +++ b/proxmox-notify/src/endpoints/common/mod.rs @@ -1,2 +1,5 @@ #[cfg(any(feature = "sendmail", feature = "smtp"))] pub(crate) mod mail; + +#[cfg(feature = "sendmail")] +pub(crate) mod sendmail_impl; diff --git a/proxmox-sys/src/email.rs b/proxmox-notify/src/endpoints/common/sendmail_impl.rs similarity index 96% rename from proxmox-sys/src/email.rs rename to proxmox-notify/src/endpoints/common/sendmail_impl.rs index 85d171d..1499400 100644 --- a/proxmox-sys/src/email.rs +++ b/proxmox-notify/src/endpoints/common/sendmail_impl.rs @@ -3,14 +3,14 @@ use std::io::Write; use std::process::{Command, Stdio}; -use anyhow::{bail, format_err, Error}; +use anyhow::{bail, Error}; /// Sends multi-part mail with text and/or html to a list of recipients /// /// Includes the header `Auto-Submitted: auto-generated`, so that auto-replies /// (i.e. OOO replies) won't trigger. /// ``sendmail`` is used for sending the mail. -pub fn sendmail( +pub(crate) fn sendmail( mailto: &[&str], subject: &str, text: Option<&str>, @@ -114,12 +114,14 @@ pub fn sendmail( /// /// ``sendmail`` is used for sending the mail, thus `message` must be /// compatible with that (the message is piped into stdin unmodified). -pub fn forward( +#[cfg(feature = "mail-forwarder")] +pub(crate) fn forward( mailto: &[&str], mailfrom: &str, message: &[u8], uid: Option, ) -> Result<(), Error> { + use anyhow::format_err; use std::os::unix::process::CommandExt; if mailto.is_empty() { @@ -162,7 +164,7 @@ pub fn forward( #[cfg(test)] mod test { - use crate::email::sendmail; + use super::*; #[test] fn email_without_recipients() { diff --git a/proxmox-notify/src/endpoints/sendmail.rs b/proxmox-notify/src/endpoints/sendmail.rs index da0c0cc..a8efd32 100644 --- a/proxmox-notify/src/endpoints/sendmail.rs +++ b/proxmox-notify/src/endpoints/sendmail.rs @@ -4,6 +4,7 @@ use proxmox_schema::api_types::COMMENT_SCHEMA; use proxmox_schema::{api, Updater}; use crate::context; +use crate::endpoints::common; use crate::endpoints::common::mail; use crate::renderer::TemplateType; use crate::schema::{EMAIL_SCHEMA, ENTITY_NAME_SCHEMA, USER_SCHEMA}; @@ -133,7 +134,7 @@ impl Endpoint for SendmailEndpoint { .clone() .unwrap_or_else(|| context().default_sendmail_author()); - proxmox_sys::email::sendmail( + common::sendmail_impl::sendmail( &recipients_str, &subject, Some(&text_part), @@ -145,7 +146,7 @@ impl Endpoint for SendmailEndpoint { } #[cfg(feature = "mail-forwarder")] Content::ForwardedMail { raw, uid, .. } => { - proxmox_sys::email::forward(&recipients_str, &mailfrom, raw, *uid) + common::sendmail_impl::forward(&recipients_str, &mailfrom, raw, *uid) .map_err(|err| Error::NotifyFailed(self.config.name.clone(), err.into())) } } diff --git a/proxmox-sys/src/lib.rs b/proxmox-sys/src/lib.rs index 8ea7073..e0c14ba 100644 --- a/proxmox-sys/src/lib.rs +++ b/proxmox-sys/src/lib.rs @@ -4,7 +4,6 @@ pub mod boot_mode; pub mod command; #[cfg(feature = "crypt")] pub mod crypt; -pub mod email; pub mod error; pub mod fd; pub mod fs; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel