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 BBBC01FF160 for ; Wed, 7 Aug 2024 10:25:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4798A1979; Wed, 7 Aug 2024 10:25:27 +0200 (CEST) MIME-Version: 1.0 In-Reply-To: <20240722100705.328797-1-c.ebner@proxmox.com> References: <20240722100705.328797-1-c.ebner@proxmox.com> From: Fabian =?utf-8?q?Gr=C3=BCnbichler?= To: Christian Ebner , pbs-devel@lists.proxmox.com Date: Wed, 07 Aug 2024 10:25:17 +0200 Message-ID: <172301911740.107519.13980702778008805321@yuna.proxmox.com> User-Agent: alot/0.10 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: Re: [pbs-devel] [PATCH 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Quoting Christian Ebner (2024-07-22 12:07:05) > 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. > > 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. > > pbs-client/src/catalog_shell.rs | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/pbs-client/src/catalog_shell.rs b/pbs-client/src/catalog_shell.rs > index 349bb7cbc..88045db5d 100644 > --- a/pbs-client/src/catalog_shell.rs > +++ b/pbs-client/src/catalog_shell.rs > @@ -720,6 +720,12 @@ impl Shell { > &mut None, > ) > .await?; > + > + if new_position.len() < 1 { > + // Avoid moving below archive root into catalog root > + return Ok(()); > + } since new_position is a Vec, wouldn't `new_position.is_empty()` be the right fit? should this print a warning? I guess since regular shells pretend `/` is the parent of `/`, we can do the same here? > + > 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 > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel