From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 87BAA1FF0E7 for ; Thu, 13 Aug 2026 19:11:05 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 471A321B0D; Thu, 13 Aug 2026 19:10:37 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 14/28] sync: pull: allow pulling for user/token with append permission Date: Thu, 13 Aug 2026 19:09:48 +0200 Message-ID: <20260813171002.809441-15-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260813171002.809441-1-c.ebner@proxmox.com> References: <20260813171002.809441-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1786641015911 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.208 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS 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: UON7B2KDCA5AW5LCXRIQ2DH7JMMNJ4TJ X-Message-ID-Hash: UON7B2KDCA5AW5LCXRIQ2DH7JMMNJ4TJ X-MailFrom: c.ebner@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: Extends the access checks for syncs in pull direction to allow appending contents when user has Datastore.Append permissions. Signed-off-by: Christian Ebner --- src/api2/pull.rs | 10 +++++----- src/server/pull.rs | 17 ++++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/api2/pull.rs b/src/api2/pull.rs index 17c1e4f34..6b53c55b7 100644 --- a/src/api2/pull.rs +++ b/src/api2/pull.rs @@ -8,9 +8,9 @@ use proxmox_schema::api; use pbs_api_types::{ Authid, BackupNamespace, CRYPT_KEY_ID_SCHEMA, DATASTORE_SCHEMA, GROUP_FILTER_LIST_SCHEMA, - GroupFilter, NS_MAX_DEPTH_REDUCED_SCHEMA, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_PRUNE, - PRIV_REMOTE_READ, REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, RESYNC_CORRUPT_SCHEMA, - RateLimitConfig, SYNC_ENCRYPTED_ONLY_SCHEMA, SYNC_VERIFIED_ONLY_SCHEMA, + GroupFilter, NS_MAX_DEPTH_REDUCED_SCHEMA, PRIV_DATASTORE_APPEND, PRIV_DATASTORE_BACKUP, + PRIV_DATASTORE_PRUNE, PRIV_REMOTE_READ, REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, + RESYNC_CORRUPT_SCHEMA, RateLimitConfig, SYNC_ENCRYPTED_ONLY_SCHEMA, SYNC_VERIFIED_ONLY_SCHEMA, SYNC_WORKER_THREADS_SCHEMA, SyncJobConfig, TRANSFER_LAST_SCHEMA, }; use pbs_config::CachedUserInfo; @@ -36,8 +36,8 @@ pub fn check_pull_privs( user_info.check_privs( auth_id, &local_store_ns_acl_path, - PRIV_DATASTORE_BACKUP, - false, + PRIV_DATASTORE_APPEND | PRIV_DATASTORE_BACKUP, + true, )?; if let Some(remote) = remote { diff --git a/src/server/pull.rs b/src/server/pull.rs index 8c6253604..856e0fc5a 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -1442,13 +1442,16 @@ fn check_and_create_ns(params: &PullParameters, ns: &BackupNamespace) -> Result< created = true; } - check_ns_privs( - params.target.store.name(), - ns, - ¶ms.owner, - PRIV_DATASTORE_BACKUP | PRIV_DATASTORE_APPEND, - ) - .map_err(|err| format_err!("sync into {store_ns_str} not allowed - {err}"))?; + let privs = if params.resync_corrupt { + PRIV_DATASTORE_BACKUP + } else { + PRIV_DATASTORE_BACKUP | PRIV_DATASTORE_APPEND + }; + + check_ns_privs(params.target.store.name(), ns, ¶ms.owner, privs).map_err(|err| { + let prefix = if params.resync_corrupt { "re-" } else { "" }; + format_err!("{prefix}sync into {store_ns_str} not allowed - {err}") + })?; Ok(created) } -- 2.47.3