Skip to content

Commit

Permalink
fix(Trash): Fix wrong original location
Browse files Browse the repository at this point in the history
Signed-off-by: provokateurin <kate@provokateurin.de>
  • Loading branch information
provokateurin committed Oct 28, 2024
1 parent 4b484ad commit 5191596
Showing 1 changed file with 65 additions and 0 deletions.
65 changes: 65 additions & 0 deletions tests/Trash/TrashBackendTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@
use OCA\GroupFolders\Folder\FolderManager;
use OCA\GroupFolders\Mount\GroupFolderStorage;
use OCA\GroupFolders\Trash\TrashBackend;
use OCP\Constants;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\IUser;
use OCP\Server;
use OCP\Share;
use Test\TestCase;
use Test\Traits\UserTrait;

Expand Down Expand Up @@ -211,4 +214,66 @@ public function testHideDeletedTrashItemInDeletedParentFolderAcl(): void {

$this->logout();
}

public function testWrongOriginalLocation(): void {
$shareManager = Server::get(Share\IManager::class);

$userA = $this->createUser('A', 'test');
$userAFolder = Server::get(IRootFolder::class)->getUserFolder('A');

$userB = $this->createUser('B', 'test');
$userBFolder = Server::get(IRootFolder::class)->getUserFolder('B');

$groupBackend = Server::get(Database::class);
$groupBackend->createGroup('A');
$groupBackend->addToGroup('A', 'A');
$groupBackend->addToGroup('B', 'A');
$this->assertCount(2, $groupBackend->usersInGroup('A'));

$groupFolderId = $this->folderManager->createFolder('A');
$this->folderManager->setFolderACL($groupFolderId, true);
$this->folderManager->addApplicableGroup($groupFolderId, 'A');
$this->folderManager->setGroupPermissions($groupFolderId, 'A', Constants::PERMISSION_ALL);
$this->assertInstanceOf(Folder::class, $userAFolder->get('A'));

$this->loginAsUser('A');
$userAFolder->newFolder('A/B/C');
$userAFolder->newFile('A/B/C/D', 'foo');

$this->ruleManager->saveRule(new Rule(new UserMapping('group', 'A'), $userAFolder->get('A/B')->getId(), Constants::PERMISSION_READ, 0));
$this->ruleManager->saveRule(new Rule(new UserMapping('user', 'A'), $userAFolder->get('A/B')->getId(), Constants::PERMISSION_ALL, Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE | Constants::PERMISSION_CREATE));
$this->ruleManager->saveRule(new Rule(new UserMapping('user', 'A'), $userAFolder->get('A/B/C')->getId(), Constants::PERMISSION_ALL, Constants::PERMISSION_ALL));

$folderShare = $shareManager->newShare();
$folderShare->setShareType(Share\IShare::TYPE_USER);
$folderShare->setSharedWith('B');
$folderShare->setSharedBy('A');
$folderShare->setPermissions(Constants::PERMISSION_ALL);
$folderShare->setNode($userAFolder->get('A/B/C'));
$folderShare = $shareManager->createShare($folderShare);
$this->assertNotEmpty($folderShare->getId());

$fileShare = $shareManager->newShare();
$fileShare->setShareType(Share\IShare::TYPE_USER);
$fileShare->setSharedWith('B');
$fileShare->setSharedBy('A');
$fileShare->setPermissions(19);
$fileShare->setNode($userAFolder->get('A/B/C/D'));
$fileShare = $shareManager->createShare($fileShare);
$this->assertNotEmpty($fileShare->getId());

$this->loginAsUser('B');
$this->assertTrue($userBFolder->get('C/D')->isDeletable());
$userBFolder->get('C/D')->delete();

$trashedOfUserA = $this->trashBackend->listTrashRoot($userA);
$this->assertCount(1, $trashedOfUserA);
// TODO: Bug original location is wrong
$this->assertSame('A/B/C/D', $trashedOfUserA[0]->getOriginalLocation());

$trashedOfUserB = $this->trashBackend->listTrashRoot($userB);
$this->assertCount(1, $trashedOfUserB);
// TODO: Bug original location is wrong
$this->assertSame('C/D', $trashedOfUserB[0]->getOriginalLocation());
}
}

0 comments on commit 5191596

Please sign in to comment.