proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-08-10 17:22:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Dietmar Maurer 2012-01-26 14:02:25 +01:00
parent 9a53427a8e
commit 8de1fb5ae3
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
PVE/API2/Group.pm
View File

@ -4,30 +4,11 @@ use strict;
use warnings; use warnings;
use PVE::Cluster qw (cfs_read_file cfs_write_file); use PVE::Cluster qw (cfs_read_file cfs_write_file);
use PVE::AccessControl; use PVE::AccessControl;
use PVE::SafeSyslog; use PVE::SafeSyslog;
use Data::Dumper; # fixme: remove
use PVE::RESTHandler; use PVE::RESTHandler;
use base qw(PVE::RESTHandler); use base qw(PVE::RESTHandler);
my $extract_group_data = sub {
my ($data, $full) = @_;
my $res = {};
$res->{comment} = $data->{comment} if defined($data->{comment});
return $res if !$full;
$res->{users} = $data->{users} ? [ keys %{$data->{users}} ] : [];
return $res;
};
# fixme: index should return more/all attributes?
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'index', name => 'index',
path => '', path => '',
@ -66,8 +47,9 @@ __PACKAGE__->register_method ({
foreach my $group (keys %{$usercfg->{groups}}) { foreach my $group (keys %{$usercfg->{groups}}) {
next if !($allow || $allowed_groups->{$group}); next if !($allow || $allowed_groups->{$group});
my $entry = &$extract_group_data($usercfg->{groups}->{$group}); my $data = $usercfg->{groups}->{$group};
$entry->{groupid} = $group; my $entry = { groupid => $group };
$entry->{comment} = $data->{comment} if defined($data->{comment});
push @$res, $entry; push @$res, $entry;
} }
@ -127,7 +109,6 @@ __PACKAGE__->register_method ({
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
# fixme: set/delete members
groupid => { type => 'string', format => 'pve-groupid' }, groupid => { type => 'string', format => 'pve-groupid' },
comment => { type => 'string', optional => 1 }, comment => { type => 'string', optional => 1 },
}, },
@ -156,7 +137,6 @@ __PACKAGE__->register_method ({
return undef; return undef;
}}); }});
# fixme: return format!
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'read_group', name => 'read_group',
path => '{groupid}', path => '{groupid}',
@ -171,7 +151,19 @@ __PACKAGE__->register_method ({
groupid => { type => 'string', format => 'pve-groupid' }, groupid => { type => 'string', format => 'pve-groupid' },
}, },
}, },
returns => {}, returns => {
type => "object",
additionalProperties => 0,
properties => {
comment => { type => 'string', optional => 1 },
members => {
type => 'array',
items => {
type => "string",
},
},
},
},
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -183,7 +175,13 @@ __PACKAGE__->register_method ({
die "group '$group' does not exist\n" if !$data; die "group '$group' does not exist\n" if !$data;
return &$extract_group_data($data, 1); my $members = $data->{users} ? [ keys %{$data->{users}} ] : [];
my $res = { members => $members };
$res->{comment} = $data->{comment} if defined($data->{comment});
return $res;
}}); }});