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 C1F41753DB for ; Wed, 23 Jun 2021 22:48:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BEA6AFB79 for ; Wed, 23 Jun 2021 22:48:26 +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 5EF42FB64 for ; Wed, 23 Jun 2021 22:48:25 +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 3547746768 for ; Wed, 23 Jun 2021 22:48:25 +0200 (CEST) Message-ID: Date: Wed, 23 Jun 2021 22:48:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:90.0) Gecko/20100101 Thunderbird/90.0 Content-Language: en-US To: Proxmox VE development discussion , Lorenz Stechauner References: <20210622091922.3143130-1-l.stechauner@proxmox.com> <20210622091922.3143130-8-l.stechauner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210622091922.3143130-8-l.stechauner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.857 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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_BLACK 3 Contains an URL listed in the URIBL blacklist [status.pm] Subject: [pve-devel] applied: [PATCH v10 storage 3/3] 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: Wed, 23 Jun 2021 20:48:26 -0000 On 22.06.21 11:19, Lorenz Stechauner wrote: > uses common function PVE::Tools::download_file_from_url to download > iso files. > > Only users with permissions `Sys.Audit` and `Sys.Modify` on `/` are > permitted to perform this action. This restriction is due to the > fact, that the download function is able to download files from > internal networks (which are not visible/accessible from outside). > Users with these permissions anyway have the means to alter node > (network) config, so this does not create any further security risk. > > Signed-off-by: Lorenz Stechauner > --- > PVE/API2/Storage/Status.pm | 116 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 116 insertions(+) > > diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm > index 11ad60f..5395ddd 100644 > --- a/PVE/API2/Storage/Status.pm > +++ b/PVE/API2/Storage/Status.pm > @@ -222,6 +222,7 @@ __PACKAGE__->register_method ({ > > my $res = [ > { subdir => 'content' }, > + { subdir => 'download-url' }, > { subdir => 'file-restore' }, > { subdir => 'prunebackups' }, > { subdir => 'rrd' }, > @@ -494,4 +495,119 @@ __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', > + enum => ['iso', 'vztmpl'], > + }, > + filename => { > + description => "The name of the file to create. Caution: This will be normalized!", FYI: I added a maxLength to this with 255, quite some FS have that as limit per file anyway (or had, it is generally quite long). > + 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 $rpcenv = PVE::RPCEnvironment::get(); > + my $user = $rpcenv->get_user(); > + > + 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'}; > + > + die "storage '$storage' is not configured for content-type '$content'\n" > + if !$scfg->{content}->{$content}; > + > + my $filename = PVE::Storage::normalize_content_filename($param->{filename}); > + > + my $path; > + if ($content eq 'iso') { > + if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { > + raise_param_exc({ filename => "wrong file extension" }); > + } > + $path = PVE::Storage::get_iso_dir($cfg, $storage); > + } elsif ($content eq 'vztmpl') { > + if ($filename !~ m![^/]+$PVE::Storage::vztmpl_extension_re$!) { > + raise_param_exc({ filename => "wrong file extension" }); > + } > + $path = PVE::Storage::get_vztmpl_dir($cfg, $storage); > + } else { > + raise_param_exc({ content => "upload content-type '$content' is not allowed" }); > + } > + > + PVE::Storage::activate_storage($cfg, $storage); > + File::Path::make_path($path); > + > + my $dccfg = PVE::Cluster::cfs_read_file('datacenter.cfg'); > + my $opts = { > + hash_required => 0, > + verify_certificates => $param->{'verify-certificates'} // 1, > + http_proxy => $dccfg->{http_proxy}, > + }; > + > + 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); > + }; > + > + return $rpcenv->fork_worker('download', $filename, $user, $worker);; double semi-colons and the worker ID is still not made safe, i.e., colons are still able to go through, FWICT, so I threw in a call to PVE::Tools::encode_text(), albeit I could swear we had another helper for exactly this... > + }}); > + > 1; >