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 0E4DC8702 for ; Thu, 27 Jul 2023 17:28:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E60C5D577 for ; Thu, 27 Jul 2023 17:28:25 +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 ; Thu, 27 Jul 2023 17:28:24 +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 7D57340F7F for ; Thu, 27 Jul 2023 17:28:24 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Thu, 27 Jul 2023 17:28:17 +0200 Message-Id: <20230727152817.775699-4-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230727152817.775699-1-p.hufnagl@proxmox.com> References: <20230727152817.775699-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far 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: [pve-devel] [PATCH V2 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: Thu, 27 Jul 2023 15:28:56 -0000 Signed-off-by: Philipp Hufnagl --- src/PVE/API2/Storage/Status.pm | 22 +++++++++++++++++++--- src/PVE/Storage.pm | 6 ++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm index 2aaeff6..a087c53 100644 --- a/src/PVE/API2/Storage/Status.pm +++ b/src/PVE/API2/Storage/Status.pm @@ -23,6 +23,8 @@ use PVE::Storage; use base qw(PVE::RESTHandler); +our $KNOWN_COMPRESSION_FORMATS = ['zst', 'gz', 'lzo']; + __PACKAGE__->register_method ({ subclass => "PVE::API2::Storage::PruneBackups", path => '{storage}/prunebackups', @@ -578,6 +580,12 @@ __PACKAGE__->register_method({ requires => 'checksum-algorithm', optional => 1, }, + compression => { + description => "Decompress the downloaded file using following compression algorithm", + type => 'string', + enum => $KNOWN_COMPRESSION_FORMATS, + optional => 1, + }, 'checksum-algorithm' => { description => "The algorithm to calculate the checksum of the file.", type => 'string', @@ -604,7 +612,7 @@ __PACKAGE__->register_method({ my $cfg = PVE::Storage::config(); - my ($node, $storage) = $param->@{'node', 'storage'}; + my ($node, $storage, $compression) = $param->@{'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" @@ -627,6 +635,7 @@ __PACKAGE__->register_method({ if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) { raise_param_exc({ filename => "wrong file extension" }); } + die "decompression not supported for vztempl" if $compression; $path = PVE::Storage::get_vztmpl_dir($cfg, $storage); } else { raise_param_exc({ content => "upload content-type '$content' is not allowed" }); @@ -642,14 +651,21 @@ __PACKAGE__->register_method({ http_proxy => $dccfg->{http_proxy}, }; - my ($checksum, $checksum_algorithm) = $param->@{'checksum', 'checksum-algorithm'}; + my ($checksum, $checksum_algorithm) = $param->@{'checksum', 'checksum-algorithm' }; if ($checksum) { $opts->{"${checksum_algorithm}sum"} = $checksum; $opts->{hash_required} = 1; } my $worker = sub { - PVE::Tools::download_file_from_url("$path/$filename", $url, $opts); + my $save_to = "$path/$filename"; + die "refusing to override existing file $save_to \n" if -e $save_to ; + $save_to .= ".$compression" if $compression; + if ($compression) { + my $info = PVE::Storage::decompressor_info('iso', $compression); + $opts->{decompression_command} = $info->{decompressor}; + } + PVE::Tools::download_file_from_url($save_to, $url, $opts); }; my $worker_id = PVE::Tools::encode_text($filename); # must not pass : or the like as w-ID diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index a4d85e1..9dbf38f 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1531,6 +1531,12 @@ sub decompressor_info { lzo => ['lzop', '-d', '-c'], zst => ['zstd', '-q', '-d', '-c'], }, + iso => { + # zstd seem to be able to handle .gzip fine. Therefore we dont need additional other tool + gz => ['zstd', '-q', '-d'], + zst => ['zstd', '-q', '-d'], + lzo => ['lzop', '-q', '-d'], + }, }; die "ERROR: archive format not defined\n" -- 2.39.2