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 9AEFB8D8B for ; Mon, 31 Jul 2023 15:43:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7DA9C3BED for ; Mon, 31 Jul 2023 15:43:00 +0200 (CEST) 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 ; Mon, 31 Jul 2023 15:42:59 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9964842D1C for ; Mon, 31 Jul 2023 15:42:59 +0200 (CEST) Date: Mon, 31 Jul 2023 15:42:52 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230731083924.18234-1-p.hufnagl@proxmox.com> <20230731083924.18234-4-p.hufnagl@proxmox.com> In-Reply-To: <20230731083924.18234-4-p.hufnagl@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1690810556.95kuy1rtag.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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 - Subject: Re: [pve-devel] [V3 PATCH storage 1/1] fix #4849: download-url: allow download and decompression of compressed ISOs 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: Mon, 31 Jul 2023 13:43:00 -0000 On July 31, 2023 10:39 am, Philipp Hufnagl wrote: > Signed-off-by: Philipp Hufnagl > --- > src/PVE/API2/Storage/Status.pm | 17 +++++++++++++++-- > src/PVE/Storage.pm | 6 ++++++ > 2 files changed, 21 insertions(+), 2 deletions(-) >=20 > diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status= .pm > index 2aaeff6..1d73c96 100644 > --- a/src/PVE/API2/Storage/Status.pm > +++ b/src/PVE/API2/Storage/Status.pm > @@ -23,6 +23,8 @@ use PVE::Storage; > =20 > use base qw(PVE::RESTHandler); >=20 > +our $KNOWN_COMPRESSION_FORMATS =3D ['zst', 'gz', 'lzo']; might want a comment here that adding new formats means handling them in decompressor_info below, and vice-versa? also, this is just another way to write PVE::Storage::Plugin::COMPRESSOR_RE maybe they could be unified to avoid accidentally desyncing them? technically, the RE could be used as 'pattern' in the API schema, but the generated docs are less human-friendly for patterns compared to enums.. > + > __PACKAGE__->register_method ({ > subclass =3D> "PVE::API2::Storage::PruneBackups", > path =3D> '{storage}/prunebackups', > @@ -578,6 +580,12 @@ __PACKAGE__->register_method({ > requires =3D> 'checksum-algorithm', > optional =3D> 1, > }, > + compression =3D> { > + description =3D> "Decompress the downloaded file using specified compr= ession algorithm", > + type =3D> 'string', > + enum =3D> $KNOWN_COMPRESSION_FORMATS, > + optional =3D> 1, > + }, > 'checksum-algorithm' =3D> { > description =3D> "The algorithm to calculate the checksum of the file.= ", > type =3D> 'string', > @@ -604,7 +612,7 @@ __PACKAGE__->register_method({ > =20 > my $cfg =3D PVE::Storage::config(); > =20 > - my ($node, $storage) =3D $param->@{'node', 'storage'}; > + my ($node, $storage, $compression) =3D $param->@{'node', 'storage','com= pression'}; > my $scfg =3D PVE::Storage::storage_check_enabled($cfg, $storage, $node)= ; > =20 > die "can't upload to storage type '$scfg->{type}', not a file based sto= rage!\n" > @@ -642,13 +650,18 @@ __PACKAGE__->register_method({ > http_proxy =3D> $dccfg->{http_proxy}, > }; > =20 > - my ($checksum, $checksum_algorithm) =3D $param->@{'checksum', 'checksum= -algorithm'}; > + my ($checksum, $checksum_algorithm) =3D $param->@{'checksum', 'checksum= -algorithm' }; > if ($checksum) { > $opts->{"${checksum_algorithm}sum"} =3D $checksum; > $opts->{hash_required} =3D 1; > } > =20 > my $worker =3D sub { > + if ($compression) { > + die "decompression not supported for $content\n" if $content ne 'iso'; > + my $info =3D PVE::Storage::decompressor_info('iso', $compression); > + $opts->{decompression_command} =3D $info->{decompressor}; note: $info->{decompressor} might be undef, should probably be caught here, else decompression will be silently skipped > + } > PVE::Tools::download_file_from_url("$path/$filename", $url, $opts); > }; > =20 > diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm > index a4d85e1..cb70113 100755 > --- a/src/PVE/Storage.pm > +++ b/src/PVE/Storage.pm > @@ -1531,6 +1531,12 @@ sub decompressor_info { > lzo =3D> ['lzop', '-d', '-c'], > zst =3D> ['zstd', '-q', '-d', '-c'], > }, > + iso =3D> { > + # zstd seem to be able to handle .gzip fine. Therefore we dont need= additional other tool > + gz =3D> ['zcat'], > + lzo =3D> ['lzop', '-d', '-c'], > + zst =3D> ['zstd', '-q', '-d', '-c'], > + }, > }; > =20 > die "ERROR: archive format not defined\n" > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20