fix #1998: correct return properties for read_role

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

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 98e2fd6849e68c548f5ebfbb3a9235b6662956d8..bdadfd2ae58397ddc876c540730d20ed00dc41e6 100644 (file)
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -14,7 +14,7 @@ use PVE::OTP;
 use PVE::Ticket;
 use PVE::Tools qw(run_command lock_file file_get_contents split_list safe_print);
 use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file);
-use PVE::JSONSchema;
+use PVE::JSONSchema qw(register_standard_option get_standard_option);
 
 use PVE::Auth::Plugin;
 use PVE::Auth::AD;
@@ -22,8 +22,6 @@ use PVE::Auth::LDAP;
 use PVE::Auth::PVE;
 use PVE::Auth::PAM;
 
-use Data::Dumper; # fixme: remove
-
 # load and initialize all plugins
 
 PVE::Auth::AD->register();
@@ -47,7 +45,6 @@ cfs_register_file('user.cfg',
                  \&parse_user_config,
                  \&write_user_config);
 
-
 sub verify_username {
     PVE::Auth::Plugin::verify_username(@_);
 }
@@ -174,7 +171,6 @@ sub assemble_spice_ticket {
        $secret, $username, $vmid, $node);
 }
 
-
 sub verify_spice_connect_url {
     my ($connect_str) = @_;
 
@@ -406,6 +402,7 @@ my $privgroups = {
            'VM.Migrate',
            'VM.Monitor',
            'VM.Snapshot',
+           'VM.Snapshot.Rollback',
        ],
        user => [
            'VM.Config.CDROM', # change CDROM media
@@ -502,9 +499,20 @@ sub create_roles {
 
 create_roles();
 
+sub create_priv_properties {
+    my $properties = {};
+    foreach my $priv (keys %$valid_privs) {
+       $properties->{$priv} = {
+           type => 'boolean',
+           optional => 1,
+       };
+    }
+    return $properties;
+}
+
 sub role_is_special {
     my ($role) = @_;
-    return exists $special_roles->{$role};
+    return (exists $special_roles->{$role}) ? 1 : 0;
 }
 
 sub add_role_privs {
@@ -539,7 +547,6 @@ sub normalize_path {
     return $path;
 }
 
-
 PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname);
 sub verify_groupname {
     my ($groupname, $noerr) = @_;
@@ -568,7 +575,7 @@ sub verify_rolename {
     return $rolename;
 }
 
-PVE::JSONSchema::register_format('pve-poolid', \&verify_groupname);
+PVE::JSONSchema::register_format('pve-poolid', \&verify_poolname);
 sub verify_poolname {
     my ($poolname, $noerr) = @_;
 
@@ -1082,6 +1089,10 @@ sub remove_vm_from_pool {
 
 # bash completion helpers
 
+register_standard_option('userid-completed',
+    get_standard_option('userid', { completion => \&complete_username}),
+);
+
 sub complete_username {
 
     my $user_cfg = cfs_read_file('user.cfg');