X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FRPCEnvironment.pm;h=ca845f0f8b5efe8aaba3b6471bee860847eca17d;hp=faa4fb2486e8ad5d5896cf862c1afe7da6154c8e;hb=854f1dceb6f1bb733518a8a77df670768d9f5392;hpb=1e15ebe7b535fde0da6205dff7efda781f1aaca9

diff --git a/PVE/RPCEnvironment.pm b/PVE/RPCEnvironment.pm
index faa4fb2..ca845f0 100644
--- a/PVE/RPCEnvironment.pm
+++ b/PVE/RPCEnvironment.pm
@@ -15,7 +15,6 @@ use PVE::Cluster;
 use PVE::ProcFSTools;
 use PVE::AccessControl;
 use Cwd 'abs_path';
-use CGI;
 
 # we use this singleton class to pass RPC related environment values
 
@@ -291,11 +290,15 @@ sub check_volume_access {
     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 (!$ownervm || ($ownervm != $vmid)) {
+	} elsif (defined($ownervm) && defined($vmid) && ($ownervm == $vmid)) {
+	    # we are owner - allow access 
+	} elsif ($vtype eq 'backup' && $ownervm) {
+	    $self->check($user, "/storage/$sid", ['Datastore.AllocateSpace']);
+	    $self->check($user, "/vms/$ownervm", ['VM.Backup']);
+	} else {
 	    # allow if we are Datastore administrator
 	    $self->check($user, "/storage/$sid", ['Datastore.Allocate']);
 	}
@@ -523,51 +526,6 @@ sub get {
     return $pve_env;
 }
 
-sub parse_params {
-    my ($self, $enable_upload) = @_;
-
-    if ($self->{request_rec}) {
-	my $cgi;
-	if ($enable_upload) {
-	    $cgi = CGI->new($self->{request_rec});
-	} else {
-	    # disable upload using empty upload_hook
-	    $cgi = CGI->new($self->{request_rec}, sub {}, undef, 0);
-	}
-	$self->{cgi} = $cgi;
-	my $params = $cgi->Vars();
-	return PVE::Tools::decode_utf8_parameters($params);
-    } elsif ($self->{params}) {
-	return $self->{params};
-    } else {
-	die "no parameters registered";
-    }
-}
-
-sub get_upload_info {
-    my ($self, $param) = @_;
-
-    my $cgi = $self->{cgi};
-    die "CGI not initialized" if !$cgi;
-
-    my $pd = $cgi->param($param);
-    die "unable to get cgi parameter info\n" if !$pd;
-    my $info = $cgi->uploadInfo($pd);
-    die "unable to get cgi upload info\n" if !$info;
-
-    my $res = { %$info };
-
-    my $tmpfilename = $cgi->tmpFileName($pd);
-    die "unable to get cgi upload file name\n" if !$tmpfilename;
-    $res->{tmpfilename} = $tmpfilename;
-
-    #my $hndl = $cgi->upload($param);
-    #die "unable to get cgi upload handle\n" if !$hndl;
-    #$res->{handle} = $hndl->handle;
-
-    return $res;
-}
-
 # init_request - must be called before each RPC request
 sub init_request {
     my ($self, %params) = @_;
@@ -580,11 +538,6 @@ sub init_request {
     foreach my $p (keys %params) {
 	if ($p eq 'userconfig') {
 	    $userconfig = $params{$p};
-	} elsif ($p eq 'request_rec') {
-	    # pass Apache2::RequestRec
-	    $self->{request_rec} = $params{$p};
-	} elsif ($p eq 'params') {
-	    $self->{params} = $params{$p};
 	} else {
 	    die "unknown parameter '$p'";
 	}