From: Shan Shaji <s.shaji@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [PATCH datacenter-manager v4 2/6] fix #6914: api: add support to delete token from remote
Date: Wed, 18 Feb 2026 17:41:30 +0100 [thread overview]
Message-ID: <20260218164135.413762-3-s.shaji@proxmox.com> (raw)
In-Reply-To: <20260218164135.413762-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 `delete-token` to the API endpoint which by default will
be `false`.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
changes since v3: Thanks @Lukas
- remove 'type:bool' from the schema.
- change description.
- set `default` to false.
- add comment for the `short-delete_err` function.
- removed {pve,pbs}_connect_or_login function and replaced with
`connection::make_{pve,pbs}_client(remote)`
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..a9d424d 100644
--- a/server/src/api/remotes.rs
+++ b/server/src/api/remotes.rs
@@ -292,16 +292,58 @@ pub fn update_remote(
input: {
properties: {
id: { schema: REMOTE_ID_SCHEMA },
+ "delete-token": {
+ optional: true,
+ default: false,
+ description: "If true, deletes the API token on the remote.",
+ }
},
},
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: bool) -> Result<(), Error> {
+ let _lock = pdm_config::remotes::lock_config()?;
let (mut remotes, _) = pdm_config::remotes::config()?;
+ if delete_token {
+ let remote = remotes
+ .get(&id)
+ .ok_or_else(|| http_err!(NOT_FOUND, "no such remote {id:?}"))?;
+
+ let user = remote.authid.user();
+
+ // With the `Client`'s error type the message gets a bit long, shorten it:
+ 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 = connection::make_pve_client(remote)?;
+ client
+ .delete_token(user.as_str(), token_name.as_str())
+ .await
+ .map_err(short_delete_err)?
+ }
+ RemoteType::Pbs => {
+ let client = connection::make_pbs_client(remote)?;
+ client
+ .delete_token(user, token_name)
+ .await
+ .map_err(short_delete_err)?
+ }
+ };
+ }
+
if remotes.remove(&id).is_none() {
http_bail!(NOT_FOUND, "no such entry {id:?}");
}
--
2.47.3
next prev parent reply other threads:[~2026-02-18 16:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-18 16:41 [PATCH datacenter-manager/proxmox v4 0/7] fix #6914: add option to remove already existing token Shan Shaji
2026-02-18 16:41 ` [PATCH datacenter-manager v4 1/6] server: pbs-client: add method to delete token from remote Shan Shaji
2026-02-18 16:41 ` Shan Shaji [this message]
2026-02-18 16:41 ` [PATCH datacenter-manager v4 3/6] pdm-client: accept `delete-token` argument for deleting api token Shan Shaji
2026-02-18 16:41 ` [PATCH datacenter-manager v4 4/6] fix #6914: cli-client: add option to delete token from remote Shan Shaji
2026-02-18 16:41 ` [PATCH datacenter-manager v4 5/6] fix #6914: ui: add remove remote dialog with optional token deletion Shan Shaji
2026-02-18 16:41 ` [PATCH datacenter-manager v4 6/6] fix #6914: cli-admin: add option to delete token from remote Shan Shaji
2026-02-18 16:41 ` [PATCH proxmox v4 1/1] pve-api-types: generate missing `delete_token` method Shan Shaji
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=20260218164135.413762-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.