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 DAC561FF13B for ; Wed, 25 Mar 2026 14:15:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04EB918ECE; Wed, 25 Mar 2026 14:15:18 +0100 (CET) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox v2 03/16] notify: smtp: Factor out transport building logic Date: Wed, 25 Mar 2026 14:14:31 +0100 Message-ID: <20260325131444.366808-4-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260325131444.366808-1-a.bied-charreton@proxmox.com> References: <20260325131444.366808-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.091 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 Message-ID-Hash: H2BNJODN7S7RXNM3IRFJ7MLZGR3SODBN X-Message-ID-Hash: H2BNJODN7S7RXNM3IRFJ7MLZGR3SODBN X-MailFrom: abied-charreton@jett.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: As a preparatory step for introducing XOAUTH2 support, which will make the transport building logic more complex, factor out the transport building into its own function. Signed-off-by: Arthur Bied-Charreton --- proxmox-notify/src/endpoints/smtp.rs | 44 ++++++++++++++++------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/proxmox-notify/src/endpoints/smtp.rs b/proxmox-notify/src/endpoints/smtp.rs index 172bcdba..48fdbd8f 100644 --- a/proxmox-notify/src/endpoints/smtp.rs +++ b/proxmox-notify/src/endpoints/smtp.rs @@ -161,6 +161,30 @@ pub struct SmtpEndpoint { pub private_config: SmtpPrivateConfig, } +impl SmtpEndpoint { + fn build_transport(&self, tls: Tls, port: u16) -> Result { + let mut transport_builder = SmtpTransport::builder_dangerous(&self.config.server) + .tls(tls) + .port(port) + .timeout(Some(Duration::from_secs(SMTP_TIMEOUT.into()))); + + if let Some(username) = self.config.username.as_deref() { + if let Some(password) = self.private_config.password.as_deref() { + transport_builder = transport_builder.credentials((username, password).into()); + } else { + return Err(Error::NotifyFailed( + self.name().into(), + Box::new(Error::Generic( + "username is set but no password was provided".to_owned(), + )), + )); + } + }; + + Ok(transport_builder.build()) + } +} + impl Endpoint for SmtpEndpoint { fn send(&self, notification: &Notification) -> Result<(), Error> { let tls_parameters = TlsParameters::new(self.config.server.clone()) @@ -181,25 +205,7 @@ impl Endpoint for SmtpEndpoint { } }; - let mut transport_builder = SmtpTransport::builder_dangerous(&self.config.server) - .tls(tls) - .port(port) - .timeout(Some(Duration::from_secs(SMTP_TIMEOUT.into()))); - - if let Some(username) = self.config.username.as_deref() { - if let Some(password) = self.private_config.password.as_deref() { - transport_builder = transport_builder.credentials((username, password).into()); - } else { - return Err(Error::NotifyFailed( - self.name().into(), - Box::new(Error::Generic( - "username is set but no password was provided".to_owned(), - )), - )); - } - } - - let transport = transport_builder.build(); + let transport = self.build_transport(tls, port)?; let recipients = mail::get_recipients( self.config.mailto.as_slice(), -- 2.47.3