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 90BF46A5BD for ; Fri, 30 Jul 2021 15:16:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E6AB11E0C for ; Fri, 30 Jul 2021 15:15:56 +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 1D53111DFC for ; Fri, 30 Jul 2021 15:15:53 +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 E6B6742C90 for ; Fri, 30 Jul 2021 15:15:52 +0200 (CEST) Message-ID: Date: Fri, 30 Jul 2021 15:15:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.0 Content-Language: en-GB To: Proxmox VE development discussion , Lorenz Stechauner References: <20210722130631.237107-1-l.stechauner@proxmox.com> <20210722130631.237107-5-l.stechauner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210722130631.237107-5-l.stechauner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.479 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 NICE_REPLY_A -0.202 Looks like a legit reply (A) 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. [status.pm] Subject: Re: [pve-devel] [PATCH v2 storage 1/1] status: add checksum and algorithm to file upload 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: Fri, 30 Jul 2021 13:16:26 -0000 Missing prefix "fix #3505: " On 22/07/2021 15:06, Lorenz Stechauner wrote: > Signed-off-by: Lorenz Stechauner > --- > PVE/API2/Storage/Status.pm | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm > index 9cf6e40..4b9fda5 100644 > --- a/PVE/API2/Storage/Status.pm > +++ b/PVE/API2/Storage/Status.pm > @@ -385,6 +385,19 @@ __PACKAGE__->register_method ({ > maxLength => 255, > 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, > + }, > tmpfilename => { > description => "The source file name. This parameter is usually set by the REST handler. You can only overwrite it when connecting to the trusted port on localhost.", > type => 'string', > @@ -474,6 +487,27 @@ __PACKAGE__->register_method ({ > my $upid = shift; > > print "starting file import from: $tmpfilename\n"; > + > + eval { > + my ($checksum, $checksum_algorithm) = $param->@{'checksum', 'checksum-algorithm'}; > + if ($checksum_algorithm) { > + print "calculating checksum..."; > + > + my $checksum_got = PVE::Tools::get_file_hash($checksum_algorithm, $tmpfilename); > + > + if (lc($checksum_got) eq lc($checksum)) { > + print "OK, checksum verified\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'\n"; > + } > + } > + }; > + if (my $err = $@) { > + unlink $tmpfilename or warn "unable to clean up temporory file '$tmpfilename' - $!"; > + die $err; > + } > + > print "target node: $node\n"; > print "target file: $dest\n"; > print "file size is: $size\n"; >