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 F0BF49967 for ; Fri, 4 Aug 2023 10:22:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7286BD3E for ; Fri, 4 Aug 2023 10:21:35 +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 for ; Fri, 4 Aug 2023 10:21:35 +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 2A70742BCA for ; Fri, 4 Aug 2023 10:21:35 +0200 (CEST) Date: Fri, 04 Aug 2023 10:21:28 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Gabriel Goller , Proxmox Backup Server development discussion References: <20230803152238.124625-1-g.goller@proxmox.com> <836aff2c-4143-577c-5abe-f9601f77293f@proxmox.com> In-Reply-To: <836aff2c-4143-577c-5abe-f9601f77293f@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1691137144.zzi13nxud4.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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] [PATH proxmox-backup] fix #4380: stat() is run when file is executed 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: Fri, 04 Aug 2023 08:22:06 -0000 On August 4, 2023 9:42 am, Fiona Ebner wrote: > Am 03.08.23 um 17:22 schrieb Gabriel Goller: >> diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.= rs >> index 2577cf98..c573c2a3 100644 >> --- a/pbs-client/src/pxar/create.rs >> +++ b/pbs-client/src/pxar/create.rs >> @@ -434,6 +434,15 @@ impl Archiver { >> assert_single_path_component(os_file_name)?; >> let full_path =3D self.path.join(os_file_name); >> =20 >> + let match_path =3D PathBuf::from("/").join(full_path.clone(= )); >> + if self >> + .patterns >> + .matches(match_path.as_os_str().as_bytes(), None) >=20 > Is it fine to call matches() without the file mode in all cases? Can't > it make a difference for directory matching? If it's okay, please > explain why in the commit message. good catch, thanks. I guess we need something like this if we want to support it - the second hunk is only needed in case we ever differentiate between the different types other than directories ('/' at the end of the pattern) and regular files. in the end, it might make more sense to try the other approach I indicated as follow-up in my first reply? we already have the stat info of each dir we encounter, so we can decide if a dir is a "weird unreadable one" and treat that specially, moving the pattern match here back below the stat, and just never go down that code path for affected dirs? diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index c573c2a3..eaa84c76 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -435,9 +435,15 @@ impl Archiver { let full_path =3D self.path.join(os_file_name); =20 let match_path =3D PathBuf::from("/").join(full_path.clone()); + let entry_type =3D if file.file_type() =3D=3D Some(nix::dir::T= ype::Directory) { + Some(libc::S_IFDIR) + } else { + Some(libc::S_IFREG) + }; + if self .patterns - .matches(match_path.as_os_str().as_bytes(), None) + .matches(match_path.as_os_str().as_bytes(), entry_type) =3D=3D Some(MatchType::Exclude) { continue; @@ -453,6 +459,14 @@ impl Archiver { Err(err) =3D> return Err(err).context(format!("stat failed= on {:?}", full_path)), }; =20 + if self + .patterns + .matches(match_path.as_os_str().as_bytes(), Some(stat.st_m= ode)) + =3D=3D Some(MatchType::Exclude) + { + continue; + } + self.entry_counter +=3D 1; if self.entry_counter > self.entry_limit { bail!(