fix: Return correct list of managers for a user

Signed-off-by: Christopher Ng <[email protected]>
nextcloud · Oct 4, 2024 · 9a39d94 · 9a39d94
1 parent 75a6920
commit 9a39d94
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -20,9 +20,11 @@
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
 use OCP\Files\NotFoundException;
+use OCP\Group\ISubAdmin;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IRequest;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
@@ -55,6 +57,8 @@ abstract class AUserData extends OCSController {
  protected $userSession;
  /** @var IAccountManager */
  protected $accountManager;
+ /** @var ISubAdmin */
+ protected $subAdminManager;
  /** @var IFactory */
  protected $l10nFactory;
 
@@ -65,6 +69,7 @@ public function __construct(string $appName,
  IGroupManager $groupManager,
  IUserSession $userSession,
  IAccountManager $accountManager,
+ ISubAdmin $subAdminManager,
  IFactory $l10nFactory) {
  parent::__construct($appName, $request);
 
@@ -73,6 +78,7 @@ public function __construct(string $appName,
  $this->groupManager = $groupManager;
  $this->userSession = $userSession;
  $this->accountManager = $accountManager;
+ $this->subAdminManager = $subAdminManager;
  $this->l10nFactory = $l10nFactory;
  }
 
@@ -136,8 +142,8 @@ protected function getUserData(string $userId, bool $includeScopes = false): ?ar
  $data['backend'] = $targetUserObject->getBackendClassName();
  $data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
  $data[self::USER_FIELD_QUOTA] = $this->fillStorageInfo($targetUserObject->getUID());
- $managerUids = $targetUserObject->getManagerUids();
- $data[self::USER_FIELD_MANAGER] = empty($managerUids) ? '' : $managerUids[0];
+ $managers = $this->getManagers($targetUserObject);
+ $data[self::USER_FIELD_MANAGER] = empty($managers) ? '' : $managers[0];
 
  try {
  if ($includeScopes) {
@@ -206,6 +212,37 @@ protected function getUserData(string $userId, bool $includeScopes = false): ?ar
  return $data;
  }
 
+ /**
+ * @return string[]
+ */
+ protected function getManagers(IUser $user): array {
+ $currentLoggedInUser = $this->userSession->getUser();
+ $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+ $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+ $isSubAdmin = $this->subAdminManager->isSubAdmin($currentLoggedInUser);
+
+ $managerUids = $user->getManagerUids();
+ if ($isAdmin || $isDelegatedAdmin) {
+ return $managerUids;
+ }
+
+ if ($isSubAdmin) {
+ $accessibleManagerUids = array_values(array_filter(
+ $managerUids,
+ function (string $managerUid) use ($currentLoggedInUser) {
+ $manager = $this->userManager->get($managerUid);
+ if (!($manager instanceof IUser)) {
+ return false;
+ }
+ return $this->subAdminManager->isUserAccessible($currentLoggedInUser, $manager);
+ },
+ ));
+ return $accessibleManagerUids;
+ }
+
+ return [];
+ }
+
  /**
  * Get the groups a user is a subadmin of
  *

diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php
@@ -21,6 +21,7 @@
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
+use OCP\Group\ISubAdmin;
 use OCP\IConfig;
 use OCP\IGroup;
 use OCP\IGroupManager;
@@ -47,6 +48,7 @@ public function __construct(string $appName,
  IGroupManager $groupManager,
  IUserSession $userSession,
  IAccountManager $accountManager,
+ ISubAdmin $subAdminManager,
  IFactory $l10nFactory,
  LoggerInterface $logger) {
  parent::__construct($appName,
@@ -56,6 +58,7 @@ public function __construct(string $appName,
  $groupManager,
  $userSession,
  $accountManager,
+ $subAdminManager,
  $l10nFactory
  );
 

diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -31,6 +31,7 @@
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\ISubAdmin;
 use OCP\HintException;
 use OCP\IConfig;
 use OCP\IGroup;
@@ -63,6 +64,7 @@ public function __construct(
  IGroupManager $groupManager,
  IUserSession $userSession,
  IAccountManager $accountManager,
+ ISubAdmin $subAdminManager,
  IFactory $l10nFactory,
  private IURLGenerator $urlGenerator,
  private LoggerInterface $logger,
@@ -81,6 +83,7 @@ public function __construct(
  $groupManager,
  $userSession,
  $accountManager,
+ $subAdminManager,
  $l10nFactory
  );
 
@@ -946,7 +949,7 @@ public function editUser(string $userId, string $key, string $value): DataRespon
  $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
  $permittedFields[] = IAccountManager::PROPERTY_BIRTHDATE;
  $permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
- 
+
  $permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
  $permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
  $permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;