Skip to content

[stable25] fix: Make sure that rollback hook is triggered on all version backends #37744

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
blizzz merged 6 commits into from
Jul 10, 2023
Merged

[stable25] fix: Make sure that rollback hook is triggered on all version backends #37744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aaaf9c7
fix: Make sure that rollback hook is triggered on all version backends
juliusknorr Feb 13, 2023
2741810
tests(files_versions): Tear down fs to clear mount cache before testing
juliusknorr Feb 14, 2023
6999842
don't re-get fileinfo for versioned file if it's not shared
icewind1991 Mar 10, 2023
5b77597
fix: Check return type on rollback
juliusknorr Mar 13, 2023
92c7367
properly register test mount for user
icewind1991 Jul 6, 2023
5121cca
style: satisfy code style checker
blizzz Jul 7, 2023
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
6 changes: 0 additions & 6 deletions apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,12 +404,6 @@ public static function rollback(string $file, int $revision, IUser $user) {

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

// TODO: move away from those legacy hooks!
\OC_Hook::emit('\OCP\Versions', 'rollback', [
'path' => $filename,
'revision' => $revision,
'node' => $node,
]);
return true;
} elseif ($versionCreated) {
self::deleteVersion($users_view, $version);
Expand Down
8 changes: 8 additions & 0 deletions apps/files_versions/lib/Versions/LegacyVersionsBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array {
if ($storage->instanceOfStorage(SharedStorage::class)) {
$owner = $storage->getOwner('');
$user = $this->userManager->get($owner);

$userFolder = $this->rootFolder->getUserFolder($user->getUID());

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getUID on possibly null value
$nodes = $userFolder->getById($file->getId());

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of OCP\Files\Folder::getById cannot be null, possibly null value provided
$file = array_pop($nodes);

if (!$file) {
throw new NotFoundException("version file not found for share owner");
}
}

$userFolder = $this->rootFolder->getUserFolder($user->getUID());
Expand Down
11 changes: 10 additions & 1 deletion apps/files_versions/lib/Versions/VersionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,16 @@ public function createVersion(IUser $user, FileInfo $file) {

public function rollback(IVersion $version) {
$backend = $version->getBackend();
return self::handleAppLocks(fn(): ?bool => $backend->rollback($version));
$result = self::handleAppLocks(fn(): ?bool => $backend->rollback($version));
// rollback doesn't have a return type yet and some implementations don't return anything
if ($result === null || $result === true) {
\OC_Hook::emit('\OCP\Versions', 'rollback', [
'path' => $version->getVersionPath(),
'revision' => $version->getRevisionId(),
'node' => $version->getSourceFile(),
]);
}
return $result;
}

public function read(IVersion $version) {
Expand Down
13 changes: 11 additions & 2 deletions apps/files_versions/tests/VersioningTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
use OCP\IConfig;
use OCP\IUser;
use OCP\Share\IShare;
use OCA\Files_Versions\Versions\IVersionManager;
use Test\Traits\MountProviderTrait;

/**
* Class Test_Files_versions
Expand All @@ -49,6 +51,7 @@ class VersioningTest extends \Test\TestCase {
public const TEST_VERSIONS_USER = 'test-versions-user';
public const TEST_VERSIONS_USER2 = 'test-versions-user2';
public const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
use MountProviderTrait;

/**
* @var \OC\Files\View
Expand Down Expand Up @@ -646,7 +649,8 @@ public function testRestoreSameStorage() {

public function testRestoreCrossStorage() {
$storage2 = new Temporary([]);
\OC\Files\Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
$this->registerMount(self::TEST_VERSIONS_USER, $storage2, self::TEST_VERSIONS_USER . '/files/sub');
$this->loginAsUser(self::TEST_VERSIONS_USER);

$this->doTestRestore();
}
Expand Down Expand Up @@ -789,7 +793,12 @@ private function doTestRestore() {
$params = [];
$this->connectMockHooks('rollback', $params);

$this->assertTrue(\OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2, $this->user1));
$versionManager = \OCP\Server::get(IVersionManager::class);
$versions = $versionManager->getVersionsForFile($this->user1, $info1);
$version = array_filter($versions, function ($version) use ($t2) {
return $version->getRevisionId() === $t2;
});
$this->assertTrue($versionManager->rollback(current($version)));
$expectedParams = [
'path' => '/sub/test.txt',
];
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Node/Folder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ protected function getAppDataDirectoryName(): string {
* @param int $id
* @return array
*/
protected function getByIdInRootMount(int $id): array {
protected function getByIdInRootMount(int $id): array {
if (!method_exists($this->root, 'createNode')) {
// Always expected to be false. Being a method of Folder, this is
// always implemented. For it is an internal method and should not
Expand Down