Skip to content

Fix restoring shared versions #18231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Dec 9, 2019
Merged

Fix restoring shared versions #18231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78050ec
Fix restoring shared versions
rullzer Dec 4, 2019
829f4a1
update tests
icewind1991 Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
use OCA\Files_Versions\Events\CreateVersionEvent;
use OCA\Files_Versions\Versions\IVersionManager;
use OCP\Files\NotFoundException;
use OCP\IUser;
use OCP\Lock\ILockingProvider;
use OCP\User;

Expand Down Expand Up @@ -325,20 +326,16 @@ public static function renameOrCopy($sourcePath, $targetPath, $operation) {
* @param int $revision revision timestamp
* @return bool
*/
public static function rollback($file, $revision) {
public static function rollback(string $file, int $revision, IUser $user) {

// add expected leading slash
$file = '/' . ltrim($file, '/');
list($uid, $filename) = self::getUidAndFilename($file);
if ($uid === null || trim($filename, '/') === '') {
return false;
}
$filename = '/' . ltrim($file, '/');

// Fetch the userfolder to trigger view hooks
$userFolder = \OC::$server->getUserFolder($uid);
$userFolder = \OC::$server->getUserFolder($user->getUID());

$users_view = new View('/'.$uid);
$files_view = new View('/'. User::getUser().'/files');
$users_view = new View('/'.$user->getUID());
$files_view = new View('/'. $user->getUID().'/files');

$versionCreated = false;

Expand Down Expand Up @@ -374,7 +371,7 @@ public static function rollback($file, $revision) {
// rollback
if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
$files_view->touch($file, $revision);
Storage::scheduleExpire($uid, $file);
Storage::scheduleExpire($user->getUID(), $file);

$node = $userFolder->get($file);

Expand Down
2 changes: 1 addition & 1 deletion apps/files_versions/lib/Versions/LegacyVersionsBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function createVersion(IUser $user, FileInfo $file) {
}

public function rollback(IVersion $version) {
return Storage::rollback($version->getVersionPath(), $version->getRevisionId());
return Storage::rollback($version->getVersionPath(), $version->getRevisionId(), $version->getUser());
}

private function getVersionFolder(IUser $user): Folder {
Expand Down
60 changes: 56 additions & 4 deletions apps/files_versions/tests/VersioningTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

use OC\Files\Storage\Temporary;
use OCP\IConfig;
use OCP\IUser;
use OCP\Share\IShare;

/**
Expand All @@ -55,6 +56,8 @@ class VersioningTest extends \Test\TestCase {
* @var \OC\Files\View
*/
private $rootView;
private $user1;
private $user2;

public static function setUpBeforeClass(): void {
parent::setUpBeforeClass();
Expand Down Expand Up @@ -102,6 +105,13 @@ protected function setUp(): void {
if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
}

$this->user1 = $this->createMock(IUser::class);
$this->user1->method('getUID')
->willReturn(self::TEST_VERSIONS_USER);
$this->user2 = $this->createMock(IUser::class);
$this->user2->method('getUID')
->willReturn(self::TEST_VERSIONS_USER2);
}

protected function tearDown(): void {
Expand Down Expand Up @@ -130,7 +140,7 @@ public function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
$startTime = 5000000;

$testClass = new VersionStorageToTest();
list($deleted, $size) = $testClass->callProtectedGetExpireList($startTime, $versions);
[$deleted, $size] = $testClass->callProtectedGetExpireList($startTime, $versions);

// we should have deleted 16 files each of the size 1
$this->assertEquals($sizeOfAllDeletedFiles, $size);
Expand Down Expand Up @@ -670,14 +680,56 @@ public function testRestoreNoPermission() {

$firstVersion = current($versions);

$this->assertFalse(\OCA\Files_Versions\Storage::rollback('folder/test.txt', $firstVersion['version']), 'Revert did not happen');
$this->assertFalse(\OCA\Files_Versions\Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user2), 'Revert did not happen');

$this->loginAsUser(self::TEST_VERSIONS_USER);

\OC::$server->getShareManager()->deleteShare($share);
$this->assertEquals('test file', $file->getContent(), 'File content has not changed');
}

public function testRestoreMovedShare() {
$this->loginAsUser(self::TEST_VERSIONS_USER);

$userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
$node = $userHome->newFolder('folder');
$file = $node->newFile('test.txt');

$userHome2 = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER2);
$userHome2->newFolder('subfolder');

$share = \OC::$server->getShareManager()->newShare();
$share->setNode($node)
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setSharedBy(self::TEST_VERSIONS_USER)
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = \OC::$server->getShareManager()->createShare($share);
$shareManager = \OC::$server->getShareManager();
$shareManager->acceptShare($share, self::TEST_VERSIONS_USER2);

$share->setTarget("subfolder/folder");
$shareManager->moveShare($share, self::TEST_VERSIONS_USER2);

$versions = $this->createAndCheckVersions(
\OC\Files\Filesystem::getView(),
'folder/test.txt'
);

$file->putContent('test file');

$this->loginAsUser(self::TEST_VERSIONS_USER2);

$firstVersion = current($versions);

$this->assertTrue(\OCA\Files_Versions\Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));

$this->loginAsUser(self::TEST_VERSIONS_USER);

\OC::$server->getShareManager()->deleteShare($share);
$this->assertEquals('version 2', $file->getContent(), 'File content has not changed');
}

/**
* @param string $hookName name of hook called
* @param string $params variable to receive parameters provided by hook
Expand Down Expand Up @@ -738,7 +790,7 @@ private function doTestRestore() {
$params = array();
$this->connectMockHooks('rollback', $params);

$this->assertTrue(\OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2));
$this->assertTrue(\OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2, $this->user1));
$expectedParams = array(
'path' => '/sub/test.txt',
);
Expand Down Expand Up @@ -873,7 +925,7 @@ private function createAndCheckVersions(\OC\Files\View $view, $path) {
$this->loginAsUser(self::TEST_VERSIONS_USER);

// need to scan for the versions
list($rootStorage,) = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
$rootStorage->getScanner()->scan('files_versions');

$versions = \OCA\Files_Versions\Storage::getVersions(
Expand Down