From d1d63db3d0c88a357afedc0441af84f166ee53dc Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 May 2026 18:23:26 +0200 Subject: [PATCH 1/3] fix: remove duplicate 'allow creating local storage' check Signed-off-by: Robin Appelman --- .../lib/Controller/GlobalStoragesController.php | 10 ---------- .../lib/Controller/UserStoragesController.php | 9 --------- 2 files changed, 19 deletions(-) diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 287c00e179b4f..1464e3a57d306 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -74,16 +74,6 @@ public function create( ?array $applicableGroups, ?int $priority, ): DataResponse { - $canCreateNewLocalStorage = $this->config->getSystemValue('files_external_allow_create_new_local', true); - if (!$canCreateNewLocalStorage && $backend === 'local') { - return new DataResponse( - [ - 'message' => $this->l10n->t('Forbidden to manage local mounts') - ], - Http::STATUS_FORBIDDEN - ); - } - $newStorage = $this->createStorage( $mountPoint, $backend, diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index a9d107589ca69..49583494b14c6 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -98,15 +98,6 @@ public function create( array $backendOptions, ?array $mountOptions, ): DataResponse { - $canCreateNewLocalStorage = $this->config->getSystemValue('files_external_allow_create_new_local', true); - if (!$canCreateNewLocalStorage && $backend === 'local') { - return new DataResponse( - [ - 'message' => $this->l10n->t('Forbidden to manage local mounts') - ], - Http::STATUS_FORBIDDEN - ); - } $newStorage = $this->createStorage( $mountPoint, $backend, From 60fd2a7653341f4bcc976f61bb18ea6827d0092f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 May 2026 18:35:24 +0200 Subject: [PATCH 2/3] fix: improve check if external storage backend is local Signed-off-by: Robin Appelman --- .../lib/Controller/GlobalStoragesController.php | 5 ++++- apps/files_external/lib/Controller/StoragesController.php | 5 ++++- .../lib/Controller/UserGlobalStoragesController.php | 5 ++++- .../files_external/lib/Controller/UserStoragesController.php | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 1464e3a57d306..6158c4fbf0d37 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -8,6 +8,7 @@ namespace OCA\Files_External\Controller; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Settings\Admin; use OCP\AppFramework\Http; @@ -37,6 +38,7 @@ public function __construct( IUserSession $userSession, IGroupManager $groupManager, IConfig $config, + BackendService $backendService, ) { parent::__construct( $appName, @@ -46,7 +48,8 @@ public function __construct( $logger, $userSession, $groupManager, - $config + $config, + $backendService ); } diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php index 9a61d9bfd6eba..d01a57c797e12 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -9,10 +9,12 @@ use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\Backend\Local; use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\MountConfig; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\StoragesService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; @@ -48,6 +50,7 @@ public function __construct( protected IUserSession $userSession, protected IGroupManager $groupManager, protected IConfig $config, + private BackendService $backendService, ) { parent::__construct($appName, $request); } @@ -77,7 +80,7 @@ protected function createStorage( ?int $priority = null, ) { $canCreateNewLocalStorage = $this->config->getSystemValue('files_external_allow_create_new_local', true); - if (!$canCreateNewLocalStorage && $backend === 'local') { + if (!$canCreateNewLocalStorage && $this->backendService->getBackend($backend) instanceof Local) { return new DataResponse( [ 'message' => $this->l10n->t('Forbidden to manage local mounts') diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index 0fc7b53152a79..9c7f683095117 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -14,6 +14,7 @@ use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\UserGlobalStoragesService; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\NoAdminRequired; @@ -50,6 +51,7 @@ public function __construct( IUserSession $userSession, IGroupManager $groupManager, IConfig $config, + BackendService $backendService, ) { parent::__construct( $appName, @@ -59,7 +61,8 @@ public function __construct( $logger, $userSession, $groupManager, - $config + $config, + $backendService, ); } diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index 49583494b14c6..78b9021d34220 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -11,6 +11,7 @@ use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\UserStoragesService; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\NoAdminRequired; @@ -40,6 +41,7 @@ public function __construct( IUserSession $userSession, IGroupManager $groupManager, IConfig $config, + BackendService $backendService, ) { parent::__construct( $appName, @@ -49,7 +51,8 @@ public function __construct( $logger, $userSession, $groupManager, - $config + $config, + $backendService, ); } From 25df337b18cf7b8201ca4dfdae382cf34358c174 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 19 May 2026 15:26:05 +0200 Subject: [PATCH 3/3] test: adjust tests for updated local backend check Signed-off-by: Robin Appelman --- .../Controller/GlobalStoragesControllerTest.php | 3 ++- .../tests/Controller/StoragesControllerTestCase.php | 13 +++++++++++++ .../tests/Controller/UserStoragesControllerTest.php | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php index 74a27eb15e4fb..21182010c9563 100644 --- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php @@ -49,7 +49,8 @@ private function createController(bool $allowCreateLocal = true): GlobalStorages $this->createMock(LoggerInterface::class), $session, $this->createMock(IGroupManager::class), - $config + $config, + $this->backendService, ); } diff --git a/apps/files_external/tests/Controller/StoragesControllerTestCase.php b/apps/files_external/tests/Controller/StoragesControllerTestCase.php index 12e3e13f943c2..75221fc78c6da 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTestCase.php +++ b/apps/files_external/tests/Controller/StoragesControllerTestCase.php @@ -13,10 +13,12 @@ use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\NullMechanism; use OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\Backend\Local; use OCA\Files_External\Lib\Backend\SMB; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\MountConfig; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\UserStoragesService; use OCP\AppFramework\Http; @@ -25,10 +27,21 @@ abstract class StoragesControllerTestCase extends \Test\TestCase { protected GlobalStoragesController|UserStoragesController $controller; protected GlobalStoragesService|UserStoragesService|MockObject $service; + protected BackendService|MockObject $backendService; protected function setUp(): void { parent::setUp(); MountConfig::$skipTest = true; + + $this->backendService = $this->createMock(BackendService::class); + $this->backendService->method('getBackend') + ->willReturnCallback(function ($identifier) { + if ($identifier === 'local') { + return $this->createMock(Local::class); + } else { + return $this->createMock(Backend::class); + } + }); } protected function tearDown(): void { diff --git a/apps/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php index 3e8d89ec060c3..138b5e1225dd8 100644 --- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php @@ -58,7 +58,8 @@ private function createController(bool $allowCreateLocal = true) { $this->createMock(LoggerInterface::class), $session, $this->createMock(IGroupManager::class), - $config + $config, + $this->backendService, ); }