Merge pull request #60563 from nextcloud/backport/60558/stable29

sorbaugh · web-flow · commit 0e0951b8c113 · 2026-05-20T20:26:17.000+02:00
[stable29] [stable34] fix: improve check if external storage backend is local
diff --git 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
 		);
 	}
 
@@ -102,16 +105,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/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
@@ -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
@@ -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,
 		);
 	}
 
@@ -132,15 +135,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,
diff --git 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
@@ -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
@@ -76,7 +76,8 @@ private function createController($allowCreateLocal = true) {
 			$this->createMock(LoggerInterface::class),
 			$session,
 			$this->createMock(IGroupManager::class),
-			$config
+			$config,
+			$this->backendService,
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ private function createController($allowCreateLocal = true) {`
`68`	`68`	`$this->createMock(LoggerInterface::class),`
`69`	`69`	`$session,`
`70`	`70`	`$this->createMock(IGroupManager::class),`
`71`		`- $config`
	`71`	`+ $config,`
	`72`	`+ $this->backendService,`
`72`	`73`	`);`
`73`	`74`	`}`
`74`	`75`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ private function createController($allowCreateLocal = true) {`
`76`	`76`	`$this->createMock(LoggerInterface::class),`
`77`	`77`	`$session,`
`78`	`78`	`$this->createMock(IGroupManager::class),`
`79`		`- $config`
	`79`	`+ $config,`
	`80`	`+ $this->backendService,`
`80`	`81`	`);`
`81`	`82`	`}`
`82`	`83`