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 A16101FF141 for ; Tue, 05 May 2026 10:41:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B75B1E94D; Tue, 5 May 2026 10:41:47 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Subject: [PATCH pve-manager v5 16/27] notifications: smtp: api: add XOAUTH2 parameters Date: Tue, 5 May 2026 10:32:37 +0200 Message-ID: <20260505083248.36450-17-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.110 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: C66BCJZM2VTW46QO3PZA54J3IVHXCFFG X-Message-ID-Hash: C66BCJZM2VTW46QO3PZA54J3IVHXCFFG 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: Add auth-method, oauth2-client-id, oauth2-client-secret, oauth2-tenant-id and oauth2-refresh-token parameters to prepare for XOAUTH2 support. The authentication method was previously implicit and inferred by proxmox-notify based on the presence of a password. It is now made explicit, however still kept optional and inferred in the {update,create}_endpoint handlers to avoid breaking the API. The calls to {add,update}_smtp_endpoint are updated to pass the configs as hashes instead of flat parameter lists, following the API changes in proxmox-perl-rs. Signed-off-by: Arthur Bied-Charreton --- PVE/API2/Cluster/Notifications.pm | 102 +++++++++++++++++++++++------- 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm index 8b455227..8e118483 100644 --- a/PVE/API2/Cluster/Notifications.pm +++ b/PVE/API2/Cluster/Notifications.pm @@ -941,6 +941,13 @@ my $smtp_properties = { default => 'tls', optional => 1, }, + 'auth-method' => { + description => + 'Determine which authentication method shall be used for the connection.', + type => 'string', + enum => [qw(google-oauth2 microsoft-oauth2 plain)], + optional => 1, + }, username => { description => 'Username for SMTP authentication', type => 'string', @@ -951,6 +958,26 @@ my $smtp_properties = { type => 'string', optional => 1, }, + 'oauth2-client-id' => { + description => 'OAuth2 client ID', + type => 'string', + optional => 1, + }, + 'oauth2-client-secret' => { + description => 'OAuth2 client secret', + type => 'string', + optional => 1, + }, + 'oauth2-tenant-id' => { + description => 'OAuth2 tenant ID, only required for Microsoft OAuth2 endpoints', + type => 'string', + optional => 1, + }, + 'oauth2-refresh-token' => { + description => 'OAuth2 refresh token', + type => 'string', + optional => 1, + }, mailto => { type => 'array', items => { @@ -1108,6 +1135,11 @@ __PACKAGE__->register_method({ my $mode = extract_param($param, 'mode'); my $username = extract_param($param, 'username'); my $password = extract_param($param, 'password'); + my $auth_method = extract_param($param, 'auth-method'); + my $oauth2_client_secret = extract_param($param, 'oauth2-client-secret'); + my $oauth2_client_id = extract_param($param, 'oauth2-client-id'); + my $oauth2_tenant_id = extract_param($param, 'oauth2-tenant-id'); + my $oauth2_refresh_token = extract_param($param, 'oauth2-refresh-token'); my $mailto = extract_param($param, 'mailto'); my $mailto_user = extract_param($param, 'mailto-user'); my $from_address = extract_param($param, 'from-address'); @@ -1120,18 +1152,28 @@ __PACKAGE__->register_method({ my $config = PVE::Notify::read_config(); $config->add_smtp_endpoint( - $name, - $server, - $port, - $mode, - $username, - $password, - $mailto, - $mailto_user, - $from_address, - $author, - $comment, - $disable, + { + name => $name, + server => $server, + port => $port, + mode => $mode, + username => $username, + 'auth-method' => $auth_method, + 'oauth2-client-id' => $oauth2_client_id, + 'oauth2-tenant-id' => $oauth2_tenant_id, + mailto => defined($mailto) ? $mailto : [], + 'mailto-user' => defined($mailto_user) ? $mailto_user : [], + 'from-address' => $from_address, + author => $author, + comment => $comment, + disable => $disable, + }, + { + name => $name, + password => $password, + 'oauth2-client-secret' => $oauth2_client_secret, + }, + $oauth2_refresh_token, ); PVE::Notify::write_config($config); @@ -1187,6 +1229,11 @@ __PACKAGE__->register_method({ my $mode = extract_param($param, 'mode'); my $username = extract_param($param, 'username'); my $password = extract_param($param, 'password'); + my $auth_method = extract_param($param, 'auth-method'); + my $oauth2_client_secret = extract_param($param, 'oauth2-client-secret'); + my $oauth2_client_id = extract_param($param, 'oauth2-client-id'); + my $oauth2_tenant_id = extract_param($param, 'oauth2-tenant-id'); + my $oauth2_refresh_token = extract_param($param, 'oauth2-refresh-token'); my $mailto = extract_param($param, 'mailto'); my $mailto_user = extract_param($param, 'mailto-user'); my $from_address = extract_param($param, 'from-address'); @@ -1203,17 +1250,26 @@ __PACKAGE__->register_method({ $config->update_smtp_endpoint( $name, - $server, - $port, - $mode, - $username, - $password, - $mailto, - $mailto_user, - $from_address, - $author, - $comment, - $disable, + { + server => $server, + port => $port, + mode => $mode, + username => $username, + 'auth-method' => $auth_method, + 'oauth2-client-id' => $oauth2_client_id, + 'oauth2-tenant-id' => $oauth2_tenant_id, + mailto => $mailto, + 'mailto-user' => $mailto_user, + 'from-address' => $from_address, + author => $author, + comment => $comment, + disable => $disable, + }, + { + password => $password, + 'oauth2-client-secret' => $oauth2_client_secret, + }, + $oauth2_refresh_token, $delete, $digest, ); -- 2.47.3