Implement share co-owning #49073
+585
−54
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ | |
| use OCP\Files\Folder; | ||
| use OCP\Files\IRootFolder; | ||
| use OCP\Files\Mount\IMountPoint; | ||
| use OCP\Files\Mount\IShareCoOwnerMount; | ||
| use OCP\Files\NotFoundException; | ||
| use OCP\Files\Storage\IStorage; | ||
| use OCP\IConfig; | ||
|
|
@@ -232,10 +233,20 @@ public function testDeleteShareLocked(): void { | |
| $this->expectExceptionMessage('Could not delete share'); | ||
|
|
||
| $node = $this->getMockBuilder(File::class)->getMock(); | ||
| $node->method('getId')->willReturn(1); | ||
|
|
||
| $share = $this->newShare(); | ||
| $share->setNode($node); | ||
|
|
||
| $userFolder = $this->getMockBuilder(Folder::class)->getMock(); | ||
| $this->rootFolder->method('getUserFolder') | ||
| ->with($this->currentUser) | ||
| ->willReturn($userFolder); | ||
|
|
||
| $userFolder->method('getFirstNodeById') | ||
| ->with($share->getNodeId()) | ||
| ->willReturn($node); | ||
|
|
||
| $this->shareManager | ||
| ->expects($this->once()) | ||
| ->method('getShareById') | ||
|
|
@@ -476,6 +487,62 @@ public function testDeleteSharedWithGroupIDontBelongTo(): void { | |
| $this->ocs->deleteShare(42); | ||
| } | ||
|
|
||
| public function testDeleteShareCoOwner(): void { | ||
| $ocs = $this->mockFormatShare(); | ||
|
|
||
| $mount = $this->createMock(IShareCoOwnerMount::class); | ||
|
|
||
| $file = $this->createMock(File::class); | ||
| $file | ||
| ->expects($this->exactly(2)) | ||
| ->method('getPermissions') | ||
| ->willReturn(Constants::PERMISSION_SHARE); | ||
| $file | ||
| ->expects($this->once()) | ||
| ->method('getMountPoint') | ||
| ->willReturn($mount); | ||
|
|
||
| $userFolder = $this->createMock(Folder::class); | ||
| $userFolder | ||
| ->expects($this->exactly(2)) | ||
| ->method('getFirstNodeById') | ||
| ->with(2) | ||
| ->willReturn($file); | ||
|
|
||
| $this->rootFolder | ||
| ->method('getUserFolder') | ||
| ->with($this->currentUser) | ||
| ->willReturn($userFolder); | ||
|
|
||
| $share = $this->createMock(IShare::class); | ||
| $share | ||
| ->expects($this->once()) | ||
| ->method('getNode') | ||
| ->willReturn($file); | ||
| $share | ||
| ->expects($this->exactly(2)) | ||
| ->method('getNodeId') | ||
| ->willReturn(2); | ||
| $share | ||
| ->expects($this->exactly(2)) | ||
| ->method('getPermissions') | ||
| ->willReturn(Constants::PERMISSION_SHARE); | ||
|
|
||
| $this->shareManager | ||
| ->expects($this->once()) | ||
| ->method('getShareById') | ||
| ->with('ocinternal:1', $this->currentUser) | ||
| ->willReturn($share); | ||
|
|
||
| $this->shareManager | ||
| ->expects($this->once()) | ||
| ->method('deleteShare') | ||
| ->with($share); | ||
|
|
||
| $result = $ocs->deleteShare(1); | ||
| $this->assertInstanceOf(DataResponse::class, $result); | ||
| } | ||
|
|
||
| /* | ||
| * FIXME: Enable once we have a federated Share Provider | ||
|
|
||
|
|
@@ -3748,6 +3815,63 @@ public function testUpdateShareCanIncreasePermissionsIfOwner(): void { | |
| $this->assertInstanceOf(DataResponse::class, $result); | ||
| } | ||
|
|
||
| public function testUpdateShareCoOwner(): void { | ||
| $ocs = $this->mockFormatShare(); | ||
|
|
||
| $mount = $this->createMock(IShareCoOwnerMount::class); | ||
|
|
||
| $file = $this->createMock(File::class); | ||
| $file | ||
| ->expects($this->exactly(2)) | ||
| ->method('getPermissions') | ||
| ->willReturn(Constants::PERMISSION_SHARE); | ||
| $file | ||
| ->expects($this->once()) | ||
| ->method('getMountPoint') | ||
| ->willReturn($mount); | ||
|
|
||
| $userFolder = $this->createMock(Folder::class); | ||
| $userFolder | ||
| ->expects($this->exactly(2)) | ||
| ->method('getFirstNodeById') | ||
| ->with(2) | ||
| ->willReturn($file); | ||
|
|
||
| $this->rootFolder | ||
| ->method('getUserFolder') | ||
| ->with($this->currentUser) | ||
| ->willReturn($userFolder); | ||
|
|
||
| $share = $this->createMock(IShare::class); | ||
| $share | ||
| ->expects($this->once()) | ||
| ->method('getNode') | ||
| ->willReturn($file); | ||
| $share | ||
| ->expects($this->exactly(2)) | ||
| ->method('getNodeId') | ||
| ->willReturn(2); | ||
| $share | ||
| ->expects($this->exactly(2)) | ||
| ->method('getPermissions') | ||
| ->willReturn(Constants::PERMISSION_SHARE); | ||
|
|
||
| $this->shareManager | ||
| ->expects($this->once()) | ||
| ->method('getShareById') | ||
| ->with('ocinternal:1', $this->currentUser) | ||
| ->willReturn($share); | ||
|
|
||
| $this->shareManager | ||
| ->expects($this->once()) | ||
| ->method('updateShare') | ||
| ->with($share) | ||
| ->willReturn($share); | ||
|
|
||
| $result = $ocs->updateShare(1, Constants::PERMISSION_ALL); | ||
| $this->assertInstanceOf(DataResponse::class, $result); | ||
| } | ||
|
|
||
| public function dataFormatShare() { | ||
| $file = $this->getMockBuilder(File::class)->getMock(); | ||
| $folder = $this->getMockBuilder(Folder::class)->getMock(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -404,6 +404,7 @@ | |
| 'OCP\\Files\\Mount\\IMountManager' => $baseDir . '/lib/public/Files/Mount/IMountManager.php', | ||
| 'OCP\\Files\\Mount\\IMountPoint' => $baseDir . '/lib/public/Files/Mount/IMountPoint.php', | ||
| 'OCP\\Files\\Mount\\IMovableMount' => $baseDir . '/lib/public/Files/Mount/IMovableMount.php', | ||
| 'OCP\\Files\\Mount\\IShareCoOwnerMount' => $baseDir . '/lib/public/Files/Mount/IShareCoOwnerMount.php', | ||
| 'OCP\\Files\\Mount\\ISystemMountPoint' => $baseDir . '/lib/public/Files/Mount/ISystemMountPoint.php', | ||
| 'OCP\\Files\\Node' => $baseDir . '/lib/public/Files/Node.php', | ||
| 'OCP\\Files\\NotEnoughSpaceException' => $baseDir . '/lib/public/Files/NotEnoughSpaceException.php', | ||
|
|
@@ -1812,6 +1813,7 @@ | |
| 'OC\\Repair\\ClearGeneratedAvatarCache' => $baseDir . '/lib/private/Repair/ClearGeneratedAvatarCache.php', | ||
| 'OC\\Repair\\ClearGeneratedAvatarCacheJob' => $baseDir . '/lib/private/Repair/ClearGeneratedAvatarCacheJob.php', | ||
| 'OC\\Repair\\Collation' => $baseDir . '/lib/private/Repair/Collation.php', | ||
| 'OC\\Repair\\DeleteInvalidShares' => $baseDir . '/lib/private/Repair/DeleteInvalidShares.php', | ||
| 'OC\\Repair\\Events\\RepairAdvanceEvent' => $baseDir . '/lib/private/Repair/Events/RepairAdvanceEvent.php', | ||
| 'OC\\Repair\\Events\\RepairErrorEvent' => $baseDir . '/lib/private/Repair/Events/RepairErrorEvent.php', | ||
| 'OC\\Repair\\Events\\RepairFinishEvent' => $baseDir . '/lib/private/Repair/Events/RepairFinishEvent.php', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -445,6 +445,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 | |
| 'OCP\\Files\\Mount\\IMountManager' => __DIR__ . '/../../..' . '/lib/public/Files/Mount/IMountManager.php', | ||
| 'OCP\\Files\\Mount\\IMountPoint' => __DIR__ . '/../../..' . '/lib/public/Files/Mount/IMountPoint.php', | ||
| 'OCP\\Files\\Mount\\IMovableMount' => __DIR__ . '/../../..' . '/lib/public/Files/Mount/IMovableMount.php', | ||
| 'OCP\\Files\\Mount\\IShareCoOwnerMount' => __DIR__ . '/../../..' . '/lib/public/Files/Mount/IShareCoOwnerMount.php', | ||
| 'OCP\\Files\\Mount\\ISystemMountPoint' => __DIR__ . '/../../..' . '/lib/public/Files/Mount/ISystemMountPoint.php', | ||
| 'OCP\\Files\\Node' => __DIR__ . '/../../..' . '/lib/public/Files/Node.php', | ||
| 'OCP\\Files\\NotEnoughSpaceException' => __DIR__ . '/../../..' . '/lib/public/Files/NotEnoughSpaceException.php', | ||
|
|
@@ -1853,6 +1854,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 | |
| 'OC\\Repair\\ClearGeneratedAvatarCache' => __DIR__ . '/../../..' . '/lib/private/Repair/ClearGeneratedAvatarCache.php', | ||
| 'OC\\Repair\\ClearGeneratedAvatarCacheJob' => __DIR__ . '/../../..' . '/lib/private/Repair/ClearGeneratedAvatarCacheJob.php', | ||
| 'OC\\Repair\\Collation' => __DIR__ . '/../../..' . '/lib/private/Repair/Collation.php', | ||
| 'OC\\Repair\\DeleteInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/DeleteInvalidShares.php', | ||
| 'OC\\Repair\\Events\\RepairAdvanceEvent' => __DIR__ . '/../../..' . '/lib/private/Repair/Events/RepairAdvanceEvent.php', | ||
| 'OC\\Repair\\Events\\RepairErrorEvent' => __DIR__ . '/../../..' . '/lib/private/Repair/Events/RepairErrorEvent.php', | ||
| 'OC\\Repair\\Events\\RepairFinishEvent' => __DIR__ . '/../../..' . '/lib/private/Repair/Events/RepairFinishEvent.php', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ | |
| use OC\Repair\ClearFrontendCaches; | ||
| use OC\Repair\ClearGeneratedAvatarCache; | ||
| use OC\Repair\Collation; | ||
| use OC\Repair\DeleteInvalidShares; | ||
| use OC\Repair\Events\RepairAdvanceEvent; | ||
| use OC\Repair\Events\RepairErrorEvent; | ||
| use OC\Repair\Events\RepairFinishEvent; | ||
|
|
@@ -213,6 +214,7 @@ public static function getExpensiveRepairSteps() { | |
| ), | ||
| \OC::$server->get(ValidatePhoneNumber::class), | ||
| \OC::$server->get(DeleteSchedulingObjects::class), | ||
| new DeleteInvalidShares(), | ||
| ]; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OC\Repair; | ||
|
|
||
| use OC\Share20\Manager; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\IRepairStep; | ||
| use OCP\Server; | ||
| use OCP\Share; | ||
| use OCP\Share\Exceptions\ShareNotFound; | ||
|
|
||
| /** | ||
| * Deletes shares with invalid data | ||
| */ | ||
| class DeleteInvalidShares implements IRepairStep { | ||
| public function getName() { | ||
| return 'Delete invalid shares'; | ||
| } | ||
|
|
||
| private function checkShares(IOutput $output) { | ||
| /** @var Manager $shareManager */ | ||
| $shareManager = Server::get(Share\IManager::class); | ||
| $deleted = 0; | ||
| /** @var Share\IShare $share */ | ||
| foreach ($shareManager->getAllShares() as $share) { | ||
| try { | ||
| $shareManager->checkShare($share); | ||
| } catch (ShareNotFound $e) { | ||
| $deleted++; | ||
| } | ||
| } | ||
|
|
||
| if ($deleted > 0) { | ||
| $output->info('Removed ' . $deleted . ' invalid shares'); | ||
| } | ||
| } | ||
|
|
||
| public function run(IOutput $output) { | ||
| $this->checkShares($output); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -798,7 +798,8 @@ public function getSharesByPath(Node $path) { | |
| ->andWhere( | ||
| $qb->expr()->orX( | ||
| $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)), | ||
| $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)), | ||
| $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_LINK)), | ||
| ) | ||
| ) | ||
| ->andWhere($qb->expr()->orX( | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe
if ($file?->getMountPoint() instanceof [...]) {