From ec41d21c6fe1cabf12c5189c782126508c97a529 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 e2dc9322c4a5e..583d8e4e47fae 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -102,16 +102,6 @@ public function create( $applicableGroups, $priority ) { - $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 b788264d9607d..8a4c434748cc4 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -132,15 +132,6 @@ public function create( $backendOptions, $mountOptions ) { - $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 c00b6ab6d9fd53229d976d22516d8039a78c38b0 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 | 7 +++++-- apps/files_external/lib/Controller/StoragesController.php | 7 +++++-- .../lib/Controller/UserGlobalStoragesController.php | 7 +++++-- .../lib/Controller/UserStoragesController.php | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 583d8e4e47fae..13c1ed89b58b1 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -28,6 +28,7 @@ namespace OCA\Files_External\Controller; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; @@ -63,7 +64,8 @@ public function __construct( LoggerInterface $logger, IUserSession $userSession, IGroupManager $groupManager, - IConfig $config + IConfig $config, + BackendService $backendService ) { parent::__construct( $AppName, @@ -73,7 +75,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 b18e99f3a47a3..c2bb766af312d 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -30,9 +30,11 @@ 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\NotFoundException; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\StoragesService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; @@ -67,7 +69,8 @@ public function __construct( protected LoggerInterface $logger, protected IUserSession $userSession, protected IGroupManager $groupManager, - protected IConfig $config + protected IConfig $config, + private BackendService $backendService ) { parent::__construct($AppName, $request); } @@ -97,7 +100,7 @@ protected function createStorage( $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 7301997f72bab..e9ffd925f9bbb 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -33,6 +33,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; @@ -68,7 +69,8 @@ public function __construct( LoggerInterface $logger, IUserSession $userSession, IGroupManager $groupManager, - IConfig $config + IConfig $config, + BackendService $backendService ) { parent::__construct( $AppName, @@ -78,7 +80,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 8a4c434748cc4..d66b6d65e0d1c 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -32,6 +32,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; @@ -67,7 +68,8 @@ public function __construct( LoggerInterface $logger, IUserSession $userSession, IGroupManager $groupManager, - IConfig $config + IConfig $config, + BackendService $backendService ) { parent::__construct( $AppName, @@ -77,7 +79,8 @@ public function __construct( $logger, $userSession, $groupManager, - $config + $config, + $backendService, ); } From f3b612e4c15a53a315e052ed01b94f8336507416 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/StoragesControllerTest.php | 16 ++++++++++++++++ .../Controller/UserStoragesControllerTest.php | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php index a3c1a7b0daef7..e73d7c4a690a2 100644 --- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php @@ -68,7 +68,8 @@ private function createController($allowCreateLocal = true) { $this->createMock(LoggerInterface::class), $session, $this->createMock(IGroupManager::class), - $config + $config, + $this->backendService, ); } diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php index fdaf6e2261fdb..c038939153c44 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -31,8 +31,10 @@ 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\StorageConfig; 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; @@ -49,9 +51,23 @@ abstract class StoragesControllerTest extends \Test\TestCase { * @var GlobalStoragesService|UserStoragesService|MockObject */ protected $service; + /** + * @var BackendService|MockObject + */ + protected $backendService; protected function setUp(): void { \OCA\Files_External\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 793a90c527bfa..be0eb466ca4c1 100644 --- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php @@ -76,7 +76,8 @@ private function createController($allowCreateLocal = true) { $this->createMock(LoggerInterface::class), $session, $this->createMock(IGroupManager::class), - $config + $config, + $this->backendService, ); }