From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 398611FF0E5 for ; Wed, 29 Jul 2026 12:46:57 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id D902F21330; Wed, 29 Jul 2026 12:46:56 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 29 Jul 2026 12:46:42 +0200 Message-Id: To: "Wolfgang Bumiller" From: "Max R. Carrara" Subject: Re: [PATCH pve-storage v1 17/54] api: status: move content type assert for up-/downloads into helper X-Mailer: aerc 0.18.2-0-ge037c095a049 References: <20260422111322.257380-1-m.carrara@proxmox.com> <20260422111322.257380-18-m.carrara@proxmox.com> In-Reply-To: X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1785321963439 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust 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: 7PHLPU6L7Z7LNSO5RB3DYDCCFD5EV5FG X-Message-ID-Hash: 7PHLPU6L7Z7LNSO5RB3DYDCCFD5EV5FG X-MailFrom: m.carrara@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: On Tue Apr 28, 2026 at 5:10 PM CEST, Wolfgang Bumiller wrote: > 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/Stat= us.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 =3D> '{storage}/file-restore', > > }); > > > > +# Content types that may currently be up- or downloaded via the API > > +my @ALLOWED_FILE_TRANSFER_CONTENT_TYPES =3D ('iso', 'vztmpl', 'import'= ); > > + > > +my sub assert_can_transfer_files : prototype($$$) { > > + my ($scfg, $storeid, $vtype) =3D @_; > > + > > + 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 '$v= type'\n"; > > + } > > + > > + my $is_allowed_vtype =3D grep { $vtype } @ALLOWED_FILE_TRANSFER_CO= NTENT_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. Oh, seems like that was just some brain lag there on my part ... will be fixed in v2, thanks! > > > + if (!$is_allowed_vtype) { > > + raise_param_exc({ content =3D> "content type '$vtype' not allo= wed for upload / download" }); > > + } > > + > > + return; > > +} > > + > > my sub assert_ova_contents { > > my ($file) =3D @_; > > > > @@ -573,11 +596,10 @@ __PACKAGE__->register_method({ > > my ($node, $storage) =3D $param->@{qw(node storage)}; > > my $scfg =3D PVE::Storage::storage_check_enabled($cfg, $storag= e, $node); > > > > - die "can't upload to storage type '$scfg->{type}'\n" > > - if !defined($scfg->{path}); > > - > > my $content =3D $param->{content}; > > > > + assert_can_transfer_files($scfg, $storage, $content); > > + > > my $tmpfilename =3D $param->{tmpfilename}; > > die "missing temporary file name\n" if !$tmpfilename; > > > > @@ -615,13 +637,8 @@ __PACKAGE__->register_method({ > > } > > > > $path =3D PVE::Storage::get_import_dir($cfg, $storage); > > - } else { > > - raise_param_exc({ content =3D> "upload content type '$cont= ent' not allowed" }); > > } > > > > - die "storage '$storage' does not support '$content' content\n" > > - if !$scfg->{content}->{$content}; > > - > > my $dest =3D "$path/$filename"; > > my $dirname =3D dirname($dest); > > > > @@ -817,13 +834,9 @@ __PACKAGE__->register_method({ > > my ($node, $storage, $compression) =3D $param->@{qw(node stora= ge compression)}; > > my $scfg =3D PVE::Storage::storage_check_enabled($cfg, $storag= e, $node); > > > > - die "can't upload to storage type '$scfg->{type}', not a file = based storage!\n" > > - if !defined($scfg->{path}); > > - > > my ($content, $url) =3D $param->@{ 'content', 'url' }; > > > > - die "storage '$storage' is not configured for content-type '$c= ontent'\n" > > - if !$scfg->{content}->{$content}; > > + assert_can_transfer_files($scfg, $storage, $content); > > > > my $filename =3D PVE::Storage::normalize_content_filename($par= am->{filename}); > > > > @@ -856,8 +869,6 @@ __PACKAGE__->register_method({ > > } > > > > $path =3D PVE::Storage::get_import_dir($cfg, $storage); > > - } else { > > - raise_param_exc({ content =3D> "upload content-type '$cont= ent' is not allowed" }); > > } > > > > PVE::Storage::activate_storage($cfg, $storage); > > -- > > 2.47.3 > > > > > > > > > >