rpcenv: drop unused roles()

[pve-access-control.git] / test / perm-test6.pl

diff --git a/test/perm-test6.pl b/test/perm-test6.pl
index 58ced5f7a110da9b96ea923be3d637eda9014ec5..71e2a701669d003c13fb78539232394c05392d3e 100755 (executable)
--- a/test/perm-test6.pl
+++ b/test/perm-test6.pl
@@ -14,7 +14,7 @@ $rpcenv->init_request(userconfig => $cfgfn);
 sub check_roles {
     my ($user, $path, $expected_result) = @_;
 
-    my @ra = $rpcenv->roles($user, $path);
+    my @ra = PVE::AccessControl::roles($rpcenv->{user_cfg}, $user, $path);
     my $res = join(',', sort @ra);
 
     die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
@@ -23,6 +23,23 @@ sub check_roles {
     print "ROLES:$path:$user:$res\n";
 }
 
+sub check_permissions {
+    my ($user, $path, $expected_result) = @_;
+
+    my $perm = $rpcenv->permissions($user, $path);
+    my $res = join(',', sort keys %$perm);
+
+    die "unexpected result\nneed '${expected_result}'\ngot '$res'\n"
+       if $res ne $expected_result;
+
+    $perm = $rpcenv->permissions($user, $path);
+    $res = join(',', sort keys %$perm);
+    die "unexpected result (compiled)\nneed '${expected_result}'\ngot '$res'\n"
+       if $res ne $expected_result;
+
+    print "PERM:$path:$user:$res\n";
+}
+
 check_roles('User1@pve', '', '');
 check_roles('User2@pve', '', '');
 check_roles('User3@pve', '', '');
@@ -43,25 +60,32 @@ check_roles('User2@pve', '/vms/300', 'RoleTEST1');
 check_roles('User3@pve', '/vms/300', 'NoAccess');
 check_roles('User4@pve', '/vms/300', 'Role1');
 
-check_roles('User1@pve', '/vms/500', 'RoleDEVEL,RoleTEST1');
-check_roles('User2@pve', '/vms/500', 'RoleDEVEL,RoleTEST1');
+check_permissions('User1@pve', '/vms/500', 'VM.Console,VM.PowerMgmt');
+check_permissions('User2@pve', '/vms/500', 'VM.Console,VM.PowerMgmt');
+# without pool
 check_roles('User3@pve', '/vms/500', 'NoAccess');
+# with pool
+check_permissions('User3@pve', '/vms/500', '');
+# without pool
 check_roles('User4@pve', '/vms/500', '');
+# with pool
+check_permissions('User4@pve', '/vms/500', '');
+
 
-check_roles('User1@pve', '/vms/600', 'RoleMARKETING,RoleTEST1');
-check_roles('User2@pve', '/vms/600', 'RoleTEST1');
-check_roles('User3@pve', '/vms/600', 'NoAccess');
-check_roles('User4@pve', '/vms/600', 'RoleMARKETING');
+check_permissions('User1@pve', '/vms/600', 'VM.Console');
+check_permissions('User2@pve', '/vms/600', 'VM.Console');
+check_permissions('User3@pve', '/vms/600', '');
+check_permissions('User4@pve', '/vms/600', 'VM.Console');
 
-check_roles('User1@pve', '/storage/store1', 'RoleDEVEL,RoleMARKETING');
-check_roles('User2@pve', '/storage/store1', 'RoleDEVEL');
-check_roles('User3@pve', '/storage/store1', 'RoleDEVEL');
-check_roles('User4@pve', '/storage/store1', 'RoleMARKETING');
+check_permissions('User1@pve', '/storage/store1', 'VM.Console,VM.PowerMgmt');
+check_permissions('User2@pve', '/storage/store1', 'VM.PowerMgmt');
+check_permissions('User3@pve', '/storage/store1', 'VM.PowerMgmt');
+check_permissions('User4@pve', '/storage/store1', 'VM.Console');
 
-check_roles('User1@pve', '/storage/store2', 'RoleDEVEL');
-check_roles('User2@pve', '/storage/store2', 'RoleDEVEL');
-check_roles('User3@pve', '/storage/store2', 'RoleDEVEL');
-check_roles('User4@pve', '/storage/store2', '');
+check_permissions('User1@pve', '/storage/store2', 'VM.PowerMgmt');
+check_permissions('User2@pve', '/storage/store2', 'VM.PowerMgmt');
+check_permissions('User3@pve', '/storage/store2', 'VM.PowerMgmt');
+check_permissions('User4@pve', '/storage/store2', '');
 
 print "all tests passed\n";