X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FRPCEnvironment.pm;h=52c5f64ce0cf577b1785ba390afef9a97a179e43;hp=d14104a7cacfb4624d77e6555871b7276a94147e;hb=cee5583b3dfff0b68dbb42a93ec90f4d4f1bd7b3;hpb=17ecec711f29ee5a4a872c21710329c425c650bf

diff --git a/PVE/RPCEnvironment.pm b/PVE/RPCEnvironment.pm
index d14104a..52c5f64 100644
--- 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 CGI;
 
 # we use this singleton class to pass RPC related environment values
 
@@ -287,23 +286,26 @@ sub check_volume_access {
 
     # test if we have read access to volid
 
-    my $path;
-    if (my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1)) {
-	my ($ownervm, $vtype);
-	($path, $ownervm, $vtype) = PVE::Storage::path($storecfg, $volid);
+    my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
+    if ($sid) {
+	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']);
 	}
     } else {
 	die "Only root can pass arbitrary filesystem paths."
 	    if $user ne 'root@pam';
-
-	$path = abs_path($volid);
     }
-    return $path;
+
+    return undef;
 }
 
 sub is_group_member {
@@ -421,12 +423,12 @@ sub exec_api2_perm_check {
 	}
 	return 1;
     } elsif ($test eq 'userid-param') {
-	my ($userid, undef, $realm) = verify_username($param->{userid});
-	return if !$self->check_user_exist($userid, $noerr);
+	my ($userid, undef, $realm) = PVE::AccessControl::verify_username($param->{userid});
 	my ($t, $subtest) = @$check;
 	die "missing parameters" if !$subtest;
 	if ($subtest eq 'self') {
-	    return 1 if $username eq 'userid';
+	    return 0 if !$self->check_user_exist($userid, $noerr);
+	    return 1 if $username eq $userid;
 	    return 0 if $noerr;
 	    raise_perm_exc();
 	} elsif ($subtest eq 'Realm.AllocateUser') {
@@ -518,51 +520,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) = @_;
@@ -575,11 +532,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'";
 	}
@@ -818,14 +770,14 @@ sub check_worker {
 # STDOUT,STDERR are redirected to the filename returned by upid_decode
 # NOTE: we simulate running in foreground if ($self->{type} eq 'cli')
 sub fork_worker {
-    my ($self, $dtype, $id, $user, $function) = @_;
+    my ($self, $dtype, $id, $user, $function, $background) = @_;
 
     $dtype = 'unknown' if !defined ($dtype);
     $id = '' if !defined ($id);
 
     $user = 'root@pve' if !defined ($user);
 
-    my $sync = $self->{type} eq 'cli' ? 1 : 0;
+    my $sync = ($self->{type} eq 'cli' && !$background) ? 1 : 0;
 
     local $SIG{INT} = 
 	local $SIG{QUIT} =