From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox v6 07/27] notify: smtp: infer auth method for backwards compatibility
Date: Tue, 2 Jun 2026 10:53:59 +0200 [thread overview]
Message-ID: <20260602085419.271767-8-a.bied-charreton@proxmox.com> (raw)
In-Reply-To: <20260602085419.271767-1-a.bied-charreton@proxmox.com>
If not set, infer the auth_method SmtpConfig field from the presence
of a password in the config. This makes sure the new API stays
backwards-compatible with old scripts and updates old configurations
when they are edited.
Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
proxmox-notify/src/api/smtp.rs | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/proxmox-notify/src/api/smtp.rs b/proxmox-notify/src/api/smtp.rs
index 80f3ede6..86fb0091 100644
--- a/proxmox-notify/src/api/smtp.rs
+++ b/proxmox-notify/src/api/smtp.rs
@@ -57,6 +57,22 @@ fn get_private_config(config: &Config, name: &str) -> Result<SmtpPrivateConfig,
})
}
+/// Before the `auth_method` field was introduced into [`SmtpConfig`], the authentication method
+/// was inferred from the presence of a password in the config.
+///
+/// Infer it in the same way, returning a new [`SmtpConfig`] object that can then be persisted
+/// to migrate old configs.
+fn infer_auth_method(config: SmtpConfig, private_config: SmtpPrivateConfig) -> SmtpConfig {
+ if config.auth_method.is_none() && private_config.password.is_some() {
+ SmtpConfig {
+ auth_method: Some(SmtpAuthMethod::Plain),
+ ..config
+ }
+ } else {
+ config
+ }
+}
+
/// Add a new smtp endpoint.
///
/// The caller is responsible for any needed permission checks.
@@ -92,11 +108,13 @@ pub fn add_endpoint(
super::set_private_config_entry(
config,
- private_endpoint_config,
+ &private_endpoint_config,
SMTP_TYPENAME,
&endpoint_config.name,
)?;
+ let endpoint_config = infer_auth_method(endpoint_config, private_endpoint_config);
+
config
.config
.set_data(&endpoint_config.name, SMTP_TYPENAME, &endpoint_config)
@@ -212,6 +230,8 @@ pub fn update_endpoint(
}
})?;
+ let endpoint = infer_auth_method(endpoint, get_private_config(config, name)?);
+
config
.config
.set_data(name, SMTP_TYPENAME, &endpoint)
--
2.47.3
next prev parent reply other threads:[~2026-06-02 8:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 8:53 [PATCH docs/manager/proxmox{,-perl-rs,-widget-toolkit,-backup} v6 00/27] fix #7238: Add XOAUTH2 authentication support for SMTP notification targets Arthur Bied-Charreton
2026-06-02 8:53 ` [PATCH proxmox v6 01/27] add oauth2 and ureq to workspace dependencies Arthur Bied-Charreton
2026-06-02 8:53 ` [PATCH proxmox v6 02/27] notify: smtp: introduce xoauth2 module Arthur Bied-Charreton
2026-06-02 8:53 ` [PATCH proxmox v6 03/27] notify: smpt: add state management utilities Arthur Bied-Charreton
2026-06-02 8:53 ` [PATCH proxmox v6 04/27] notify: smtp: factor out transport building logic Arthur Bied-Charreton
2026-06-02 8:53 ` [PATCH proxmox v6 05/27] notify: smtp: update API with OAuth2 parameters Arthur Bied-Charreton
2026-06-02 8:53 ` [PATCH proxmox v6 06/27] notify: smtp: add API to exchange authorization code for refresh token Arthur Bied-Charreton
2026-06-02 8:53 ` Arthur Bied-Charreton [this message]
2026-06-02 8:54 ` [PATCH proxmox v6 08/27] notify: smtp: add state handling logic Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox v6 09/27] notify: smtp: add XOAUTH2 authentication support Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-perl-rs v6 10/27] pve-rs: notify: smtp: add OAuth2 parameters to bindings Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-perl-rs v6 11/27] pve-rs: notify: add binding for triggering state refresh Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-perl-rs v6 12/27] pve-rs: notify: add binding for initial OAuth2 refresh token exchange Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-widget-toolkit v6 13/27] utils: add OAuth2 flow handlers Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-widget-toolkit v6 14/27] utils: oauth2: add callback handler Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-widget-toolkit v6 15/27] notifications: add opt-in OAuth2 support for SMTP targets Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH pve-manager v6 16/27] notifications: smtp: api: add XOAUTH2 parameters Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH pve-manager v6 17/27] notifications: add endpoint for initial OAuth2 refresh token exchange Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH pve-manager v6 18/27] pveupdate: refresh notification targets' OAuth2 state Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH pve-manager v6 19/27] login: handle OAuth2 callback Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH pve-manager v6 20/27] fix #7238: notifications: smtp: add XOAUTH2 support Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-backup v6 21/27] notifications: add XOAUTH2 parameters to endpoints Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-backup v6 22/27] notifications: add endpoint for initial OAuth2 refresh token exchange Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-backup v6 23/27] login: handle OAuth2 callback Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-backup v6 24/27] fix #7238: notifications: smtp: add XOAUTH2 support Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-backup v6 25/27] daily-update: refresh OAuth2 state for SMTP notification endpoints Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH proxmox-backup v6 26/27] notifications: add OAuth2 section to SMTP targets docs Arthur Bied-Charreton
2026-06-02 8:54 ` [PATCH pve-docs v6 27/27] " Arthur Bied-Charreton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260602085419.271767-8-a.bied-charreton@proxmox.com \
--to=a.bied-charreton@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox