From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E0C791FF13B for ; Wed, 11 Mar 2026 16:13:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 26E9E30102; Wed, 11 Mar 2026 16:13:36 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v4 5/7] api: add PUT endpoint for move_namespace Date: Wed, 11 Mar 2026 16:13:13 +0100 Message-ID: <20260311151315.133637-6-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311151315.133637-1-h.laimer@proxmox.com> References: <20260311151315.133637-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773241976641 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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: SJGNUXMUAQSYJU7CZN2FCUVDO5KPVYWH X-Message-ID-Hash: SJGNUXMUAQSYJU7CZN2FCUVDO5KPVYWH X-MailFrom: h.laimer@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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Requires DATASTORE_MODIFY on the parent of both the source and destination namespaces, matching the permissions used by create_namespace() and delete_namespace(). Signed-off-by: Hannes Laimer --- src/api2/admin/namespace.rs | 78 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/src/api2/admin/namespace.rs b/src/api2/admin/namespace.rs index ec913001..522133b1 100644 --- a/src/api2/admin/namespace.rs +++ b/src/api2/admin/namespace.rs @@ -1,12 +1,16 @@ use anyhow::{bail, Context, Error}; use pbs_config::CachedUserInfo; -use proxmox_router::{http_bail, ApiMethod, Permission, Router, RpcEnvironment}; +use proxmox_rest_server::WorkerTask; +use proxmox_router::{ + http_bail, ApiMethod, Permission, Router, RpcEnvironment, RpcEnvironmentType, +}; use proxmox_schema::*; +use serde_json::{json, Value}; use pbs_api_types::{ Authid, BackupGroupDeleteStats, BackupNamespace, NamespaceListItem, Operation, - DATASTORE_SCHEMA, NS_MAX_DEPTH_SCHEMA, PROXMOX_SAFE_ID_FORMAT, + DATASTORE_SCHEMA, NS_MAX_DEPTH_SCHEMA, PROXMOX_SAFE_ID_FORMAT, UPID_SCHEMA, }; use pbs_datastore::DataStore; @@ -193,7 +197,77 @@ pub fn delete_namespace( Ok(stats) } +#[api( + input: { + properties: { + store: { schema: DATASTORE_SCHEMA }, + ns: { + type: BackupNamespace, + }, + "new-ns": { + type: BackupNamespace, + }, + }, + }, + returns: { + schema: UPID_SCHEMA, + }, + access: { + permission: &Permission::Anybody, + description: "Requires DATASTORE_MODIFY on the parent of 'ns' and on the parent of 'new-ns'.", + }, +)] +/// Move a backup namespace (including all child namespaces and groups) to a new location. +pub fn move_namespace( + store: String, + ns: BackupNamespace, + new_ns: BackupNamespace, + rpcenv: &mut dyn RpcEnvironment, +) -> Result { + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; + + check_ns_modification_privs(&store, &ns, &auth_id)?; + check_ns_modification_privs(&store, &new_ns, &auth_id)?; + + let datastore = DataStore::lookup_datastore(&store, Some(Operation::Write))?; + + // Best-effort pre-checks for a fast synchronous error before spawning a worker. + if ns.is_root() { + bail!("cannot move root namespace"); + } + if ns == new_ns { + bail!("source and target namespace must be different"); + } + if !datastore.namespace_exists(&ns) { + bail!("source namespace '{ns}' does not exist"); + } + if datastore.namespace_exists(&new_ns) { + bail!("target namespace '{new_ns}' already exists"); + } + let target_parent = new_ns.parent(); + if !datastore.namespace_exists(&target_parent) { + bail!("target parent namespace '{target_parent}' does not exist"); + } + if ns.contains(&new_ns).is_some() { + bail!("cannot move namespace '{ns}' into its own subtree (target: '{new_ns}')"); + } + + let worker_id = format!("{store}:{ns}"); + let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; + + let upid_str = WorkerTask::new_thread( + "move-namespace", + Some(worker_id), + auth_id.to_string(), + to_stdout, + move |_worker| datastore.move_namespace(&ns, &new_ns), + )?; + + Ok(json!(upid_str)) +} + pub const ROUTER: Router = Router::new() .get(&API_METHOD_LIST_NAMESPACES) .post(&API_METHOD_CREATE_NAMESPACE) + .put(&API_METHOD_MOVE_NAMESPACE) .delete(&API_METHOD_DELETE_NAMESPACE); -- 2.47.3