From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <c.ebner@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 3C486B409D
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:26:41 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 17DD3136B3
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:26:41 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:26:40 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4829C41CC8
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:26:40 +0100 (CET)
Date: Thu, 30 Nov 2023 11:26:39 +0100 (CET)
From: Christian Ebner <c.ebner@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>,
Markus Frank <m.frank@proxmox.com>
Message-ID: <1379570914.1480.1701339999465@webmail.proxmox.com>
In-Reply-To: <20231130093346.38897-1-m.frank@proxmox.com>
References: <20231130093346.38897-1-m.frank@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-Priority: 3
Importance: Normal
X-Mailer: Open-Xchange Mailer v7.10.6-Rev55
X-Originating-Client: open-xchange-appsuite
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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [directory.rs]
Subject: Re: [pbs-devel] [PATCH proxmox-backup v2] api: enhance directory
existence check
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2023 10:26:41 -0000
> On 30.11.2023 10:33 CET Markus Frank <m.frank@proxmox.com> wrote:
>
>
> If a directory exists on the specified path,
> it now also checks whether the directory is empty and not already mounted.
>
> Previously, if a directory were deleted and a directory with the same name
> would be created, the old check prevented the creation even though the
> directory could be used as a mount point.
>
> Signed-off-by: Markus Frank <m.frank@proxmox.com>
> ---
> v2: added check if another file system is mounted on the specified path
>
> src/api2/node/disks/directory.rs | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
> index 5e1cb124..48e0bd57 100644
> --- a/src/api2/node/disks/directory.rs
> +++ b/src/api2/node/disks/directory.rs
> @@ -1,6 +1,7 @@
> use ::serde::{Deserialize, Serialize};
> use anyhow::{bail, Error};
> use serde_json::json;
> +use std::os::linux::fs::MetadataExt;
>
> use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType};
> use proxmox_schema::api;
> @@ -156,12 +157,20 @@ pub fn create_datastore_disk(
> let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name);
>
> // check if the default path does exist already and bail if it does
> + // and is not empty or another file system is already mounted on it
nit: not very well readable anymore. I would suggest
// check if the default path exists already.
// bail if it is not empty or another filesystem mounted on top
> let default_path = std::path::PathBuf::from(&mount_point);
>
> match std::fs::metadata(&default_path) {
> Err(_) => {} // path does not exist
> - Ok(_) => {
> - bail!("path {:?} already exists", default_path);
> + Ok(stat) => {
> + let basedir_dev = std::fs::metadata(BASE_MOUNT_DIR)?.st_dev();
> + if stat.st_dev() != basedir_dev {
> + bail!("path {default_path:?} already exists and is mountpoint");
> + }
> + let is_empty = default_path.read_dir()?.next().is_none();
> + if !is_empty {
> + bail!("path {default_path:?} already exists and is not empty");
> + }
> }
> }
>
> --
> 2.39.2
other than that looks good to me, please consider this:
Tested-by: Christian Ebner <c.ebner@proxmox.com>