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 B9B6768F7E for ; Thu, 12 Nov 2020 10:04:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE74EC239 for ; Thu, 12 Nov 2020 10:03:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 023FAC220 for ; Thu, 12 Nov 2020 10:03:56 +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 C257042155 for ; Thu, 12 Nov 2020 10:03:55 +0100 (CET) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 12 Nov 2020 10:03:50 +0100 Message-Id: <20201112090352.9268-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [create.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/3] pxar: fix anchored exclusion at archive root 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: Thu, 12 Nov 2020 09:04:26 -0000 There is no leading slash in an entry's full_path, causing an anchored exclude at the root level to fail, e.g. having "/name" as the content of the file archive/root/.pxarexclude didn't match the file archive/root/name Fix this by prepending a leading slash before matching. Signed-off-by: Fabian Ebner --- src/pxar/create.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pxar/create.rs b/src/pxar/create.rs index a16005ce..7c8e3edb 100644 --- a/src/pxar/create.rs +++ b/src/pxar/create.rs @@ -443,9 +443,10 @@ impl<'a, 'b> Archiver<'a, 'b> { Err(err) => bail!("stat failed on {:?}: {}", full_path, err), }; + let match_path = PathBuf::from("/").join(full_path.clone()); if self .patterns - .matches(full_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) { continue; -- 2.20.1