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 A78FA6DF01 for ; Mon, 28 Mar 2022 13:11:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A23C625093 for ; Mon, 28 Mar 2022 13:11:56 +0200 (CEST) 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 id 1E3592507A for ; Mon, 28 Mar 2022 13:11:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E333644756 for ; Mon, 28 Mar 2022 13:11:55 +0200 (CEST) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 28 Mar 2022 13:11:03 +0200 Message-Id: <20220328111103.136218-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.117 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pbs-devel] [PATCH proxmox-backup] pxar: create: add entry: fix anchored path pattern matching 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: Mon, 28 Mar 2022 11:11:56 -0000 Similar to 874bd545 ("pxar: fix anchored exclusion at archive root"), but this time for inclusion. Because of the inconsistency, it could happen that a file included in generate_directory_file_list() got excluded in add_entry(), e.g. with a .pxarexclude file like > * > !/supposed-to-be-included Reported-by: Dominik Csapak Signed-off-by: Fabian Ebner --- An alternative would be to remove the path pattern matching from add_entry() entirely. AFAICT, it's only called with the files generated by generate_directory_file_list() anyways. pbs-client/src/pxar/create.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 9f3b0576..8dcb192d 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -549,9 +549,10 @@ impl Archiver { let metadata = get_metadata(fd.as_raw_fd(), stat, self.flags(), self.fs_magic, &mut self.fs_feature_flags)?; + let match_path = PathBuf::from("/").join(self.path.clone()); if self .patterns - .matches(self.path.as_os_str().as_bytes(), Some(stat.st_mode as u32)) + .matches(match_path.as_os_str().as_bytes(), Some(stat.st_mode as u32)) == Some(MatchType::Exclude) { return Ok(()); -- 2.30.2