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 78E381FF390 for ; Fri, 7 Jun 2024 11:42:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CCDD51BFD8; Fri, 7 Jun 2024 11:43:29 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 7 Jun 2024 11:43:06 +0200 Message-Id: <20240607094313.178742-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240607094313.178742-1-c.ebner@proxmox.com> References: <20240607094313.178742-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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: [pbs-devel] [PATCH proxmox-backup 1/8] api: datastore: factor out path decoding for catalog 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" The file path passed to the catalog is base64 encoded, with an exception for the root. Factor this check and decoding step out into a helper function to make it reusable when doing the same for lookups via the metadata archive instead of the catalog. Signed-off-by: Christian Ebner --- src/api2/admin/datastore.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 34a9105dd..854302999 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1636,6 +1636,14 @@ pub fn upload_backup_log( .boxed() } +fn decode_path(path: &str) -> Result, Error> { + if path != "root" && path != "/" { + base64::decode(path).map_err(|err| format_err!("base64 decoding of path failed - {err}")) + } else { + Ok(vec![b'/']) + } +} + #[api( input: { properties: { @@ -1709,12 +1717,7 @@ pub async fn catalog( let mut catalog_reader = CatalogReader::new(reader); - let path = if filepath != "root" && filepath != "/" { - base64::decode(filepath)? - } else { - vec![b'/'] - }; - + let path = decode_path(&filepath)?; catalog_reader.list_dir_contents(&path) }) .await? -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel