From 5420df618de621fc2b5fdc76a619e6c86477aa1d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 May 2026 18:35:24 +0200 Subject: [PATCH] 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 a22b9128cf2..11fdc352dcb 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 OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired; @@ -44,6 +45,7 @@ class GlobalStoragesController extends StoragesController { IUserSession $userSession, IGroupManager $groupManager, IConfig $config, + BackendService $backendService, ) { parent::__construct( $AppName, @@ -53,7 +55,8 @@ class GlobalStoragesController extends StoragesController { $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 e9b552882dd..c3269920c02 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -9,10 +9,12 @@ namespace OCA\Files_External\Controller; 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 @@ abstract class StoragesController extends Controller { protected IUserSession $userSession, protected IGroupManager $groupManager, protected IConfig $config, + private BackendService $backendService, ) { parent::__construct($AppName, $request); } @@ -77,7 +80,7 @@ abstract class StoragesController extends Controller { $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 88a9f936401..eff8cac7501 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\Backend\Backend; 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 @@ class UserGlobalStoragesController extends StoragesController { IUserSession $userSession, IGroupManager $groupManager, IConfig $config, + BackendService $backendService, ) { parent::__construct( $AppName, @@ -59,7 +61,8 @@ class UserGlobalStoragesController extends StoragesController { $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 b8281077a46..f91e1e0a6f1 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\Auth\AuthMechanism; 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; @@ -47,6 +48,7 @@ class UserStoragesController extends StoragesController { IUserSession $userSession, IGroupManager $groupManager, IConfig $config, + BackendService $backendService, ) { parent::__construct( $AppName, @@ -56,7 +58,8 @@ class UserStoragesController extends StoragesController { $logger, $userSession, $groupManager, - $config + $config, + $backendService, ); }