Fix #861: use safer sprintf formatting

[pve-access-control.git] / PVE / RPCEnvironment.pm

diff --git a/PVE/RPCEnvironment.pm b/PVE/RPCEnvironment.pm
index 765008eee5c63a5ee0b3ae591c25da372f770153..b3a7dc7ade4072e576e2b0b9b661f9512a6049a5 100644 (file)
--- a/PVE/RPCEnvironment.pm
+++ b/PVE/RPCEnvironment.pm
@@ -14,7 +14,6 @@ use PVE::INotify;
 use PVE::Cluster;
 use PVE::ProcFSTools;
 use PVE::AccessControl;
-use Cwd 'abs_path';
 
 # we use this singleton class to pass RPC related environment values
 
@@ -287,11 +286,9 @@ sub check_volume_access {
 
     # test if we have read access to volid
 
-    my $path;
     my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
     if ($sid) {
-       my ($ownervm, $vtype);
-       ($path, $ownervm, $vtype) = PVE::Storage::path($storecfg, $volid);
+       my ($vtype, undef, $ownervm) = PVE::Storage::parse_volname($storecfg, $volid);
        if ($vtype eq 'iso' || $vtype eq 'vztmpl') {
            # we simply allow access 
        } elsif (defined($ownervm) && defined($vmid) && ($ownervm == $vmid)) {
@@ -306,13 +303,9 @@ sub check_volume_access {
     } else {
        die "Only root can pass arbitrary filesystem paths."
            if $user ne 'root@pam';
-
-       $path = abs_path($volid);
-       if ($path =~ m|^(/.+)$|) {
-           $path = $1; # untaint any path
-       }
     }
-    return $path;
+
+    return undef;
 }
 
 sub is_group_member {
@@ -683,7 +676,7 @@ sub active_workers  {
        my @arlist = ();
        foreach my $task (@ta) {
            if (!$task->{saved}) {
-               $archive .= sprintf("$task->{upid} %08X $task->{status}\n", $task->{endtime});
+               $archive .= sprintf("%s %08X %s\n", $task->{upid}, $task->{endtime}, $task->{status});
                $save = 1;
                push @arlist, $task;
                $task->{saved} = 1;