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 E374C1FF2D6 for ; Mon, 22 Jul 2024 12:07:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9355F30064; Mon, 22 Jul 2024 12:07:51 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 22 Jul 2024 12:07:05 +0200 Message-Id: <20240722100705.328797-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 Subject: [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" 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(()); + } + 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