From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lorenz Stechauner <l.stechauner@proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 storage 1/1] status: add checksum and algorithm to file upload
Date: Fri, 30 Jul 2021 15:15:51 +0200 [thread overview]
Message-ID: <e941b9a1-bb1d-941c-1d0e-64f68ead446e@proxmox.com> (raw)
In-Reply-To: <20210722130631.237107-5-l.stechauner@proxmox.com>
Missing prefix "fix #3505: "
On 22/07/2021 15:06, Lorenz Stechauner wrote:
> Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
> ---
> 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";
>
next prev parent reply other threads:[~2021-07-30 13:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 13:06 [pve-devel] [PATCH-SERIES v2 http-server/storage/manager] add checksum and algorithm to iso upload Lorenz Stechauner
2021-07-22 13:06 ` [pve-devel] [PATCH v2 http-server 1/1] anyevent: move unlink from http-server to endpoint Lorenz Stechauner
2021-07-22 13:06 ` [pve-devel] [PATCH v2 storage 1/3] status: move unlink from http-server to enpoint Lorenz Stechauner
2021-07-30 13:13 ` Thomas Lamprecht
2021-07-22 13:06 ` [pve-devel] [PATCH v2 storage 2/3] status: remove sleep(1) in file upload Lorenz Stechauner
2021-07-22 13:06 ` [pve-devel] [PATCH v2 storage 1/1] status: add checksum and algorithm to " Lorenz Stechauner
2021-07-30 13:15 ` Thomas Lamprecht [this message]
2021-07-22 13:06 ` [pve-devel] [PATCH v2 manager 1/5] ui: move upload window into UploadToStorage.js Lorenz Stechauner
2021-07-22 13:06 ` [pve-devel] [PATCH v2 manager 2/5] ui: refactor UploadToStorage.js Lorenz Stechauner
2021-08-02 14:34 ` Dominik Csapak
2021-07-22 13:06 ` [pve-devel] [PATCH v2 manager 3/5] ui/UploadToStorage: add checksum and algorithm Lorenz Stechauner
2021-08-02 14:37 ` Dominik Csapak
2021-07-22 13:06 ` [pve-devel] [PATCH v2 manager 4/5] ui/UploadToStorage: add TaskViewer Lorenz Stechauner
2021-07-22 13:06 ` [pve-devel] [PATCH v2 manager 5/5] ui/UplaodToStorage: check file extension Lorenz Stechauner
2021-08-02 14:40 ` Dominik Csapak
2021-07-30 13:19 ` [pve-devel] [PATCH-SERIES v2 http-server/storage/manager] add checksum and algorithm to iso upload Thomas Lamprecht
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=e941b9a1-bb1d-941c-1d0e-64f68ead446e@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=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