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 BC4881FF173 for ; Mon, 25 Nov 2024 17:22:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E584185A0; Mon, 25 Nov 2024 17:22:22 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Mon, 25 Nov 2024 17:21:54 +0100 Message-Id: <20241125162213.157011-8-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241125162213.157011-1-h.laimer@proxmox.com> References: <20241125162213.157011-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 v15 07/26] api: add check for nested datastores on creation 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" Signed-off-by: Hannes Laimer --- src/api2/config/datastore.rs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index d4cee458d..d6cfdbb0c 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -1,4 +1,4 @@ -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use ::serde::{Deserialize, Serialize}; use anyhow::{bail, format_err, Error}; @@ -81,6 +81,25 @@ pub(crate) fn do_create_datastore( bail!("cannot create datastore in root path"); } + let new_store_path = Path::new(&datastore.path); + for store in config.convert_to_typed_array::("datastore")? { + if store.backing_device != datastore.backing_device { + continue; + } + + // Since we check for that on creation, we assume all removable datastore + // paths are relative, so don't have a leading `/`. + let store_path = Path::new(&store.path); + if store_path.starts_with(&new_store_path) || new_store_path.starts_with(&store_path) { + param_bail!( + "path", + "nested datastores not allowed: '{}' already in '{}'", + store.name, + store.path + ); + } + } + let need_unmount = datastore.backing_device.is_some(); if need_unmount { do_mount_device(datastore.clone())?; -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel