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 1D05A1FF15C for ; Wed, 13 Nov 2024 13:40:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AB4A015031; Wed, 13 Nov 2024 13:40:55 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Nov 2024 13:40:47 +0100 Message-Id: <20241113124047.97456-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup] chunk_store: fix problem with permission checking 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Permissions are stored in the lower 9 bits (rwxrwxrwx), so we have to mask `st_mode` with 0o777. The datastore root dir is created with 755, the `.chunks` dir and its contents with 750 and the `.lock` file with 644, this changes the expected permissions accordingly. Signed-off-by: Hannes Laimer --- pbs-datastore/src/chunk_store.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index 38a88584..29d5874a 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -576,7 +576,7 @@ impl ChunkStore { Ok(stat) => { if stat.st_uid != u32::from(pbs_config::backup_user()?.uid) || stat.st_gid != u32::from(pbs_config::backup_group()?.gid) - || stat.st_mode != file_mode + || stat.st_mode & 0o777 != file_mode { bail!( "unable to open existing chunk store path {:?} - permissions or owner not correct", @@ -598,22 +598,22 @@ impl ChunkStore { /// subdirectories and the lock file. pub fn verify_chunkstore>(path: T) -> Result<(), Error> { // Check datastore root path perm/owner - ChunkStore::check_permissions(path.as_ref(), 0o700)?; + ChunkStore::check_permissions(path.as_ref(), 0o755)?; let chunk_dir = Self::chunk_dir(path.as_ref()); // Check datastore .chunks path perm/owner - ChunkStore::check_permissions(&chunk_dir, 0o700)?; + ChunkStore::check_permissions(&chunk_dir, 0o750)?; // Check all .chunks subdirectories for i in 0..64 * 1024 { let mut l1path = chunk_dir.clone(); l1path.push(format!("{:04x}", i)); - ChunkStore::check_permissions(&l1path, 0o700)?; + ChunkStore::check_permissions(&l1path, 0o750)?; } // Check .lock file let lockfile_path = Self::lockfile_path(path.as_ref()); - ChunkStore::check_permissions(lockfile_path, 0o600)?; + ChunkStore::check_permissions(lockfile_path, 0o644)?; Ok(()) } } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel