public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
To: Lukas Wagner <l.wagner@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [PATCH proxmox-perl-rs 1/1] notify (smtp): add oauth2 parameters to bindings
Date: Mon, 23 Mar 2026 17:44:15 +0100	[thread overview]
Message-ID: <oqq5hzgn6gzw7k7m7nqt6zayw5lg2n37abywax6ol7kdx65od7@dlql5yc4kcjj> (raw)
In-Reply-To: <DHA5SHDM6BCI.XPD3SWDT8H97@proxmox.com>

On Mon, Mar 23, 2026 at 01:26:20PM +0100, Lukas Wagner wrote:
> On Fri Feb 13, 2026 at 5:04 PM CET, Arthur Bied-Charreton wrote:
> > Update SMTP bindings to take the Smtp(Private)?Config structs directly,
> > and additionally the OAuth2 refresh token.
> 
> The commit message should probably go into more detail on *why* we now
> use the struct itself instead of enumerating all parameters in the
> function signature.
> 
ACK
> The addition of 'trigger_state_refresh' should probably its own commit.
> The change of parameters for the existing functions is a breaking
> change, so I think it would be nice to have these separated from the
> addition of this new function.
> 
ACK, will split this commit
> >
> > Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
> > ---
> >  common/src/bindings/notify.rs | 82 ++++++++++++-----------------------
> >  1 file changed, 28 insertions(+), 54 deletions(-)
> >
> > diff --git a/common/src/bindings/notify.rs b/common/src/bindings/notify.rs
> > index 409270a..137cc79 100644
> > --- a/common/src/bindings/notify.rs
> > +++ b/common/src/bindings/notify.rs
> > @@ -12,7 +12,7 @@ pub mod proxmox_rs_notify {
> >      use std::collections::HashMap;
> >      use std::sync::Mutex;
> >  
> > -    use anyhow::{Error, bail};
> > +    use anyhow::{bail, Error};
> >      use serde_json::Value as JSONValue;
> >  
> >      use perlmod::Value;
> > @@ -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::{
> > @@ -36,7 +36,7 @@ pub mod proxmox_rs_notify {
> >          CalendarMatcher, DeleteableMatcherProperty, FieldMatcher, MatchModeOperator, MatcherConfig,
> >          MatcherConfigUpdater, SeverityMatcher,
> >      };
> > -    use proxmox_notify::{Config, Notification, Severity, api};
> > +    use proxmox_notify::{api, Config, Notification, Severity};
> >  
> >      /// A notification catalog instance.
> >      ///
> > @@ -141,6 +141,19 @@ pub mod proxmox_rs_notify {
> >          api::common::send(&config, &notification)
> >      }
> >  
> > +    /// Method: Refresh the state for all endpoints.
> > +    ///
> > +    /// This iterates through all configured targets, refreshing their state if needed.
> > +    ///
> > +    /// See [`api::common::refresh_targets`]
> > +    #[export(serialize_error)]
> > +    pub fn trigger_state_refresh(
> > +        #[try_from_ref] this: &NotificationConfig,
> > +    ) -> Result<(), HttpError> {
> > +        let config = this.config.lock().unwrap();
> > +        api::common::trigger_state_refresh(&config)
> > +    }
> > +
> >      /// Method: Get a list of all notification targets.
> >      ///
> >      /// See [`api::get_targets`].
> > @@ -390,37 +403,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<u16>,
> > -        mode: Option<SmtpMode>,
> > -        username: Option<String>,
> > -        password: Option<String>,
> > -        mailto: Option<Vec<String>>,
> > -        mailto_user: Option<Vec<String>>,
> > -        from_address: String,
> > -        author: Option<String>,
> > -        comment: Option<String>,
> > -        disable: Option<bool>,
> > +        smtp_config: SmtpConfig,
> > +        smtp_private_config: SmtpPrivateConfig,
> > +        oauth2_refresh_token: Option<String>,
> >      ) -> 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 +424,9 @@ pub mod proxmox_rs_notify {
> >      pub fn update_smtp_endpoint(
> >          #[try_from_ref] this: &NotificationConfig,
> >          name: &str,
> > -        server: Option<String>,
> > -        port: Option<u16>,
> > -        mode: Option<SmtpMode>,
> > -        username: Option<String>,
> > -        password: Option<String>,
> > -        mailto: Option<Vec<String>>,
> > -        mailto_user: Option<Vec<String>>,
> > -        from_address: Option<String>,
> > -        author: Option<String>,
> > -        comment: Option<String>,
> > -        disable: Option<bool>,
> > +        smtp_config_updater: SmtpConfigUpdater,
> > +        smtp_private_config_updater: SmtpPrivateConfigUpdater,
> > +        oauth2_refresh_token: Option<String>,
> >          delete: Option<Vec<DeleteableSmtpProperty>>,
> >          digest: Option<&str>,
> >      ) -> Result<(), HttpError> {
> > @@ -452,19 +436,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(),
> >          )
> 
> I wondered (and we shortly discussed off-list) whether it would make
> sense to keep the existing functions as is and then add two *new*
> functions which offer the 'new' struct/hash-based API.
> 
> It would have the benefit of being a non-breaking change which would
> ease life for maintainers a bit, but then on the other hand it's also a
> bit weird since we'd want to remove the old functions pretty soon anyway
> -- we have only one caller to worry about anyway.
> 
> When removing the old variants we'd have to bump the version contraints
> anyway, so in reality, it does not help that much. So after some
> thought, I think the current approach is fine.
Yes, I agree, as discussed off-list, the naming for those new functions
would be quite awkward ^^ 

I will make the breaking change clear in the commit message for v2




  reply	other threads:[~2026-03-23 16:44 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-13 16:03 [PATCH cluster/docs/manager/proxmox{,-perl-rs,-widget-toolkit} 00/17] fix #7238: Add XOAUTH2 authentication support for SMTP notification targets Arthur Bied-Charreton
2026-02-13 16:03 ` [PATCH proxmox 1/7] notify (smtp): Introduce xoauth2 module Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH proxmox 2/7] notify (smtp): Introduce state module Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-03-23 16:32     ` Arthur Bied-Charreton
2026-03-24  8:50     ` Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH proxmox 3/7] notify (smtp): Factor out transport building logic into own function Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH proxmox 4/7] notify (smtp): Update API with OAuth2 parameters Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH proxmox 5/7] notify (smtp): Add state handling logic Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-02-13 16:04 ` [PATCH proxmox 6/7] notify (smtp): Add XOAUTH2 authentication support Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-02-13 16:04 ` [PATCH proxmox 7/7] notify (smtp): Add logging and state-related error types Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-02-13 16:04 ` [PATCH proxmox-perl-rs 1/1] notify (smtp): add oauth2 parameters to bindings Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-03-23 16:44     ` Arthur Bied-Charreton [this message]
2026-02-13 16:04 ` [PATCH proxmox-widget-toolkit 1/2] utils: Add OAuth2 flow handlers Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-02-13 16:04 ` [PATCH proxmox-widget-toolkit 2/2] notifications: Add opt-in OAuth2 support for SMTP targets Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-03-23 16:49     ` Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH pve-manager 1/5] notifications: Add OAuth2 parameters to schema and add/update endpoints Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-02-13 16:04 ` [PATCH pve-manager 2/5] notifications: Add trigger-state-refresh endpoint Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-02-13 16:04 ` [PATCH pve-manager 3/5] notifications: Trigger notification target refresh in pveupdate Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH pve-manager 4/5] notifications: Handle OAuth2 callback in login handler Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH pve-manager 5/5] notifications: Opt into OAuth2 authentication Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH pve-cluster 1/1] notifications: Add refresh_targets subroutine to PVE::Notify Arthur Bied-Charreton
2026-03-23 12:26   ` Lukas Wagner
2026-03-23 16:54     ` Arthur Bied-Charreton
2026-02-13 16:04 ` [PATCH pve-docs 1/1] notifications: Add section about OAuth2 to SMTP targets docs Arthur Bied-Charreton
2026-03-23 12:25 ` [PATCH cluster/docs/manager/proxmox{,-perl-rs,-widget-toolkit} 00/17] fix #7238: Add XOAUTH2 authentication support for SMTP notification targets Lukas Wagner
2026-03-25 13:16 ` superseded: " 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=oqq5hzgn6gzw7k7m7nqt6zayw5lg2n37abywax6ol7kdx65od7@dlql5yc4kcjj \
    --to=a.bied-charreton@proxmox.com \
    --cc=l.wagner@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal