From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CBDFFB323D for ; Tue, 28 Nov 2023 15:39:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE1841910A for ; Tue, 28 Nov 2023 15:39:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 28 Nov 2023 15:39:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CDC4F4103A; Tue, 28 Nov 2023 15:39:18 +0100 (CET) Message-ID: Date: Tue, 28 Nov 2023 15:39:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Content-Language: en-US To: Proxmox Backup Server development discussion , Hannes Laimer References: <20231128141654.323631-1-h.laimer@proxmox.com> From: Dominik Csapak In-Reply-To: <20231128141654.323631-1-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH proxmox-backup 1/2] pull: fix permission checks for local syncs X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Nov 2023 14:39:49 -0000 with that i can now sync snapshots that can be read from the local user code seems fine to me but i'm not sure about the PRIV_DATASTORE_READ and PRIV_DATASTORE_BACKUP use in the last hunk (i don't have a deep understanding of the code but i couldn't find an issue by testing), so it's only: Tested-by: Dominik Csapak On 11/28/23 15:16, Hannes Laimer wrote: > Reported-by: Dominik Csapak > Signed-off-by: Hannes Laimer > --- > src/api2/config/sync.rs | 10 ++++------ > src/server/pull.rs | 6 +++--- > 2 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/src/api2/config/sync.rs b/src/api2/config/sync.rs > index ea0e08f1..8809465c 100644 > --- a/src/api2/config/sync.rs > +++ b/src/api2/config/sync.rs > @@ -8,8 +8,8 @@ use proxmox_schema::{api, param_bail}; > > use pbs_api_types::{ > Authid, SyncJobConfig, SyncJobConfigUpdater, JOB_ID_SCHEMA, PRIV_DATASTORE_AUDIT, > - PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_MODIFY, PRIV_DATASTORE_PRUNE, PRIV_DATASTORE_READ, > - PRIV_REMOTE_AUDIT, PRIV_REMOTE_READ, PROXMOX_CONFIG_DIGEST_SCHEMA, > + PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_MODIFY, PRIV_DATASTORE_PRUNE, PRIV_REMOTE_AUDIT, > + PRIV_REMOTE_READ, PROXMOX_CONFIG_DIGEST_SCHEMA, > }; > use pbs_config::sync; > > @@ -70,11 +70,9 @@ pub fn check_sync_job_modify_access( > > if let Some(remote) = &job.remote { > let remote_privs = user_info.lookup_privs(auth_id, &["remote", remote, &job.remote_store]); > - remote_privs & PRIV_REMOTE_READ != 0 > - } else { > - let source_ds_privs = user_info.lookup_privs(auth_id, &["datastore", &job.remote_store]); > - source_ds_privs & PRIV_DATASTORE_READ != 0 > + return remote_privs & PRIV_REMOTE_READ != 0; > } > + true > } > > #[api( > diff --git a/src/server/pull.rs b/src/server/pull.rs > index 1403c7a7..66ef333a 100644 > --- a/src/server/pull.rs > +++ b/src/server/pull.rs > @@ -17,7 +17,7 @@ use serde_json::json; > use pbs_api_types::{ > print_store_and_ns, Authid, BackupDir, BackupGroup, BackupNamespace, CryptMode, GroupFilter, > GroupListItem, Operation, RateLimitConfig, Remote, SnapshotListItem, MAX_NAMESPACE_DEPTH, > - PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, > + PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_READ, > }; > use pbs_client::{BackupReader, BackupRepository, HttpClient, RemoteChunkReader}; > use pbs_config::CachedUserInfo; > @@ -271,8 +271,8 @@ impl PullSource for LocalSource { > &self.store, > namespace.clone(), > 0, > - None, > - None, > + Some(PRIV_DATASTORE_READ), > + Some(PRIV_DATASTORE_BACKUP), > Some(owner), > )? > .filter_map(Result::ok)