upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 01:50:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 51

add more checks to ensure mounts aren't empty

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2023-06-28 15:48:55 +02:00 committed by Git'Fellow
parent 4e2e475bd3
commit fbc0f65711
4 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/External/Manager.php vendored
View file

@ -606,6 +606,10 @@ class Manager {
$this->logger->error('Mount point to remove share not found', ['mountPoint' => $mountPoint]);
return false;
}
if (!$mountPointObj instanceof Mount) {
$this->logger->error('Mount point to remove share is not an external share, share probably doesn\'t exist', ['mountPoint' => $mountPoint]);
return false;
}
$id = $mountPointObj->getStorage()->getCache()->getId('');
$mountPoint = $this->stripPath($mountPoint);

13
apps/files_sharing/tests/External/ManagerTest.php vendored
View file

@ -31,8 +31,10 @@
namespace OCA\Files_Sharing\Tests\External;
use OC\Federation\CloudIdManager;
use OC\Files\Mount\MountPoint;
use OC\Files\SetupManagerFactory;
use OC\Files\Storage\StorageFactory;
use OC\Files\Storage\Temporary;
use OCA\Files_Sharing\External\Manager;
use OCA\Files_Sharing\External\MountProvider;
use OCA\Files_Sharing\Tests\TestCase;
@ -191,13 +193,18 @@ class ManagerTest extends TestCase {
}
private function setupMounts() {
$this->mountManager->clear();
$this->clearMounts();
$mounts = $this->testMountProvider->getMountsForUser($this->user, new StorageFactory());
foreach ($mounts as $mount) {
$this->mountManager->addMount($mount);
}
}
private function clearMounts() {
$this->mountManager->clear();
$this->mountManager->addMount(new MountPoint(Temporary::class, '', []));
}
public function testAddUserShare() {
$this->doTestAddShare([
'remote' => 'http://localhost',
@ -235,7 +242,7 @@ class ManagerTest extends TestCase {
if ($isGroup) {
$this->manager->expects($this->never())->method('tryOCMEndPoint');
} else {
$this->manager->expects($this->any())->method('tryOCMEndPoint')
$this->manager->method('tryOCMEndPoint')
->withConsecutive(
['http://localhost', 'token1', '2342', 'accept'],
['http://localhost', 'token3', '2342', 'decline'],
@ -415,7 +422,7 @@ class ManagerTest extends TestCase {
$this->assertEmpty(self::invokePrivate($this->manager, 'getShares', [null]), 'Asserting all shares for the user have been deleted');
$this->mountManager->clear();
$this->clearMounts();
self::invokePrivate($this->manager, 'setupMounts');
$this->assertNotMount($shareData1['name']);
$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');

5
lib/private/Files/Config/MountProviderCollection.php
View file

@ -238,6 +238,11 @@ class MountProviderCollection implements IMountProviderCollection, Emitter {
$mounts = array_reduce($mounts, function (array $mounts, array $providerMounts) {
return array_merge($mounts, $providerMounts);
}, []);
if (count($mounts) === 0) {
throw new \Exception("No root mounts provided by any provider");
}
return $mounts;
}

11
lib/private/Files/Mount/Manager.php
View file

@ -101,6 +101,15 @@ class Manager implements IMountManager {
return $this->pathCache[$path];
}
if (count($this->mounts) === 0) {
$this->setupManager->setupRoot();
if (count($this->mounts) === 0) {
throw new \Exception("No mounts even after explicitly setting up the root mounts");
}
}
$current = $path;
while (true) {
$mountPoint = $current . '/';
@ -117,7 +126,7 @@ class Manager implements IMountManager {
}
}
throw new NotFoundException("No mount for path " . $path . " existing mounts: " . implode(",", array_keys($this->mounts)));
throw new NotFoundException("No mount for path " . $path . " existing mounts (" . count($this->mounts) ."): " . implode(",", array_keys($this->mounts)));
}
/**