proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-08-15 01:03:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

API: add group and token info to user index

Browse Source 
otherwise we need 1+N API calls to retrieve the full user+token picture

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-01-21 13:54:07 +01:00 committed by Thomas Lamprecht
parent b974bdc09e
commit 3a4ed52781
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PVE/API2/User.pm
View File

@ -120,6 +120,12 @@ __PACKAGE__->register_method ({
type => 'boolean', type => 'boolean',
description => "Optional filter for enable property.", description => "Optional filter for enable property.",
optional => 1, optional => 1,
},
full => {
type => 'boolean',
description => "Include group and token information.",
optional => 1,
default => 0,
} }
}, },
}, },
@ -136,6 +142,14 @@ __PACKAGE__->register_method ({
email => get_standard_option('user-email'), email => get_standard_option('user-email'),
comment => get_standard_option('user-comment'), comment => get_standard_option('user-comment'),
keys => get_standard_option('user-keys'), keys => get_standard_option('user-keys'),
groups => get_standard_option('group-list'),
tokens => {
type => 'array',
optional => 1,
items => $token_info_extend->({
tokenid => get_standard_option('token-subid'),
}),
}
}, },
}, },
links => [ { rel => 'child', href => "{userid}" } ], links => [ { rel => 'child', href => "{userid}" } ],
@ -155,18 +169,21 @@ __PACKAGE__->register_method ({
my $allowed_users = $rpcenv->group_member_join([keys %$groups]); my $allowed_users = $rpcenv->group_member_join([keys %$groups]);
foreach my $user (keys %{$usercfg->{users}}) { foreach my $user (keys %{$usercfg->{users}}) {
if (!($canUserMod || $user eq $authuser)) { if (!($canUserMod || $user eq $authuser)) {
next if !$allowed_users->{$user}; next if !$allowed_users->{$user};
} }
my $entry = &$extract_user_data($usercfg->{users}->{$user}); my $entry = &$extract_user_data($usercfg->{users}->{$user}, $param->{full});
if (defined($param->{enabled})) { if (defined($param->{enabled})) {
next if $entry->{enable} && !$param->{enabled}; next if $entry->{enable} && !$param->{enabled};
next if !$entry->{enable} && $param->{enabled}; next if !$entry->{enable} && $param->{enabled};
} }
$entry->{groups} = join(',', @{$entry->{groups}}) if $entry->{groups};
$entry->{tokens} = [ map { { tokenid => $_, %{$entry->{tokens}->{$_}} } } sort keys %{$entry->{tokens}} ]
if defined($entry->{tokens});
$entry->{userid} = $user; $entry->{userid} = $user;
push @$res, $entry; push @$res, $entry;
} }