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 3C94C72A14 for ; Wed, 16 Jun 2021 12:46:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3A4F310971 for ; Wed, 16 Jun 2021 12:46:15 +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 8606710959 for ; Wed, 16 Jun 2021 12:46:14 +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 5F7F04404E for ; Wed, 16 Jun 2021 12:46:14 +0200 (CEST) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Date: Wed, 16 Jun 2021 12:45:18 +0200 Message-Id: <20210616104518.310894-1-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.880 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_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tools.pm] Subject: [pve-devel] applied: [PATCH] tools: download from url: add option to allow overriding existing files 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, 16 Jun 2021 10:46:15 -0000 Signed-off-by: Thomas Lamprecht --- allows for slightly nicer UX and drops the confusing special case of "always allow overwriting if no checksum algorithm was passed". src/PVE/Tools.pm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index 9046b4f..465c338 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -1842,6 +1842,7 @@ sub safe_compare { # opts is a hash ref with the following known properties +# allow_overwrite - if 1, overwriting existing files is allowed, use with care. Default to false # hash_required - if 1, at least one checksum has to be specified otherwise an error will be thrown # http_proxy # https_proxy @@ -1862,17 +1863,22 @@ sub download_file_from_url { print "downloading $url to $dest\n"; - if (-f $dest && $checksum_algorithm) { - print "calculating checksum of existing file..."; - my $checksum_got = get_file_hash($checksum_algorithm, $dest); + if (-f $dest) { + if ($checksum_algorithm) { + print "calculating checksum of existing file..."; + my $checksum_got = get_file_hash($checksum_algorithm, $dest); - if (lc($checksum_got) eq lc($checksum_expected)) { - print "OK, got correct file already, no need to download\n"; - return; - } else { - # we could re-download, but may not be safe so just abort for now.. - print "\n"; # the front end expects the error to reside at the last line without any noise - die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected', aborting\n"; + if (lc($checksum_got) eq lc($checksum_expected)) { + print "OK, got correct file already, no need to download\n"; + return; + } elsif ($opts->{allow_overwrite}) { + print "checksum mismatch: got '$checksum_got' != expect '$checksum_expected', re-download\n"; + } else { + print "\n"; # the front end expects the error to reside at the last line without any noise + die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected', aborting\n"; + } + } elsif (!$opts->{allow_overwrite}) { + die "refusing to override existing file '$dest'\n"; } } -- 2.30.2