all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Shan Shaji <s.shaji@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [PATCH datacenter-manager v3 2/6] server: api: add support to optionally delete token from remote
Date: Wed, 11 Feb 2026 16:20:11 +0100	[thread overview]
Message-ID: <20260211152016.445817-3-s.shaji@proxmox.com> (raw)
In-Reply-To: <20260211152016.445817-1-s.shaji@proxmox.com>

Previously, when removing a remote, the token was still present in the
remote configuration. When users tried to add the remote again, they
received an error because a token with the same name already existed.
To support deleting the token from the remote, add an optional
parameter to the API endpoint.

Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---

changes since v2: No changes. 
changes since v1:
 - nit: inlined the id argument using the format string.
 - used `get` instead of `get_mut` inorder to access remote.
 - removed unnecessary `&` operator use.

 server/src/api/remotes.rs | 46 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/server/src/api/remotes.rs b/server/src/api/remotes.rs
index 298ad13..82b8469 100644
--- a/server/src/api/remotes.rs
+++ b/server/src/api/remotes.rs
@@ -27,6 +27,7 @@ use crate::api::remote_updates;
 use crate::metric_collection;
 use crate::{connection, pbs_client};
 
+use super::pbs;
 use super::pve;
 use super::rrd_common;
 use super::rrd_common::DataPoint;
@@ -292,16 +293,57 @@ pub fn update_remote(
     input: {
         properties: {
             id: { schema: REMOTE_ID_SCHEMA },
+            "delete-token": {
+                type: bool,
+                description: "Optional boolean value to delete the token from remote.",
+                optional: true,
+            }
         },
     },
     access: {
         permission: &Permission::Privilege(&["resource"], PRIV_RESOURCE_MODIFY, false),
     },
 )]
-/// List all the remotes this instance is managing.
-pub fn remove_remote(id: String) -> Result<(), Error> {
+/// Remove a remote that this instance is managing.
+pub async fn remove_remote(id: String, delete_token: Option<bool>) -> Result<(), Error> {
+    let _lock = pdm_config::remotes::lock_config()?;
     let (mut remotes, _) = pdm_config::remotes::config()?;
 
+    if delete_token.unwrap_or(false) {
+        let remote = remotes
+            .get(&id)
+            .ok_or_else(|| http_err!(NOT_FOUND, "no such remote {id:?}"))?;
+
+        let user = remote.authid.user();
+
+        let short_delete_err = |err: proxmox_client::Error| {
+            format_err!("error deleting token: {}", err.source().unwrap_or(&err))
+        };
+
+        let token_name = remote
+            .authid
+            .tokenname()
+            .ok_or_else(|| format_err!("Unable to find the token for the remote {id:?}"))?;
+
+        // connect to remote and delete the already existing token.
+        match remote.ty {
+            RemoteType::Pve => {
+                let client = pve::connect_or_login(remote).await?;
+                client
+                    .delete_token(user.as_str(), token_name.as_str())
+                    .await
+                    .map_err(short_delete_err)?
+            }
+            RemoteType::Pbs => {
+                let client = pbs::connect_or_login(remote).await?;
+                client
+                    .delete_admin_token(user, token_name.as_str())
+                    .await
+                    .map_err(short_delete_err)?
+            }
+        };
+    }
+
     if remotes.remove(&id).is_none() {
         http_bail!(NOT_FOUND, "no such entry {id:?}");
     }
-- 
2.47.3





  parent reply	other threads:[~2026-02-11 15:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-11 15:20 [PATCH datacenter-manager/proxmox v3 0/7] fix #6914: add option to remove already existing token Shan Shaji
2026-02-11 15:20 ` [PATCH datacenter-manager v3 1/6] server: pbs-client: add delete admin token method Shan Shaji
2026-02-13 13:20   ` Lukas Wagner
2026-02-11 15:20 ` Shan Shaji [this message]
2026-02-13 13:20   ` [PATCH datacenter-manager v3 2/6] server: api: add support to optionally delete token from remote Lukas Wagner
2026-02-18  8:38   ` Maximiliano Sandoval
2026-02-11 15:20 ` [PATCH datacenter-manager v3 3/6] pdm-client: accept `delete-token` argument for deleting api token Shan Shaji
2026-02-13 13:20   ` Lukas Wagner
2026-02-11 15:20 ` [PATCH datacenter-manager v3 4/6] cli: client: add `delete-token` option to delete token from remote Shan Shaji
2026-02-13 13:21   ` Lukas Wagner
2026-02-11 15:20 ` [PATCH datacenter-manager v3 5/6] fix: ui: add remove confirmation dialog with optional token deletion Shan Shaji
2026-02-13 13:21   ` Lukas Wagner
2026-02-11 15:20 ` [PATCH datacenter-manager v3 6/6] cli: admin: add `delete-token` option to delete token from remote Shan Shaji
2026-02-13 13:21   ` Lukas Wagner
2026-02-11 15:20 ` [PATCH proxmox v3 1/1] pve-api-types: generate missing `delete_token` method Shan Shaji
2026-02-18 17:55   ` Shan Shaji
2026-02-13 13:19 ` [PATCH datacenter-manager/proxmox v3 0/7] fix #6914: add option to remove already existing token Lukas Wagner

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=20260211152016.445817-3-s.shaji@proxmox.com \
    --to=s.shaji@proxmox.com \
    --cc=pdm-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal