proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-07-26 12:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whitespace fixes

Browse Source 
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Philip Abernethy 2017-09-21 11:09:16 +02:00 committed by Wolfgang Bumiller
parent 5654af83fa
commit 0a6e09fd47
5 changed files with 115 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/ACL.pm
View File

@ -88,7 +88,7 @@ __PACKAGE__->register_method ({
}, },
description => "Update Access Control List (add or remove permissions).", description => "Update Access Control List (add or remove permissions).",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
path => { path => {
description => "Access control path", description => "Access control path",

19
PVE/API2/Role.pm
View File

@ -47,7 +47,7 @@ __PACKAGE__->register_method ({
} }
return $res; return $res;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'create_role', name => 'create_role',
@ -59,7 +59,7 @@ __PACKAGE__->register_method ({
}, },
description => "Create new role.", description => "Create new role.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
roleid => { type => 'string', format => 'pve-roleid' }, roleid => { type => 'string', format => 'pve-roleid' },
privs => { type => 'string' , format => 'pve-priv-list', optional => 1 }, privs => { type => 'string' , format => 'pve-priv-list', optional => 1 },
@ -87,7 +87,7 @@ __PACKAGE__->register_method ({
}, "create role failed"); }, "create role failed");
return undef; return undef;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'update_role', name => 'update_role',
@ -99,7 +99,7 @@ __PACKAGE__->register_method ({
}, },
description => "Create new role.", description => "Create new role.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
roleid => { type => 'string', format => 'pve-roleid' }, roleid => { type => 'string', format => 'pve-roleid' },
privs => { type => 'string' , format => 'pve-priv-list' }, privs => { type => 'string' , format => 'pve-priv-list' },
@ -132,7 +132,7 @@ __PACKAGE__->register_method ({
}, "update role failed"); }, "update role failed");
return undef; return undef;
}}); }});
# fixme: return format! # fixme: return format!
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
@ -144,7 +144,7 @@ __PACKAGE__->register_method ({
}, },
description => "Get role configuration.", description => "Get role configuration.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
roleid => { type => 'string' , format => 'pve-roleid' }, roleid => { type => 'string' , format => 'pve-roleid' },
}, },
@ -162,8 +162,7 @@ __PACKAGE__->register_method ({
die "role '$role' does not exist\n" if !$data; die "role '$role' does not exist\n" if !$data;
return $data; return $data;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'delete_role', name => 'delete_role',
@ -175,7 +174,7 @@ __PACKAGE__->register_method ({
}, },
description => "Delete role.", description => "Delete role.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
roleid => { type => 'string', format => 'pve-roleid' }, roleid => { type => 'string', format => 'pve-roleid' },
} }
@ -205,6 +204,6 @@ __PACKAGE__->register_method ({
}, "delete role failed"); }, "delete role failed");
return undef; return undef;
}}); }});
1; 1;

10
PVE/API2/User.pm
View File

@ -107,7 +107,7 @@ __PACKAGE__->register_method ({
}, },
description => "Create new user.", description => "Create new user.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
userid => get_standard_option('userid'), userid => get_standard_option('userid'),
password => { password => {
@ -197,13 +197,13 @@ __PACKAGE__->register_method ({
check => ['userid-group', ['User.Modify', 'Sys.Audit']], check => ['userid-group', ['User.Modify', 'Sys.Audit']],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
userid => get_standard_option('userid'), userid => get_standard_option('userid'),
}, },
}, },
returns => { returns => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
enable => { type => 'boolean' }, enable => { type => 'boolean' },
expire => { type => 'integer', optional => 1 }, expire => { type => 'integer', optional => 1 },
@ -238,7 +238,7 @@ __PACKAGE__->register_method ({
}, },
description => "Update user configuration.", description => "Update user configuration.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
userid => get_standard_option('userid', { userid => get_standard_option('userid', {
completion => \&PVE::AccessControl::complete_username, completion => \&PVE::AccessControl::complete_username,
@ -331,7 +331,7 @@ __PACKAGE__->register_method ({
], ],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
userid => get_standard_option('userid', { userid => get_standard_option('userid', {
completion => \&PVE::AccessControl::complete_username, completion => \&PVE::AccessControl::complete_username,

3
PVE/AccessControl.pm
View File

@ -45,7 +45,6 @@ cfs_register_file('user.cfg',
\&parse_user_config, \&parse_user_config,
\&write_user_config); \&write_user_config);
sub verify_username { sub verify_username {
PVE::Auth::Plugin::verify_username(@_); PVE::Auth::Plugin::verify_username(@_);
} }
@ -172,7 +171,6 @@ sub assemble_spice_ticket {
$secret, $username, $vmid, $node); $secret, $username, $vmid, $node);
} }
sub verify_spice_connect_url { sub verify_spice_connect_url {
my ($connect_str) = @_; my ($connect_str) = @_;
@ -537,7 +535,6 @@ sub normalize_path {
return $path; return $path;
} }
PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname); PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname);
sub verify_groupname { sub verify_groupname {
my ($groupname, $noerr) = @_; my ($groupname, $noerr) = @_;