diff options
Diffstat (limited to 'apps/files_sharing')
3 files changed, 39 insertions, 173 deletions
diff --git a/apps/files_sharing/lib/Command/CleanupRemoteStorages.php b/apps/files_sharing/lib/Command/CleanupRemoteStorages.php index db18e7d2499..cf0550aef7f 100644 --- a/apps/files_sharing/lib/Command/CleanupRemoteStorages.php +++ b/apps/files_sharing/lib/Command/CleanupRemoteStorages.php @@ -25,6 +25,7 @@ namespace OCA\Files_Sharing\Command; use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\Federation\ICloudIdManager; use OCP\IDBConnection; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -42,8 +43,14 @@ class CleanupRemoteStorages extends Command { */ protected $connection; - public function __construct(IDBConnection $connection) { + /** + * @var ICloudIdManager + */ + private $cloudIdManager; + + public function __construct(IDBConnection $connection, ICloudIdManager $cloudIdManager) { $this->connection = $connection; + $this->cloudIdManager = $cloudIdManager; parent::__construct(); } @@ -166,14 +173,17 @@ class CleanupRemoteStorages extends Command { public function getRemoteShareIds() { $queryBuilder = $this->connection->getQueryBuilder(); - $queryBuilder->select(['id', 'share_token', 'remote']) + $queryBuilder->select(['id', 'share_token', 'owner', 'remote']) ->from('share_external'); $query = $queryBuilder->execute(); $remoteShareIds = []; while ($row = $query->fetch()) { - $remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $row['remote']); + $cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']); + $remote = $cloudId->getRemote(); + + $remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote); } return $remoteShareIds; diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php index 3176163c442..ba4b1d05499 100644 --- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php +++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php @@ -26,6 +26,8 @@ namespace OCA\Files_Sharing\Tests\Command; use OCA\Files_Sharing\Command\CleanupRemoteStorages; +use OCP\Federation\ICloudId; +use OCP\Federation\ICloudIdManager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; @@ -49,6 +51,11 @@ class CleanupRemoteStoragesTest extends TestCase { */ private $connection; + /** + * @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject + */ + private $cloudIdManager; + private $storages = [ ['id' => 'shared::7b4a322b22f9d0047c38d77d471ce3cf', 'share_token' => 'f2c69dad1dc0649f26976fd210fc62e1', 'remote' => 'https://hostname.tld/owncloud1', 'user' => 'user1'], ['id' => 'shared::efe3b456112c3780da6155d3a9b9141c', 'share_token' => 'f2c69dad1dc0649f26976fd210fc62e2', 'remote' => 'https://hostname.tld/owncloud2', 'user' => 'user2'], @@ -109,7 +116,9 @@ class CleanupRemoteStoragesTest extends TestCase { } } - $this->command = new CleanupRemoteStorages($this->connection); + $this->cloudIdManager = $this->createMock(ICloudIdManager::class); + + $this->command = new CleanupRemoteStorages($this->connection, $this->cloudIdManager); } protected function tearDown(): void { @@ -191,6 +200,22 @@ class CleanupRemoteStoragesTest extends TestCase { ->method('writeln') ->with('5 remote share(s) exist'); + $this->cloudIdManager + ->expects($this->any()) + ->method('getCloudId') + ->will($this->returnCallback(function (string $user, string $remote) { + $cloudIdMock = $this->createMock(ICloudId::class); + + // The remotes are already sanitized in the original data, so + // they can be directly returned. + $cloudIdMock + ->expects($this->any()) + ->method('getRemote') + ->willReturn($remote); + + return $cloudIdMock; + })); + $this->command->execute($input, $output); $this->assertTrue($this->doesStorageExist($this->storages[0]['numeric_id'])); diff --git a/apps/files_sharing/tests/PermissionsTest.php b/apps/files_sharing/tests/PermissionsTest.php deleted file mode 100644 index 462a73f09d2..00000000000 --- a/apps/files_sharing/tests/PermissionsTest.php +++ /dev/null @@ -1,169 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author Joas Schilling <coding@schilljs.com> - * @author Robin Appelman <robin@icewind.nl> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Vincent Petry <vincent@nextcloud.com> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OCA\Files_Sharing\Tests; - -use OC\Files\Cache\Cache; -use OC\Files\Storage\Storage; -use OC\Files\View; -use OCP\Share\IShare; - -/** - * Class PermissionsTest - * - * @group DB - */ -class PermissionsTest extends TestCase { - - /** @var Storage */ - private $sharedStorageRestrictedShare; - - /** @var Storage */ - private $sharedCacheRestrictedShare; - - /** @var View */ - private $secondView; - - /** @var Storage */ - private $ownerStorage; - - /** @var Storage */ - private $sharedStorage; - - /** @var Cache */ - private $sharedCache; - - /** @var Cache */ - private $ownerCache; - - protected function setUp(): void { - parent::setUp(); - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - - // prepare user1's dir structure - $textData = "dummy file data\n"; - $this->view->mkdir('container'); - $this->view->mkdir('container/shareddir'); - $this->view->mkdir('container/shareddir/subdir'); - $this->view->mkdir('container/shareddirrestricted'); - $this->view->mkdir('container/shareddirrestricted/subdir'); - $this->view->file_put_contents('container/shareddir/textfile.txt', $textData); - $this->view->file_put_contents('container/shareddirrestricted/textfile1.txt', $textData); - - [$this->ownerStorage, $internalPath] = $this->view->resolvePath(''); - $this->ownerCache = $this->ownerStorage->getCache(); - $this->ownerStorage->getScanner()->scan(''); - - // share "shareddir" with user2 - $rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1); - - $node = $rootFolder->get('container/shareddir'); - $share = $this->shareManager->newShare(); - $share->setNode($node) - ->setShareType(IShare::TYPE_USER) - ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) - ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) - ->setPermissions(\OCP\Constants::PERMISSION_ALL); - $share = $this->shareManager->createShare($share); - $share->setStatus(IShare::STATUS_ACCEPTED); - $this->shareManager->updateShare($share); - - $node = $rootFolder->get('container/shareddirrestricted'); - $share = $this->shareManager->newShare(); - $share->setNode($node) - ->setShareType(IShare::TYPE_USER) - ->setSharedWith(self::TEST_FILES_SHARING_API_USER2) - ->setSharedBy(self::TEST_FILES_SHARING_API_USER1) - ->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE); - $share = $this->shareManager->createShare($share); - $share->setStatus(IShare::STATUS_ACCEPTED); - $this->shareManager->updateShare($share); - - // login as user2 - self::loginHelper(self::TEST_FILES_SHARING_API_USER2); - - // retrieve the shared storage - $this->secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2); - [$this->sharedStorage, $internalPath] = $this->secondView->resolvePath('files/shareddir'); - [$this->sharedStorageRestrictedShare, $internalPath] = $this->secondView->resolvePath('files/shareddirrestricted'); - $this->sharedCache = $this->sharedStorage->getCache(); - $this->sharedCacheRestrictedShare = $this->sharedStorageRestrictedShare->getCache(); - } - - protected function tearDown(): void { - if ($this->sharedCache) { - $this->sharedCache->clear(); - } - - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - - $shares = $this->shareManager->getSharesBy(self::TEST_FILES_SHARING_API_USER1, IShare::TYPE_USER); - foreach ($shares as $share) { - $this->shareManager->deleteShare($share); - } - - $this->view->deleteAll('container'); - - $this->ownerCache->clear(); - - parent::tearDown(); - } - - /** - * Test that the permissions of shared directory are returned correctly - */ - public function testGetPermissions() { - $sharedDirPerms = $this->sharedStorage->getPermissions(''); - $this->assertEquals(31, $sharedDirPerms); - $sharedDirPerms = $this->sharedStorage->getPermissions('textfile.txt'); - $this->assertEquals(27, $sharedDirPerms); - $sharedDirRestrictedPerms = $this->sharedStorageRestrictedShare->getPermissions(''); - $this->assertEquals(15, $sharedDirRestrictedPerms); - $sharedDirRestrictedPerms = $this->sharedStorageRestrictedShare->getPermissions('textfile1.txt'); - $this->assertEquals(3, $sharedDirRestrictedPerms); - } - - /** - * Test that the permissions of shared directory are returned correctly - */ - public function testGetDirectoryPermissions() { - $contents = $this->secondView->getDirectoryContent('files/shareddir'); - $this->assertEquals('subdir', $contents[0]['name']); - $this->assertEquals(31, $contents[0]['permissions']); - $this->assertEquals('textfile.txt', $contents[1]['name']); - // 27 is correct because create is reserved to folders only - requires more unit tests overall to ensure this - $this->assertEquals(27, $contents[1]['permissions']); - $contents = $this->secondView->getDirectoryContent('files/shareddirrestricted'); - $this->assertEquals('subdir', $contents[0]['name']); - $this->assertEquals(7, $contents[0]['permissions']); - $this->assertEquals('textfile1.txt', $contents[1]['name']); - // 3 is correct because create is reserved to folders only - $this->assertEquals(3, $contents[1]['permissions']); - } -} |