From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 97DCF9274C for ; Tue, 21 Mar 2023 18:04:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A02F1C9B9 for ; Tue, 21 Mar 2023 18:04:06 +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 ; Tue, 21 Mar 2023 18:04:05 +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 F3DD845D73 for ; Tue, 21 Mar 2023 18:04:04 +0100 (CET) From: Friedrich Weber To: pve-devel@lists.proxmox.com Date: Tue, 21 Mar 2023 18:03:25 +0100 Message-Id: <20230321170325.2401819-1-f.weber@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.401 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pve-devel] [RFC storage] content-dirs: check that all content dirs are pairwise inequal X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2023 17:04:36 -0000 This prevents strange interactions in case the same content directory is used for multiple content types. Signed-off-by: Friedrich Weber --- I guess technically this is a breaking change, as users may have an iso+vztmpl storage that symlinks 'templates/iso' to 'templates/cache', which would now throw an error. PVE/Storage/Plugin.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index c323085..3c9a179 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -3,6 +3,7 @@ package PVE::Storage::Plugin; use strict; use warnings; +use Cwd qw(abs_path); use Encode qw(decode); use Fcntl ':mode'; use File::chdir; @@ -1362,6 +1363,16 @@ sub activate_storage { "directory '$path' does not exist or is unreachable\n"; } + # check that content dirs are pairwise inequal + my $resolved_subdirs = {}; + if (defined($scfg->{content})) { + foreach my $vtype (keys $scfg->{content}->%*) { + my $abs_subdir = abs_path($class->get_subdir($scfg, $vtype)); + die "storage '$storeid' uses directory $abs_subdir for multiple content types\n" + if defined($resolved_subdirs->{$abs_subdir}); + $resolved_subdirs->{$abs_subdir} = 1; + } + } return if defined($scfg->{mkdir}) && !$scfg->{mkdir}; -- 2.30.2