Skip to content

fix: Make sure that rollback hook is triggered on all version backends - #36690

Merged
juliusknorr merged 4 commits into
masterfrom
bugfix/noid/rollback-hook
Apr 14, 2023
Merged

fix: Make sure that rollback hook is triggered on all version backends#36690
juliusknorr merged 4 commits into
masterfrom
bugfix/noid/rollback-hook

Conversation

@juliusknorr

@juliusknorrjuliusknorr commented Feb 13, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Summary

Alternative to nextcloud/groupfolders#2260 to apply to any version backend.

Checklist

@juliusknorrjuliusknorr self-assigned this Feb 13, 2023
@juliusknorrjuliusknorr added bug 3. to review Waiting for reviews labels Feb 13, 2023
@juliusknorrjuliusknorr mentioned this pull request Feb 13, 2023
Closed
@juliusknorr

juliusknorr commented Feb 13, 2023

Copy link
Copy Markdown
MemberAuthor

Will have a look into the failing tests...

artonge
artonge reviewed Feb 13, 2023
View reviewed changes
Comment threadapps/files_versions/lib/Versions/VersionManager.php Outdated
@juliusknorr
juliusknorrforce-pushed the bugfix/noid/rollback-hook branch from 6f7fe63 to e6317ddCompareFebruary 14, 2023 11:40
github-advanced-security[bot]
github-advanced-securityAI found potential problems Mar 10, 2023
View reviewed changes
Comment threadapps/files_versions/lib/Versions/LegacyVersionsBackend.php
$userFolder = $this->rootFolder->getUserFolder($user->getUID());
$nodes = $userFolder->getById($file->getId());
$file2 = array_pop($nodes);
$userFolder = $this->rootFolder->getUserFolder($user->getUID());

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getUID on possibly null value
Comment threadapps/files_versions/lib/Versions/LegacyVersionsBackend.php Fixed
Comment threadapps/files_versions/lib/Versions/LegacyVersionsBackend.php
$versionEntity->setTimestamp($file2->getMTime());
$versionEntity->setSize($file2->getSize());
$versionEntity->setMimetype($this->mimeTypeLoader->getId($file2->getMimetype()));
$versionEntity->setFileId($file->getId());

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of setFileId cannot be null, possibly null value provided
Comment threadapps/files_versions/lib/Versions/LegacyVersionsBackend.php

// Insert entries in the DB for existing versions.
$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file->getPath()));

Check notice

Code scanning / Psalm

PossiblyUndefinedVariable

Possibly undefined variable $userFolder, first seen on line 73
Comment threadapps/files_versions/lib/Versions/LegacyVersionsBackend.php
foreach ($versionsOnFS as $version) {
$versionEntity = new VersionEntity();
$versionEntity->setFileId($file2->getId());
$versionEntity->setFileId($file->getId());

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of setFileId cannot be null, possibly null value provided
@icewind1991
icewind1991force-pushed the bugfix/noid/rollback-hook branch from 771cd47 to 5f478a9CompareMarch 10, 2023 18:52
github-advanced-security[bot]
github-advanced-securityAI found potential problems Mar 10, 2023
View reviewed changes
Comment threadapps/files_versions/lib/Versions/LegacyVersionsBackend.php
$nodes = $userFolder->getById($file->getId());
$file2 = array_pop($nodes);
$userFolder = $this->rootFolder->getUserFolder($user->getUID());
$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
juliusknorrand others added 4 commits March 13, 2023 10:52
@juliusknorr
fix: Make sure that rollback hook is triggered on all version backends
cf46bd6
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
tests(files_versions): Tear down fs to clear mount cache before testing
c22d51c
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@icewind1991@juliusknorr
don't re-get fileinfo for versioned file if it's not shared
62e6a32
Signed-off-by: Robin Appelman <robin@icewind.nl>
@juliusknorr
fix: Check return type on rollback
f00f424
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
juliusknorrforce-pushed the bugfix/noid/rollback-hook branch from 5f478a9 to f00f424CompareMarch 13, 2023 09:59
@juliusknorr

juliusknorr commented Mar 15, 2023

Copy link
Copy Markdown
MemberAuthor

Thanks a lot @icewind1991 💙

@juliusknorr
juliusknorr requested a review from mejo-March 15, 2023 09:02
@juliusknorrjuliusknorr added this to the Nextcloud 27 milestone Mar 15, 2023
@juliusknorr

juliusknorr commented Mar 24, 2023

Copy link
Copy Markdown
MemberAuthor

@icewind1991 Kindly also asking for a review :)

@AndyXheli

AndyXheli commented Mar 28, 2023

Copy link
Copy Markdown
Contributor

Hello, Is there any updates on this. We created a ticket with onlyoffice regarding this since we're enterprise user with them. Looks like there was a sugestion fix via nextcloud/groupfolders#2260 Can Nextcloud Devs look into this as our users with onlyofice are effected by this. Thank you!

@juliusknorr

juliusknorr commented Mar 29, 2023

Copy link
Copy Markdown
MemberAuthor

@AndyXheli Please make sure to reach out through support if this is affecting enterprise customers ;)

@juliusknorr
juliusknorr requested review from artonge and come-nc and removed request for blizzz and mejo-April 3, 2023 14:38
@juliusknorr

juliusknorr commented Apr 3, 2023

Copy link
Copy Markdown
MemberAuthor

Sorry accidentally cleared the review @artonge Nothing changed since back then.

@juliusknorr
juliusknorr merged commit 2e1a560 into masterApr 14, 2023
@juliusknorr
juliusknorr deleted the bugfix/noid/rollback-hook branch April 14, 2023 15:09
@juliusknorr

juliusknorr commented Apr 14, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to stable26

@juliusknorr

juliusknorr commented Apr 14, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to stable25

@juliusknorr

juliusknorr commented Apr 14, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to stable24

@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 14, 2023

Copy link
Copy Markdown

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 14, 2023

Copy link
Copy Markdown

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 14, 2023

Copy link
Copy Markdown

The backport to stable24 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@solracsf

solracsf commented Apr 14, 2023

Copy link
Copy Markdown
Member

/backport to stable26

@solracsf

solracsf commented Apr 14, 2023

Copy link
Copy Markdown
Member

/backport to stable25

This was referenced Apr 14, 2023
Merged
Merged
artonge added a commit that referenced this pull request May 25, 2023
@artonge
Fix initialisation of versions in the DB
1c6f4f8
Broken after #36690
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artongeartonge mentioned this pull request May 25, 2023
Merged
artonge added a commit that referenced this pull request May 25, 2023
@artonge
Fix initialisation of versions in the DB
c3475f4
Broken after #36690
Signed-off-by: Louis Chemineau <louis@chmn.me>
artonge added a commit that referenced this pull request May 30, 2023
@artonge
Fix initialisation of versions in the DB
ce45507
Broken after #36690
Signed-off-by: Louis Chemineau <louis@chmn.me>
artonge added a commit that referenced this pull request May 30, 2023
@artonge
Fix initialisation of versions in the DB
e54bfc0
Broken after #36690
Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud-command pushed a commit that referenced this pull request May 31, 2023
@artonge
Fix initialisation of versions in the DB
84f0d3c
Broken after #36690
Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud-command pushed a commit that referenced this pull request Jun 5, 2023
@artonge
Fix initialisation of versions in the DB
8482fb1
Broken after #36690
Signed-off-by: Louis Chemineau <louis@chmn.me>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@icewind1991icewind1991icewind1991 approved these changes
@artongeartongeAwaiting requested review from artonge
@come-nccome-ncAwaiting requested review from come-nc

Assignees

@juliusknorrjuliusknorr

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 27

Development

Successfully merging this pull request may close these issues.

6 participants

@juliusknorr@AndyXheli@solracsf@icewind1991@artonge@github-advanced-security