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 04EB8925D5 for ; Tue, 14 Mar 2023 14:16:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DBD34213BD for ; Tue, 14 Mar 2023 14:15:36 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 14 Mar 2023 14:15:34 +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 3D75146261 for ; Tue, 14 Mar 2023 14:15:33 +0100 (CET) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Tue, 14 Mar 2023 14:14:54 +0100 Message-Id: <20230314131456.165418-2-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230314131456.165418-1-l.nunner@proxmox.com> References: <20230314131456.165418-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.106 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [plugin.pm] Subject: [pve-devel] [PATCH v2 storage] config: use relative paths for content overrides 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, 14 Mar 2023 13:16:07 -0000 Remove the requirement for paths to start with a /, as it might be confusing to users. Signed-off-by: Leo Nunner --- RFC: I'm not really sure how much input validation we want to do here. e.g., should we keep the user from appending or prepending slashes (e.g. setting the override as /dir/)? Or should we just accept everything? PVE/Storage/Plugin.pm | 6 +++--- test/get_subdir_test.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index ca7a0d4..6295aa2 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -355,7 +355,7 @@ PVE::JSONSchema::register_format('pve-dir-override', \&verify_dir_override); sub verify_dir_override { my ($value, $noerr) = @_; - if($value =~ m/^([a-z]+)=\/.+$/ && + if($value =~ m/^([a-z]+)=[^.]+$/ && verify_content($1, $noerr)) { return $value; } @@ -659,9 +659,9 @@ sub get_subdir { die "storage definition has no path\n" if !$path; die "unknown vtype '$vtype'\n" if !exists($vtype_subdirs->{$vtype}); - my $subdir = $scfg->{"content-dirs"}->{$vtype} // "/".$vtype_subdirs->{$vtype}; + my $subdir = $scfg->{"content-dirs"}->{$vtype} // $vtype_subdirs->{$vtype}; - return $path.$subdir; + return "$path/$subdir"; } sub filesystem_path { diff --git a/test/get_subdir_test.pm b/test/get_subdir_test.pm index ff42985..b9d61d5 100644 --- a/test/get_subdir_test.pm +++ b/test/get_subdir_test.pm @@ -29,9 +29,9 @@ foreach my $type (keys %$vtype_subdirs) { # creates additional tests for overrides foreach my $type (keys %$vtype_subdirs) { - my $override = "/${type}_override"; + my $override = "${type}_override"; my $scfg_with_override = { path => '/some/path', 'content-dirs' => { $type => $override } }; - push @$tests, [ $scfg_with_override, $type, "$scfg_with_override->{path}$scfg_with_override->{'content-dirs'}->{$type}" ]; + push @$tests, [ $scfg_with_override, $type, "$scfg_with_override->{path}/$scfg_with_override->{'content-dirs'}->{$type}" ]; } plan tests => scalar @$tests; -- 2.30.2