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 305F91FF146 for ; Tue, 28 Apr 2026 17:11:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12D95183F4; Tue, 28 Apr 2026 17:11:33 +0200 (CEST) Date: Tue, 28 Apr 2026 17:10:59 +0200 From: Wolfgang Bumiller To: "Max R. Carrara" Subject: Re: [PATCH pve-storage v1 17/54] api: status: move content type assert for up-/downloads into helper Message-ID: References: <20260422111322.257380-1-m.carrara@proxmox.com> <20260422111322.257380-18-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260422111322.257380-18-m.carrara@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777388963417 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 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 Message-ID-Hash: BY7HHH3PC6XSY46UVAHJXAY6DWB7UGGW X-Message-ID-Hash: BY7HHH3PC6XSY46UVAHJXAY6DWB7UGGW X-MailFrom: w.bumiller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: pve-devel@lists.proxmox.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: NAK - One issue here which looks minor but affects security: On Wed, Apr 22, 2026 at 01:12:43PM +0200, Max R. Carrara wrote: > Signed-off-by: Max R. Carrara > --- > src/PVE/API2/Storage/Status.pm | 41 +++++++++++++++++++++------------- > 1 file changed, 26 insertions(+), 15 deletions(-) > > diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm > index 8225c3ad..b9e949ff 100644 > --- a/src/PVE/API2/Storage/Status.pm > +++ b/src/PVE/API2/Storage/Status.pm > @@ -41,6 +41,29 @@ __PACKAGE__->register_method({ > path => '{storage}/file-restore', > }); > > +# Content types that may currently be up- or downloaded via the API > +my @ALLOWED_FILE_TRANSFER_CONTENT_TYPES = ('iso', 'vztmpl', 'import'); > + > +my sub assert_can_transfer_files : prototype($$$) { > + my ($scfg, $storeid, $vtype) = @_; > + > + if (!defined($scfg->{path})) { > + die "unable to transfer files from / to storage type '$scfg->{type}'" > + . " - not a file-based storage\n"; > + } > + > + if (!$scfg->{content}->{$vtype}) { > + die "storage '$storeid' is not configured for content type '$vtype'\n"; > + } > + > + my $is_allowed_vtype = grep { $vtype } @ALLOWED_FILE_TRANSFER_CONTENT_TYPES; ^ You meant to say `grep { $_ eq $vtype }` - grep takes an expression, not a needle. The above line will always contain the whole list making the check below a no-op. > + if (!$is_allowed_vtype) { > + raise_param_exc({ content => "content type '$vtype' not allowed for upload / download" }); > + } > + > + return; > +} > + > my sub assert_ova_contents { > my ($file) = @_; > > @@ -573,11 +596,10 @@ __PACKAGE__->register_method({ > my ($node, $storage) = $param->@{qw(node storage)}; > my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node); > > - die "can't upload to storage type '$scfg->{type}'\n" > - if !defined($scfg->{path}); > - > my $content = $param->{content}; > > + assert_can_transfer_files($scfg, $storage, $content); > + > my $tmpfilename = $param->{tmpfilename}; > die "missing temporary file name\n" if !$tmpfilename; > > @@ -615,13 +637,8 @@ __PACKAGE__->register_method({ > } > > $path = PVE::Storage::get_import_dir($cfg, $storage); > - } else { > - raise_param_exc({ content => "upload content type '$content' not allowed" }); > } > > - die "storage '$storage' does not support '$content' content\n" > - if !$scfg->{content}->{$content}; > - > my $dest = "$path/$filename"; > my $dirname = dirname($dest); > > @@ -817,13 +834,9 @@ __PACKAGE__->register_method({ > my ($node, $storage, $compression) = $param->@{qw(node storage compression)}; > my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node); > > - die "can't upload to storage type '$scfg->{type}', not a file based storage!\n" > - if !defined($scfg->{path}); > - > my ($content, $url) = $param->@{ 'content', 'url' }; > > - die "storage '$storage' is not configured for content-type '$content'\n" > - if !$scfg->{content}->{$content}; > + assert_can_transfer_files($scfg, $storage, $content); > > my $filename = PVE::Storage::normalize_content_filename($param->{filename}); > > @@ -856,8 +869,6 @@ __PACKAGE__->register_method({ > } > > $path = PVE::Storage::get_import_dir($cfg, $storage); > - } else { > - raise_param_exc({ content => "upload content-type '$content' is not allowed" }); > } > > PVE::Storage::activate_storage($cfg, $storage); > -- > 2.47.3 > > > > > --