From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: Lorenz Stechauner <l.stechauner@proxmox.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v7 manager 2/5] api: nodes: refactor aplinfo to use common download function
Date: Tue, 15 Jun 2021 09:57:59 +0200 [thread overview]
Message-ID: <44fd7722-f19b-b0d5-b54c-c3a425693825@proxmox.com> (raw)
In-Reply-To: <20210614090557.33455-5-l.stechauner@proxmox.com>
a common function to download arbitrary files from urls has been defined
as PVE::Tools::download_file_from_url and is now used.
On 14.06.21 11:05, Lorenz Stechauner wrote:
> Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
> ---
> PVE/API2/Nodes.pm | 89 ++++++-----------------------------------------
> 1 file changed, 10 insertions(+), 79 deletions(-)
>
> diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
> index 77fa710a..49abe93a 100644
> --- a/PVE/API2/Nodes.pm
> +++ b/PVE/API2/Nodes.pm
> @@ -1513,88 +1513,19 @@ __PACKAGE__->register_method({
> my $src = $pd->{location};
> my $tmpldir = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage});
> my $dest = "$tmpldir/$template";
> - my $tmpdest = "$tmpldir/${template}.tmp.$$";
>
> - my $worker = sub {
> - my $upid = shift;
> -
> - print "starting template download from: $src\n";
> - print "target file: $dest\n";
> -
> - my $check_hash = sub {
> - my ($template_info, $filename, $noerr) = @_;
> -
> - my $digest;
> - my $expected;
> -
> - eval {
> - open(my $fh, '<', $filename) or die "Can't open '$filename': $!";
> - binmode($fh);
> - if (defined($template_info->{sha512sum})) {
> - $expected = $template_info->{sha512sum};
> - $digest = Digest::SHA->new(512)->addfile($fh)->hexdigest;
> - } elsif (defined($template_info->{md5sum})) {
> - #fallback to MD5
> - $expected = $template_info->{md5sum};
> - $digest = Digest::MD5->new->addfile($fh)->hexdigest;
> - } else {
> - die "no expected checksum defined";
> - }
> - close($fh);
> - };
> -
> - die "checking hash failed - $@\n" if $@ && !$noerr;
> -
> - return ($digest, $digest ? lc($digest) eq lc($expected) : 0);
> - };
> -
> - eval {
> - if (-f $dest) {
> - my ($hash, $correct) = &$check_hash($pd, $dest, 1);
> -
> - if ($hash && $correct) {
> - print "file already exists $hash - no need to download\n";
> - return;
> - }
> - }
> -
> - local %ENV;
> - my $dccfg = PVE::Cluster::cfs_read_file('datacenter.cfg');
> - if ($dccfg->{http_proxy}) {
> - $ENV{http_proxy} = $dccfg->{http_proxy};
> - }
> -
> - my @cmd = ('/usr/bin/wget', '--progress=dot:mega', '-O', $tmpdest, $src);
> - if (system (@cmd) != 0) {
> - die "download failed - $!\n";
> - }
> -
> - my ($hash, $correct) = &$check_hash($pd, $tmpdest);
> -
> - die "could not calculate checksum\n" if !$hash;
> -
> - if (!$correct) {
> - my $expected = $pd->{sha512sum} // $pd->{md5sum};
> - die "wrong checksum: $hash != $expected\n";
> - }
> -
> - if (!rename($tmpdest, $dest)) {
> - die "unable to save file - $!\n";
> - }
> - };
> - my $err = $@;
> -
> - unlink $tmpdest;
> -
> - if ($err) {
> - print "\n";
> - die $err if $err;
> - }
> -
> - print "download finished\n";
> + my $opts = {
> + hash_required => 1,
> + sha512sum => $pd->{sha512sum},
> + md5sum => $pd->{md5sum},
> };
>
> - return $rpcenv->fork_worker('download', undef, $user, $worker);
> + 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, $src, $opts);
> }});
>
> __PACKAGE__->register_method({
next prev parent reply other threads:[~2021-06-15 7:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 9:05 [pve-devel] [PATCH-SERIES v7 manager/common/storage] fix #1710: add downlaod from url button Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 common 1/1] tools: add download_file_from_url Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
2021-06-15 12:25 ` [pve-devel] applied: " Thomas Lamprecht
2021-06-14 9:05 ` [pve-devel] [PATCH v7 storage 1/1] status: add download_url method Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 1/5] api: nodes: add query_url_metadata method Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 2/5] api: nodes: refactor aplinfo to use common download function Lorenz Stechauner
2021-06-15 7:57 ` Lorenz Stechauner [this message]
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 3/5] ui: add HashAlgorithmSelector Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 4/5] ui: Utils: change download task format Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 5/5] fix #1710: ui: storage: add download from url button Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44fd7722-f19b-b0d5-b54c-c3a425693825@proxmox.com \
--to=l.stechauner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox