Skip to content

[stable23] fix(provisioning_api): group admins can't add all users to groups #66413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Altahrim merged 1 commit into from
Nov 9, 2026
Merged

[stable23] fix(provisioning_api): group admins can't add all users to groups #66413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/provisioning_api/lib/Controller/UsersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,10 @@
// If they're not an admin, check they are a subadmin of the group in question
$loggedInUser = $this->userSession->getUser();
$subAdminManager = $this->groupManager->getSubAdmin();
if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
if (
!$this->groupManager->isAdmin($loggedInUser->getUID())
&& !($subAdminManager->isSubAdminOfGroup($loggedInUser, $group) && $subAdminManager->isUserAccessible($loggedInUser, $targetUser))
) {
throw new OCSException('', 104);
}

Expand Down
5 changes: 5 additions & 0 deletions apps/provisioning_api/tests/Controller/UsersControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2788,6 +2788,11 @@ public function testAddToGroupSuccessAsSubadmin() {
->with($loggedInUser, $targetGroup)
->willReturn(true);

$subAdminManager->expects($this->once())
->method('isUserAccessible')
->with($loggedInUser, $targetUser)
->willReturn(true);

$this->groupManager->expects($this->once())
->method('getSubAdmin')
->willReturn($subAdminManager);
Expand Down
Loading