upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 11:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

feat(files_external): allow delegated admins to search applicable users/groups

Browse source 
Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
This commit is contained in:
Tatjana Kaschperko Lindt 2026-03-30 14:09:11 +02:00 committed by Louis
parent bfdce5537f
commit b9b29d4e6e
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/files_external/ajax/applicable.php
View file

@ -12,7 +12,21 @@ use OCP\Server;
\OC_JSON::checkAppEnabled('files_external');
\OC_JSON::callCheck();
\OC_JSON::checkAdminUser();
// Replaces \OC_JSON::checkAdminUser() to also allow delegated admins access.
$currentUser = \OC::$server->getUserSession()->getUser();
if ($currentUser === null) {
\OC_JSON::error(['message' => 'Not logged in']);
exit();
}
$groupManager = \OC::$server->getGroupManager();
$authorizedGroupMapper = \OC::$server->get(\OC\Settings\AuthorizedGroupMapper::class);
$isAdmin = $groupManager->isAdmin($currentUser->getUID());
// A delegated admin is granted access when their group is authorized for the files_external Admin settings class.
$isDelegated = in_array(\OCA\Files_External\Settings\Admin::class, $authorizedGroupMapper->findAllClassesForUser($currentUser), true);
if (!$isAdmin && !$isDelegated) {
\OC_JSON::error(['message' => 'Not authorized']);
exit();
}
$pattern = '';
$limit = null;

5
build/psalm-baseline.xml
View file

@ -1407,9 +1407,12 @@
<file src="apps/files_external/ajax/applicable.php">
<DeprecatedMethod>
<code><![CDATA[\OC_JSON::callCheck()]]></code>
<code><![CDATA[\OC_JSON::checkAdminUser()]]></code>
<code><![CDATA[\OC_JSON::checkAppEnabled('files_external')]]></code>
<code><![CDATA[\OC_JSON::error(['message' => 'Not authorized'])]]></code>
<code><![CDATA[\OC_JSON::error(['message' => 'Not logged in'])]]></code>
<code><![CDATA[\OC_JSON::success($results)]]></code>
<code><![CDATA[getGroupManager]]></code>
<code><![CDATA[getUserSession]]></code>
</DeprecatedMethod>
</file>
<file src="apps/files_external/ajax/oauth2.php">