simplify filter_groups

diff --git a/PVE/API2/AccessControl.pm b/PVE/API2/AccessControl.pm
index 6136ae5af83c85da0ffb1da3c7a58a066aedde21..6046a8aeb3bf984f763f8dc183e32a3f4019f08b 100644 (file)
--- a/PVE/API2/AccessControl.pm
+++ b/PVE/API2/AccessControl.pm
@@ -248,7 +248,7 @@ __PACKAGE__->register_method ({
 
                my $privs = [ 'Sys.UserMod', 'Sys.UserAdd' ];
                if (!$rpcenv->check_any($authuser, "/access", $privs, 1)) {
-                   my $groups = $rpcenv->filter_groups($authuser, sub { return "/access/groups/" . shift; }, $privs, 1);
+                   my $groups = $rpcenv->filter_groups($authuser, $privs, 1);
                    my $allowed_users = $rpcenv->group_member_join([keys %$groups]);      
                    raise_perm_exc() if !$allowed_users->{$userid};
                }

diff --git a/PVE/API2/User.pm b/PVE/API2/User.pm
index 2d38dd1c59d6a339f7a6a661e0404d8518b71b5e..5cfb155fca8dafaf577900975ebb97969125d660 100644 (file)
--- a/PVE/API2/User.pm
+++ b/PVE/API2/User.pm
@@ -70,7 +70,7 @@ __PACKAGE__->register_method ({
        my $privs = [ 'Sys.UserMod', 'Sys.UserAdd' ];
 
        my $canUserMod = $rpcenv->check_any($authuser, "/access", $privs, 1);
-       my $groups = $rpcenv->filter_groups($authuser, sub { return "/access/groups/" . shift; }, $privs, 1);
+       my $groups = $rpcenv->filter_groups($authuser, $privs, 1);
        my $allowed_users = $rpcenv->group_member_join([keys %$groups]);      
 
        foreach my $user (keys %{$usercfg->{users}}) {

diff --git a/PVE/RPCEnvironment.pm b/PVE/RPCEnvironment.pm
index 16b8ba8ad59079603f3cc147b40e2d4438198f87..b5940de1944e483d0b0997ec869697844b1a8d16 100644 (file)
--- a/PVE/RPCEnvironment.pm
+++ b/PVE/RPCEnvironment.pm
@@ -216,18 +216,19 @@ sub is_group_member {
 }
 
 sub filter_groups {
-    my ($self, $user, $getPath, $privs, $any) = @_;
+    my ($self, $user, $privs, $any) = @_;
 
     my $cfg = $self->{user_cfg};
 
     my $groups = {};
     foreach my $group (keys %{$cfg->{groups}}) {
+       my $path = "/access/groups/$group";
        if ($any) {
-           if ($self->check_any($user, &$getPath($group), $privs, 1)) {
+           if ($self->check_any($user, $path, $privs, 1)) {
                $groups->{$group} = $cfg->{groups}->{$group};
            }
        } else {
-           if ($self->check($user, &$getPath($group), $privs, 1)) {
+           if ($self->check($user, $path, $privs, 1)) {
                $groups->{$group} = $cfg->{groups}->{$group};
            }
        }