X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAPI2%2FUser.pm;h=6208ad5bdfa94e65e374937d926ef1eae34ef37f;hp=5cfb155fca8dafaf577900975ebb97969125d660;hb=62af314a96068a16311be6e04788fb51bc66855b;hpb=b9180ed235f8ae6d7517fb232a1ed1986082e88f

diff --git a/PVE/API2/User.pm b/PVE/API2/User.pm
index 5cfb155..6208ad5 100644
--- a/PVE/API2/User.pm
+++ b/PVE/API2/User.pm
@@ -21,7 +21,7 @@ my $extract_user_data = sub {
 
     my $res = {};
 
-    foreach my $prop (qw(enable expire firstname lastname email comment)) {
+    foreach my $prop (qw(enable expire firstname lastname email comment keys)) {
 	$res->{$prop} = $data->{$prop} if defined($data->{$prop});
     }
 
@@ -37,7 +37,10 @@ __PACKAGE__->register_method ({
     path => '', 
     method => 'GET',
     description => "User index.",
-    permissions => { user => 'all' },
+    permissions => { 
+	description => "The returned list is restricted to users where you have 'User.Modify' or 'Sys.Audit' permissions on '/access/groups' or on a group the user belongs too. But it always includes the current (authenticated) user.",
+	user => 'all',
+    },
     parameters => {
 	additionalProperties => 0,
 	properties => {
@@ -67,9 +70,8 @@ __PACKAGE__->register_method ({
 
 	my $res = [];
 
-	my $privs = [ 'Sys.UserMod', 'Sys.UserAdd' ];
-
-	my $canUserMod = $rpcenv->check_any($authuser, "/access", $privs, 1);
+	my $privs = [ 'User.Modify', 'Sys.Audit' ];
+	my $canUserMod = $rpcenv->check_any($authuser, "/access/groups", $privs, 1);
 	my $groups = $rpcenv->filter_groups($authuser, $privs, 1);
 	my $allowed_users = $rpcenv->group_member_join([keys %$groups]);      
 
@@ -98,6 +100,13 @@ __PACKAGE__->register_method ({
     protected => 1,
     path => '', 
     method => 'POST',
+    permissions => { 
+	description => "You need 'Realm.AllocateUser' on '/access/realm/<realm>' on the realm of user <userid>, and 'User.Modify' permissions to '/access/groups/<group>' for any group specified (or 'User.Modify' on '/access/groups' if you pass no groups.",
+	check => [ 'and',
+		   [ 'userid-param', 'Realm.AllocateUser'],
+		   [ 'userid-group', ['User.Modify'], groups_param => 1],
+	    ],
+    },
     description => "Create new user.",
     parameters => {
    	additionalProperties => 0,
@@ -115,6 +124,11 @@ __PACKAGE__->register_method ({
 	    lastname => { type => 'string', optional => 1 },
 	    email => { type => 'string', optional => 1, format => 'email-opt' },
 	    comment => { type => 'string', optional => 1 },
+	    keys => {
+		description => "Keys for two factor auth (yubico).",
+		type => 'string', 
+		optional => 1,
+	    },
 	    expire => { 
 		description => "Account expiration date (seconds since epoch). '0' means no expiration date.",
 		type => 'integer', 
@@ -164,6 +178,7 @@ __PACKAGE__->register_method ({
 		$usercfg->{users}->{$username}->{lastname} = $param->{lastname} if $param->{lastname};
 		$usercfg->{users}->{$username}->{email} = $param->{email} if $param->{email};
 		$usercfg->{users}->{$username}->{comment} = $param->{comment} if $param->{comment};
+		$usercfg->{users}->{$username}->{keys} = $param->{keys} if $param->{keys};
 
 		cfs_write_file("user.cfg", $usercfg);
 	    }, "create user failed");
@@ -176,6 +191,9 @@ __PACKAGE__->register_method ({
     path => '{userid}', 
     method => 'GET',
     description => "Get user configuration.",
+    permissions => { 
+	check => ['userid-group', ['User.Modify', 'Sys.Audit']],
+    },
     parameters => {
    	additionalProperties => 0,
 	properties => {
@@ -191,6 +209,7 @@ __PACKAGE__->register_method ({
 	    lastname => { type => 'string', optional => 1 },
 	    email => { type => 'string', optional => 1 },
 	    comment => { type => 'string', optional => 1 },    
+	    keys => { type => 'string', optional => 1 },    
 	    groups => { type => 'array' },
 	}
     },
@@ -212,6 +231,9 @@ __PACKAGE__->register_method ({
     protected => 1,
     path => '{userid}', 
     method => 'PUT',
+    permissions => { 
+	check => ['userid-group', ['User.Modify'], groups_param => 1 ],
+    },
     description => "Update user configuration.",
     parameters => {
    	additionalProperties => 0,
@@ -232,6 +254,11 @@ __PACKAGE__->register_method ({
 	    lastname => { type => 'string', optional => 1 },
 	    email => { type => 'string', optional => 1, format => 'email-opt' },
 	    comment => { type => 'string', optional => 1 },
+	    keys => {
+		description => "Keys for two factor auth (yubico).",
+		type => 'string', 
+		optional => 1,
+	    },
 	    expire => { 
 		description => "Account expiration date (seconds since epoch). '0' means no expiration date.",
 		type => 'integer', 
@@ -275,6 +302,7 @@ __PACKAGE__->register_method ({
 		$usercfg->{users}->{$username}->{lastname} = $param->{lastname} if defined($param->{lastname});
 		$usercfg->{users}->{$username}->{email} = $param->{email} if defined($param->{email});
 		$usercfg->{users}->{$username}->{comment} = $param->{comment} if defined($param->{comment});
+		$usercfg->{users}->{$username}->{keys} = $param->{keys} if defined($param->{keys});
 
 		cfs_write_file("user.cfg", $usercfg);
 	    }, "update user failed");
@@ -288,7 +316,12 @@ __PACKAGE__->register_method ({
     path => '{userid}', 
     method => 'DELETE',
     description => "Delete user.",
-    permissions => { user => 'all' },
+    permissions => { 
+	check => [ 'and',
+		   [ 'userid-param', 'Realm.AllocateUser'],
+		   [ 'userid-group', ['User.Modify']],
+	    ],
+    },
     parameters => {
    	additionalProperties => 0,
 	properties => {
@@ -310,18 +343,13 @@ __PACKAGE__->register_method ({
 
 		my $usercfg = cfs_read_file("user.cfg");
 
-		PVE::AccessControl::check_user_exist($usercfg, $userid);
-
-		my $privs = [ 'Sys.UserAdd' ]; # there is no Sys.UserDel
-		if (!$rpcenv->check($authuser, "/access", $privs, 1)) {
-		    my $groups = $rpcenv->filter_groups($authuser, sub { return "/access/groups/" . shift; }, $privs, 1);
-		    my $allowed_users = $rpcenv->group_member_join([keys %$groups]);      
-		    raise_perm_exc() if !$allowed_users->{$userid};
+		my $domain_cfg = cfs_read_file('domains.cfg');
+		if (my $cfg = $domain_cfg->{ids}->{$realm}) {
+		    my $plugin = PVE::Auth::Plugin->lookup($cfg->{type});
+		    $plugin->delete_user($cfg, $realm, $ruid);
 		}
 
-		delete ($usercfg->{users}->{$userid});
-
-		PVE::AccessControl::delete_shadow_password($ruid) if $realm eq 'pve';
+		delete $usercfg->{users}->{$userid};
 
 		PVE::AccessControl::delete_user_group($userid, $usercfg);
 		PVE::AccessControl::delete_user_acl($userid, $usercfg);