From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C31701FF16A for ; Fri, 30 Aug 2024 10:00:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 99DC336AC2; Fri, 30 Aug 2024 10:01:23 +0200 (CEST) Date: Fri, 30 Aug 2024 10:00:48 +0200 From: Wolfgang Bumiller To: Christian Ebner Message-ID: References: <20240808114203.187189-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240808114203.187189-1-c.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.087 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH v2 proxmox-backup] client: catalog shell: avoid navigating below 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: , Reply-To: Proxmox Backup Server development discussion Cc: pbs-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On Thu, Aug 08, 2024 at 01:42:03PM GMT, Christian Ebner wrote: > Avoid to underflow the catalogs shell position stack by navigating > below the archives root directory into the catalog root. Otherwise > the shell will panic, as the root entry is always expected to be > present. > > This threats the archive root directory as being it's own parent > directory, mimicking the behaviour of most common shells. > > Signed-off-by: Christian Ebner > --- > Encountered while implementing the catalog shell for the split pxar > archive case. > > Without this additional check, a `cd ..` in the pxar archive root of > the catalog shell will panic. What about `cd ../../..` when *not* at a root, would we now ignore this without any error messages? > > changes since version 1: > - use `is_empty` to check if vector is empty > - extend commit message and comment to clarify that archive root acts as > its own parent directory > > pbs-client/src/catalog_shell.rs | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/pbs-client/src/catalog_shell.rs b/pbs-client/src/catalog_shell.rs > index 349bb7cbc..1c50cbf96 100644 > --- a/pbs-client/src/catalog_shell.rs > +++ b/pbs-client/src/catalog_shell.rs > @@ -720,6 +720,13 @@ impl Shell { > &mut None, > ) > .await?; > + > + if new_position.is_empty() { > + // Avoid moving below archive root into catalog root, thereby treating > + // the archive root as its own parent directory. > + return Ok(()); > + } > + > if !new_position.last().unwrap().catalog.is_directory() { > bail!("not a directory"); > } > -- > 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel