fix #3505: status: add checksum and algorithm to file upload

[pve-storage.git] / PVE / API2 / Storage / Status.pm

diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm
index 796ab6699b996763264161013dd346e53db2ab68..6108ba1a7e33bfbe894ba9685b2fb35e72727cbc 100644 (file)
--- a/PVE/API2/Storage/Status.pm
+++ b/PVE/API2/Storage/Status.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use File::Basename;
 use File::Path;
+use POSIX qw(ENOENT);
 
 use PVE::Cluster;
 use PVE::Exception qw(raise_param_exc);
@@ -13,7 +14,7 @@ use PVE::JSONSchema qw(get_standard_option);
 use PVE::RESTHandler;
 use PVE::RPCEnvironment;
 use PVE::RRD;
-use PVE::Tools;
+use PVE::Tools qw(run_command);
 
 use PVE::API2::Storage::Content;
 use PVE::API2::Storage::FileRestore;
@@ -387,6 +388,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',
@@ -445,7 +459,7 @@ __PACKAGE__->register_method ({
        # best effort to match apl_download behaviour
        chmod 0644, $tmpfilename;
 
-       # we simply overwrite the destination file if it already exists
+       my $err_cleanup = sub { unlink $dest, $tmpfilename; die "cleanup failed: $!" if $! && $! != ENOENT };
 
        my $cmd;
        if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) {
@@ -455,48 +469,73 @@ __PACKAGE__->register_method ({
 
            my @remcmd = ('/usr/bin/ssh', @ssh_options, $remip, '--');
 
-           eval {
-               # activate remote storage
-               PVE::Tools::run_command([@remcmd, '/usr/sbin/pvesm', 'status',
-                                        '--storage', $param->{storage}]);
+           eval { # activate remote storage
+               run_command([@remcmd, '/usr/sbin/pvesm', 'status', '--storage', $param->{storage}]);
            };
            die "can't activate storage '$param->{storage}' on node '$node': $@\n" if $@;
 
-           PVE::Tools::run_command([@remcmd, '/bin/mkdir', '-p', '--', PVE::Tools::shell_quote($dirname)],
-                                   errmsg => "mkdir failed");
+           run_command(
+               [@remcmd, '/bin/mkdir', '-p', '--', PVE::Tools::shell_quote($dirname)],
+               errmsg => "mkdir failed",
+           );
  
            $cmd = ['/usr/bin/scp', @ssh_options, '-p', '--', $tmpfilename, "[$remip]:" . PVE::Tools::shell_quote($dest)];
+
+           $err_cleanup = sub { run_command([@remcmd, 'rm', '-f', '--', $dest, $tmpfilename]) };
        } else {
            PVE::Storage::activate_storage($cfg, $param->{storage});
            File::Path::make_path($dirname);
            $cmd = ['cp', '--', $tmpfilename, $dest];
        }
 
+       # NOTE: we simply overwrite the destination file if it already exists
        my $worker = sub {
            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 = $@) {
+               # unlinks only the temporary file from the http server
+               unlink $tmpfilename;
+               warn "unable to clean up temporory file '$tmpfilename' - $!\n"
+                   if $! && $! != ENOENT;
+               die $err;
+           }
+
            print "target node: $node\n";
            print "target file: $dest\n";
            print "file size is: $size\n";
            print "command: " . join(' ', @$cmd) . "\n";
 
-           eval { PVE::Tools::run_command($cmd, errmsg => 'import failed'); };
+           eval { run_command($cmd, errmsg => 'import failed'); };
+
+           unlink $tmpfilename; # the temporary file got only uploaded locally, no need to rm remote
+           warn "unable to clean up temporary file '$tmpfilename' - $!\n" if $! && $! != ENOENT;
+
            if (my $err = $@) {
-               unlink $dest;
+               eval { $err_cleanup->() };
+               warn "$@" if $@;
                die $err;
            }
            print "finished file import successfully\n";
        };
 
-       my $upid = $rpcenv->fork_worker('imgcopy', undef, $user, $worker);
-
-       # apache removes the temporary file on return, so we need
-       # to wait here to make sure the worker process starts and
-       # opens the file before it gets removed.
-       sleep(1);
-
-       return $upid;
+       return $rpcenv->fork_worker('imgcopy', undef, $user, $worker);
    }});
 
 __PACKAGE__->register_method({