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 216681FF141 for ; Tue, 05 May 2026 10:36:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 53E1C1C9E3; Tue, 5 May 2026 10:34:02 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-perl-rs v5 10/27] pve-rs: notify: smtp: add OAuth2 parameters to bindings Date: Tue, 5 May 2026 10:32:31 +0200 Message-ID: <20260505083248.36450-11-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260505083248.36450-1-a.bied-charreton@proxmox.com> References: <20260505083248.36450-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.114 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: GEEGD5QXKBIFGYVH7BQLJG57GYS5VBLQ X-Message-ID-Hash: GEEGD5QXKBIFGYVH7BQLJG57GYS5VBLQ 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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Update the proxmox-notify SMTP API bindings with the OAuth2 parameters. While touching this code, it made sense to change the bindings' signatures to take the whole config hashes, as opposed to an ever growing list of single parameters. This has the advantage of reducing churn in the bindings when new fields are added to the SmtpConfig structs, as well as getting rid of possible errors that could occur due to passing parameters in the wrong order from Perl code. Note that this is a breaking change to the internal API, the calling code in pve-manager needs to be updated along with these bindings. `oauth2_refresh_token` is passed as a standalone parameter, rather than as part of SmtpPrivateConfig because it lives in a per-endpoint state file that proxmox-notify manages, not in the notifications config. Signed-off-by: Arthur Bied-Charreton Reviewed-by: Lukas Wagner --- common/src/bindings/notify.rs | 65 +++++++---------------------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/common/src/bindings/notify.rs b/common/src/bindings/notify.rs index 409270a..ff1e6cf 100644 --- a/common/src/bindings/notify.rs +++ b/common/src/bindings/notify.rs @@ -26,7 +26,7 @@ pub mod proxmox_rs_notify { DeleteableSendmailProperty, SendmailConfig, SendmailConfigUpdater, }; use proxmox_notify::endpoints::smtp::{ - DeleteableSmtpProperty, SmtpConfig, SmtpConfigUpdater, SmtpMode, SmtpPrivateConfig, + DeleteableSmtpProperty, SmtpConfig, SmtpConfigUpdater, SmtpPrivateConfig, SmtpPrivateConfigUpdater, }; use proxmox_notify::endpoints::webhook::{ @@ -390,37 +390,16 @@ pub mod proxmox_rs_notify { #[allow(clippy::too_many_arguments)] pub fn add_smtp_endpoint( #[try_from_ref] this: &NotificationConfig, - name: String, - server: String, - port: Option, - mode: Option, - username: Option, - password: Option, - mailto: Option>, - mailto_user: Option>, - from_address: String, - author: Option, - comment: Option, - disable: Option, + smtp_config: SmtpConfig, + smtp_private_config: SmtpPrivateConfig, + oauth2_refresh_token: Option, ) -> Result<(), HttpError> { let mut config = this.config.lock().unwrap(); api::smtp::add_endpoint( &mut config, - SmtpConfig { - name: name.clone(), - server, - port, - mode, - username, - mailto: mailto.unwrap_or_default(), - mailto_user: mailto_user.unwrap_or_default(), - from_address, - author, - comment, - disable, - origin: None, - }, - SmtpPrivateConfig { name, password }, + smtp_config, + smtp_private_config, + oauth2_refresh_token, ) } @@ -432,17 +411,9 @@ pub mod proxmox_rs_notify { pub fn update_smtp_endpoint( #[try_from_ref] this: &NotificationConfig, name: &str, - server: Option, - port: Option, - mode: Option, - username: Option, - password: Option, - mailto: Option>, - mailto_user: Option>, - from_address: Option, - author: Option, - comment: Option, - disable: Option, + smtp_config_updater: SmtpConfigUpdater, + smtp_private_config_updater: SmtpPrivateConfigUpdater, + oauth2_refresh_token: Option, delete: Option>, digest: Option<&str>, ) -> Result<(), HttpError> { @@ -452,19 +423,9 @@ pub mod proxmox_rs_notify { api::smtp::update_endpoint( &mut config, name, - SmtpConfigUpdater { - server, - port, - mode, - username, - mailto, - mailto_user, - from_address, - author, - comment, - disable, - }, - SmtpPrivateConfigUpdater { password }, + smtp_config_updater, + smtp_private_config_updater, + oauth2_refresh_token, delete.as_deref(), digest.as_deref(), ) -- 2.47.3