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 9F76779F6E for ; Thu, 6 May 2021 11:24:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 808901E283 for ; Thu, 6 May 2021 11:24:10 +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 id CE6981E27A for ; Thu, 6 May 2021 11:24:09 +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 9DE2C42A04 for ; Thu, 6 May 2021 11:24:09 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Thu, 6 May 2021 11:23:47 +0200 Message-Id: <20210506092347.47272-1-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210506091105.40976-4-l.stechauner@proxmox.com> References: <20210506091105.40976-4-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.704 Adjusted score from AWL reputation of From: address 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. [storage.pm, status.pm] Subject: [pve-devel] [PATCH v5 storage] status: add download_url method 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, 06 May 2021 09:24:40 -0000 Signed-off-by: Lorenz Stechauner --- Somehow I forgot to git add Status.pm after a fix... PVE/API2/Storage/Status.pm | 117 +++++++++++++++++++++++++++++++++++-- PVE/Storage.pm | 10 ++++ 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index 897b4a7..f8ca329 100644 --- a/PVE/API2/Storage/Status.pm +++ b/PVE/API2/Storage/Status.pm @@ -412,11 +412,7 @@ __PACKAGE__->register_method ({ my $size = -s $tmpfilename; die "temporary file '$tmpfilename' does not exist\n" if !defined($size); - my $filename = $param->{filename}; - - chomp $filename; - $filename =~ s/^.*[\/\\]//; - $filename =~ s/[^-a-zA-Z0-9_.]/_/g; + my $filename = PVE::Storage::normalize_content_filename($param->{filename}); my $path; @@ -497,4 +493,115 @@ __PACKAGE__->register_method ({ return $upid; }}); +__PACKAGE__->register_method({ + name => 'download_url', + path => '{storage}/download-url', + method => 'POST', + description => "Download templates and ISO images by using an URL.", + proxyto => 'node', + permissions => { + check => [ 'and', + ['perm', '/storage/{storage}', [ 'Datastore.AllocateTemplate' ]], + ['perm', '/', [ 'Sys.Audit', 'Sys.Modify' ]], + ], + }, + protected => 1, + parameters => { + additionalProperties => 0, + properties => { + node => get_standard_option('pve-node'), + storage => get_standard_option('pve-storage-id'), + url => { + description => "The URL to download the file from.", + type => 'string', + pattern => 'https?://.*', + }, + content => { + description => "Content type.", + type => 'string', format => 'pve-storage-content', + }, + filename => { + description => "The name of the file to create.", + type => 'string', + }, + checksum => { + description => "The expected checksum of the file.", + type => 'string', + requires => 'checksum-algorithm', + optional => 1, + }, + 'checksum-algorithm' => { + description => "The algorithm to calculate the checksum of the file.", + type => 'string', + enum => ['md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512'], + requires => 'checksum', + optional => 1, + }, + 'verify-certificates' => { + description => "If false, no SSL/TLS certificates will be verified.", + type => 'boolean', + optional => 1, + default => 1, + } + }, + }, + returns => { + type => "string" + }, + code => sub { + my ($param) = @_; + + my $cfg = PVE::Storage::config(); + + my ($node, $storage) = $param->@{'node', 'storage'}; + 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'}; + + my $filename = PVE::Storage::normalize_content_filename($param->{filename}); + my $path; + + # MIME type is checked in front end only + # this check is omitted here intentionally and replaced by file extension check + if ($content eq 'iso') { + if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { + raise_param_exc({ filename => "missing '.iso' or '.img' extension" }); + } + $path = PVE::Storage::get_iso_dir($cfg, $storage); + } elsif ($content eq 'vztmpl') { + if ($filename !~ m![^/]+\.tar\.[gx]z$!) { + raise_param_exc({ filename => "missing '.tar.gz' or '.tar.xz' extension" }); + } + $path = PVE::Storage::get_vztmpl_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}; + + PVE::Storage::activate_storage($cfg, $storage); + File::Path::make_path($path); + + my $dest = "$path/$filename"; + + my $opts = { + hash_required => 0, + }; + + my ($checksum, $checksum_algorithm) = $param->@{'checksum', 'checksum-algorithm'}; + if ($checksum) { + $opts->{"${checksum_algorithm}sum"} = $checksum; + $opts->{hash_required} = 1; + } + + my $dccfg = PVE::Cluster::cfs_read_file('datacenter.cfg'); + if ($dccfg->{http_proxy}) { + $opts->{http_proxy} = $dccfg->{http_proxy}; + } + + return PVE::Tools::download_file_from_url($dest, $url, $opts); + }}); + 1; diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 122c3e9..d57fd43 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1931,4 +1931,14 @@ sub assert_sid_unused { return undef; } +sub normalize_content_filename { + my ($filename) = @_; + + chomp $filename; + $filename =~ s/^.*[\/\\]//; + $filename =~ s/[^-a-zA-Z0-9_.]/_/g; + + return $filename; +} + 1; -- 2.20.1