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 80E7E1FF136 for ; Mon, 23 Mar 2026 13:26:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04E4A15E62; Mon, 23 Mar 2026 13:26:51 +0100 (CET) Content-Type: text/plain; charset=UTF-8 Date: Mon, 23 Mar 2026 13:26:12 +0100 Message-Id: Subject: Re: [PATCH proxmox 6/7] notify (smtp): Add XOAUTH2 authentication support From: "Lukas Wagner" To: "Arthur Bied-Charreton" , Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 X-Mailer: aerc 0.21.0-0-g5549850facc2-dirty References: <20260213160415.609868-1-a.bied-charreton@proxmox.com> <20260213160415.609868-7-a.bied-charreton@proxmox.com> In-Reply-To: <20260213160415.609868-7-a.bied-charreton@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774268726283 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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 Message-ID-Hash: OHTYDON6HMV7Q35LK2Y6IBRRYBX57KXS X-Message-ID-Hash: OHTYDON6HMV7Q35LK2Y6IBRRYBX57KXS 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: On Fri Feb 13, 2026 at 5:04 PM CET, Arthur Bied-Charreton wrote: > Extend the transport building logic to authenticate via XOAUTH2 if > configured, and manage the related state updates. > > Signed-off-by: Arthur Bied-Charreton > --- > proxmox-notify/src/endpoints/smtp.rs | 81 +++++++++++++++++++++++----- > proxmox-notify/src/lib.rs | 4 +- > 2 files changed, 70 insertions(+), 15 deletions(-) > > diff --git a/proxmox-notify/src/endpoints/smtp.rs b/proxmox-notify/src/en= dpoints/smtp.rs > index 244799fd..4364bd11 100644 > --- a/proxmox-notify/src/endpoints/smtp.rs > +++ b/proxmox-notify/src/endpoints/smtp.rs > @@ -202,7 +202,7 @@ pub struct SmtpPrivateConfig { > pub oauth2_client_secret: Option, > } > =20 > -/// A sendmail notification endpoint. > +/// A SMTP notification endpoint. > pub struct SmtpEndpoint { > pub config: SmtpConfig, > pub private_config: SmtpPrivateConfig, > @@ -246,22 +246,79 @@ impl SmtpEndpoint { > } > } > =20 > + /// Infer the auth method based on the presence of a password field = in the private config. > + /// > + /// This is required for backwards compatibility for configs created= before the `auth_method` > + /// field was added, i.e., the presence of a password implicitly mea= nt plain authentication > + /// was to be used. > + fn auth_method(&self) -> Option { > + self.config.auth_method.or_else(|| { > + if self.private_config.password.is_some() { > + Some(SmtpAuthMethod::Plain) > + } else { > + None > + } > + }) > + } > + > + /// Build an [`SmtpTransport`]. > + /// > + /// If OAuth2 authentication is configured, this method will additio= nally load, > + /// update and store the OAuth2-related state for this endpoint. > fn build_transport(&self, tls: Tls, port: u16) -> Result { > - let mut transport_builder =3D SmtpTransport::builder_dangerous(&= self.config.server) > + let transport_builder =3D SmtpTransport::builder_dangerous(&self= .config.server) > .tls(tls) > .port(port) > .timeout(Some(Duration::from_secs(SMTP_TIMEOUT.into()))); > =20 > - if let Some(username) =3D self.config.username.as_deref() { > - if let Some(password) =3D self.private_config.password.as_de= ref() { > - transport_builder =3D transport_builder.credentials((use= rname, password).into()); > - } else { > - return Err(Error::NotifyFailed( > - self.name().into(), > - Box::new(Error::Generic( > - "username is set but no password was provided".t= o_owned(), > - )), > - )); > + let transport_builder =3D match &self.auth_method() { > + None =3D> transport_builder, > + Some(SmtpAuthMethod::Plain) =3D> match ( > + self.config.username.as_deref(), > + self.private_config.password.as_deref(), > + ) { > + (Some(username), Some(password)) =3D> { > + transport_builder.credentials((username, password).i= nto()) > + } > + (Some(_), None) =3D> { > + return Err(Error::NotifyFailed( > + self.name().into(), > + Box::new(Error::Generic( > + "username is set but no password was provide= d".to_owned(), > + )), > + )) > + } > + _ =3D> transport_builder, > + }, > + Some(method) =3D> { > + let state =3D State::load(self.name())?; > + > + let refresh_token =3D > + state > + .oauth2_refresh_token > + .clone() > + .ok_or(Error::NotifyFailed( > + self.name().into(), > + Box::new(Error::Generic("no refresh token fo= und".into())), > + ))?; > + let token_exchange_result =3D self.get_access_token(&ref= resh_token, method)?; > + > + state > + .set_oauth2_refresh_token(Some( > + token_exchange_result > + .refresh_token > + .map(|t| t.into_secret()) > + .unwrap_or_else(|| refresh_token), > + )) > + .set_last_refreshed(proxmox_time::epoch_i64()) > + .store(self.name())?; > + > + transport_builder > + .credentials(Credentials::new( > + self.config.from_address.to_owned(), > + token_exchange_result.access_token.into_secret()= , > + )) > + .authentication(vec![Mechanism::Xoauth2]) > } > }; > =20 > diff --git a/proxmox-notify/src/lib.rs b/proxmox-notify/src/lib.rs > index c1a5e535..996393c2 100644 > --- a/proxmox-notify/src/lib.rs > +++ b/proxmox-notify/src/lib.rs > @@ -557,9 +557,7 @@ impl Bus { > } > =20 > match endpoint.send(notification) { > - Ok(_) =3D> { > - info!("notified via target `{name}`"); > - } > + Ok(_) =3D> info!("notified via target `{name}`"), Unrelated change, if this the result of a `cargo fmt`, maybe move to a separate commit at the start of the series? > Err(e) =3D> { > // Only log on errors, do not propagate fail to = the caller. > error!("could not notify via target `{name}`: {e= }");