upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 03:32:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge pull request #60562 from nextcloud/backport/60558/stable30

Browse source 
[stable30] fix: improve check if external storage backend is local
This commit is contained in:
Stephan Orbaugh 2026-05-20 20:26:27 +02:00 committed by GitHub
commit 022f2f59cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/files_external/lib/Controller/GlobalStoragesController.php
View file

@ -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;
@ -43,7 +44,8 @@ class GlobalStoragesController extends StoragesController {
LoggerInterface $logger,
IUserSession $userSession,
IGroupManager $groupManager,
IConfig $config
IConfig $config,
BackendService $backendService
) {
parent::__construct(
$AppName,
@ -53,7 +55,8 @@ class GlobalStoragesController extends StoragesController {
$logger,
$userSession,
$groupManager,
$config
$config,
$backendService
);
}
@ -82,16 +85,6 @@ class GlobalStoragesController extends StoragesController {
$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,

7
apps/files_external/lib/Controller/StoragesController.php
View file

@ -9,9 +9,11 @@ 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\NotFoundException;
use OCA\Files_External\Service\BackendService;
use OCA\Files_External\Service\StoragesService;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
@ -46,7 +48,8 @@ abstract class StoragesController extends Controller {
protected LoggerInterface $logger,
protected IUserSession $userSession,
protected IGroupManager $groupManager,
protected IConfig $config
protected IConfig $config,
private BackendService $backendService
) {
parent::__construct($AppName, $request);
}
@ -76,7 +79,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')

7
apps/files_external/lib/Controller/UserGlobalStoragesController.php
View file

@ -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;
@ -49,7 +50,8 @@ class UserGlobalStoragesController extends StoragesController {
LoggerInterface $logger,
IUserSession $userSession,
IGroupManager $groupManager,
IConfig $config
IConfig $config,
BackendService $backendService
) {
parent::__construct(
$AppName,
@ -59,7 +61,8 @@ class UserGlobalStoragesController extends StoragesController {
$logger,
$userSession,
$groupManager,
$config
$config,
$backendService,
);
}

16
apps/files_external/lib/Controller/UserStoragesController.php
View file

@ -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;
@ -46,7 +47,8 @@ class UserStoragesController extends StoragesController {
LoggerInterface $logger,
IUserSession $userSession,
IGroupManager $groupManager,
IConfig $config
IConfig $config,
BackendService $backendService
) {
parent::__construct(
$AppName,
@ -56,7 +58,8 @@ class UserStoragesController extends StoragesController {
$logger,
$userSession,
$groupManager,
$config
$config,
$backendService,
);
}
@ -109,15 +112,6 @@ class UserStoragesController extends StoragesController {
$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,

3
apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
View file

@ -50,7 +50,8 @@ class GlobalStoragesControllerTest extends StoragesControllerTest {
$this->createMock(LoggerInterface::class),
$session,
$this->createMock(IGroupManager::class),
$config
$config,
$this->backendService,
);
}

16
apps/files_external/tests/Controller/StoragesControllerTest.php
View file

@ -11,8 +11,10 @@ use OCA\Files_External\Controller\GlobalStoragesController;
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;
@ -29,9 +31,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 {

3
apps/files_external/tests/Controller/UserStoragesControllerTest.php
View file

@ -57,7 +57,8 @@ class UserStoragesControllerTest extends StoragesControllerTest {
$this->createMock(LoggerInterface::class),
$session,
$this->createMock(IGroupManager::class),
$config
$config,
$this->backendService,
);
}