From f4274648c84d9ea5feaa9bfd81f1c88921b769c0 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 c493b060b139f..bb0f58ddf13ac 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 c0f9f9ca0372c..7cb30c1f9b8ff 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 05b93f4e230399fde26a250790d61433b44dd9e5 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 +++++-- .../lib/Controller/StoragesController.php | 13 +++++++++++-- .../lib/Controller/UserGlobalStoragesController.php | 7 +++++-- .../lib/Controller/UserStoragesController.php | 7 +++++-- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index bb0f58ddf13ac..3670d16a73dc4 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( ILogger $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 b5d5b9027ee9a..67395355a92ee 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -31,9 +31,11 @@ use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\DefinitionParameter; +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; @@ -86,6 +88,11 @@ abstract class StoragesController extends Controller { */ protected $config; + /** + * @var BackendService + */ + protected $backendService; + /** * Creates a new storages controller. * @@ -103,7 +110,8 @@ public function __construct( ILogger $logger, IUserSession $userSession, IGroupManager $groupManager, - IConfig $config + IConfig $config, + BackendService $backendService ) { parent::__construct($AppName, $request); $this->l10n = $l10n; @@ -112,6 +120,7 @@ public function __construct( $this->userSession = $userSession; $this->groupManager = $groupManager; $this->config = $config; + $this->backendService = $backendService; } /** @@ -139,7 +148,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 35dbaec41ade1..1ea5b6c298dea 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( ILogger $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 7cb30c1f9b8ff..36b47540e2c74 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( ILogger $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 de6066472b984c61f8f3c7fb468879eab708317d 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 0963cd06f0015..bb700d7ecf9a8 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(ILogger::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 bb9be2f2d4a80..7e9df8a60b216 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 OCP\AppFramework\Http; @@ -47,9 +49,23 @@ abstract class StoragesControllerTest extends \Test\TestCase { * @var GlobalStoragesService */ 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 f4de39fcd2b5e..ef417d36db4bc 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(ILogger::class), $session, $this->createMock(IGroupManager::class), - $config + $config, + $this->backendService, ); }