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 C63451FF16C for ; Tue, 3 Sep 2024 14:39:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B9489B68; Tue, 3 Sep 2024 14:40:32 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 3 Sep 2024 14:39:46 +0200 Message-Id: <20240903123946.332720-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.027 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: [pbs-devel] [PATCH v3 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. 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, underflowing the pxar archive root of the catalog shell will panic. changes since version 2, thanks @Wolfgang for catching this: - also handle cases where the current working directory is not the root directory 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pbs-client/src/catalog_shell.rs b/pbs-client/src/catalog_shell.rs index 349bb7cbc..f687e7e14 100644 --- a/pbs-client/src/catalog_shell.rs +++ b/pbs-client/src/catalog_shell.rs @@ -720,6 +720,14 @@ 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. + self.position.truncate(1); + 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