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 CC6BF1FF13B for ; Wed, 22 Apr 2026 15:40:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8078920BDD; Wed, 22 Apr 2026 15:40:46 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v8 09/13] api: add POST endpoint for move-group Date: Wed, 22 Apr 2026 15:39:47 +0200 Message-ID: <20260422133951.192862-10-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260422133951.192862-1-h.laimer@proxmox.com> References: <20260422133951.192862-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: 1776865125571 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 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: CLKBMMCXE4Q47QVK44EMRXZCCHHCOXTD X-Message-ID-Hash: CLKBMMCXE4Q47QVK44EMRXZCCHHCOXTD 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: Add a dedicated /move-group endpoint for moving backup groups between namespaces within the same datastore. The permission model allows users with DATASTORE_PRUNE on the source and DATASTORE_BACKUP on the target namespace to move groups they own, without requiring full DATASTORE_MODIFY on both sides. Signed-off-by: Hannes Laimer --- src/api2/admin/datastore.rs | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 757b3114..b035bd9e 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -280,6 +280,95 @@ pub async fn delete_group( .await? } +#[api( + input: { + properties: { + store: { schema: DATASTORE_SCHEMA }, + ns: { + type: BackupNamespace, + optional: true, + }, + group: { + type: pbs_api_types::BackupGroup, + flatten: true, + }, + "target-ns": { + type: BackupNamespace, + optional: true, + }, + "merge-group": { + type: bool, + optional: true, + default: true, + description: "If the group already exists in the target namespace, merge \ + snapshots into it. Requires matching ownership and non-overlapping \ + snapshot times.", + }, + }, + }, + returns: { + schema: UPID_SCHEMA, + }, + access: { + permission: &Permission::Anybody, + description: "Requires DATASTORE_MODIFY or DATASTORE_PRUNE (+ group ownership) on the \ + source namespace and DATASTORE_MODIFY or DATASTORE_BACKUP (+ group ownership) on \ + the target namespace.", + }, +)] +/// Move a backup group to a different namespace within the same datastore. +pub fn move_group( + store: String, + ns: Option, + group: pbs_api_types::BackupGroup, + target_ns: Option, + merge_group: bool, + rpcenv: &mut dyn RpcEnvironment, +) -> Result { + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; + let ns = ns.unwrap_or_default(); + let target_ns = target_ns.unwrap_or_default(); + + let source_limited = check_ns_privs_full( + &store, + &ns, + &auth_id, + PRIV_DATASTORE_MODIFY, + PRIV_DATASTORE_PRUNE, + )?; + let target_limited = check_ns_privs_full( + &store, + &target_ns, + &auth_id, + PRIV_DATASTORE_MODIFY, + PRIV_DATASTORE_BACKUP, + )?; + + let datastore = DataStore::lookup_datastore(lookup_with(&store, Operation::Write))?; + + if source_limited || target_limited { + let owner = datastore.get_owner(&ns, &group)?; + check_backup_owner(&owner, &auth_id)?; + } + + // Best-effort pre-checks for a fast synchronous error before spawning a worker. + // The worker re-runs the same check post-lock, which is the authoritative gate. + datastore.check_move_group(&ns, &target_ns, &group, merge_group)?; + + let worker_id = format!("{store}:{ns}/{group}:{target_ns}"); + let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; + + let upid_str = WorkerTask::new_thread( + "move-group", + Some(worker_id), + auth_id.to_string(), + to_stdout, + move |_worker| datastore.move_group(&ns, &group, &target_ns, merge_group), + )?; + + Ok(json!(upid_str)) +} + #[api( input: { properties: { @@ -2849,6 +2938,7 @@ const DATASTORE_INFO_SUBDIRS: SubdirMap = &[ .delete(&API_METHOD_DELETE_GROUP), ), ("mount", &Router::new().post(&API_METHOD_MOUNT)), + ("move-group", &Router::new().post(&API_METHOD_MOVE_GROUP)), ( "namespace", // FIXME: move into datastore:: sub-module?! -- 2.47.3