From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id EE2251FF138 for ; Wed, 18 Feb 2026 17:43:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA0F7A17; Wed, 18 Feb 2026 17:44:22 +0100 (CET) From: Shan Shaji 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 Message-ID: <20260218164135.413762-3-s.shaji@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260218164135.413762-1-s.shaji@proxmox.com> References: <20260218164135.413762-1-s.shaji@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1771433020783 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: CGXFMAPCWWHINJ6H3JHT4VWHEHUQ54GW X-Message-ID-Hash: CGXFMAPCWWHINJ6H3JHT4VWHEHUQ54GW X-MailFrom: s.shaji@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 Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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