Skip to content
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.

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

Fix copying or moving from shared groupfolders #47847

Merged
merged 2 commits into from
Oct 29, 2024

Conversation

danxuliu
Copy link
Member

@danxuliu danxuliu commented Sep 9, 2024

When copying a shared groupfolder into another local folder the whole data directory ends being (recursively) copied to the other folder. There are other scenarios that fail, but that one is probably the most severe one.

The problem is that shared groupfolders have two jails, one for the shared storage and another one for the groupfolder storage wrapped by the shared storage, and when a file or folder is copied between two local storages the source path (on disk) to copy or move from is got from the unjailed path of the source storage. However, if the source storage has more than one jail getting the unjailed path resolves the most external jail, but the source path needs to be got from the most internal jail instead (the one closer to the local storage).

In the case of a shared groupfolder the external unjailed path of the shared groupfolder itself is "", and when getting the source path of "" in the local storage the full path ends being the data directory, so the whole data directory ends being copied to the target.

The fix is based on the code from Common::moveFromStorage, which already uses the most internal unjailed path.

E2E tests (as integration tests are not setup yet in the groupfolders app) were added in nextcloud/groupfolders#3185

Note that the issue can not be reproduced when trying to move the shared groupfolder into another folder (not shared and in the same parent mount) because, in that case, the shared mount is moved. On the other hand, it can be reproduced when trying to move a file from the shared groupfolder into another folder, as in that case moveFromStorage is used. Thus the slightly different scenarios below, one copying the whole shared groupfolder, and one moving a file from the shared groupfolder.

Beware when testing the scenario 1 below, as it will mess with the Nextcloud data directory and can potentially take a lot of disk space.

How to test (scenario 1)

  • Create two users
  • Create a group and add user A to the group
  • Enable groupfolders app
  • Create a groupfolder for the group of user A
  • Log in as user A
  • Share the groupfolder with user B
  • Log in as user B
  • Create a folder
  • Copy the shared groupfolder into the folder

Result with this pull request

The copy succeeds; opening the target directory shows the copied groupfolder

Result without this pull request

The copy eventually fails; although the WebUI might not show any file inside the target directory, if the filesystem is checked it can be seen that it tried to recursively copy the Nextcloud data directory into the target

How to test (scenario 2)

  • Create two users
  • Create a group and add user A to the group
  • Enable groupfolders app
  • Create a groupfolder for the group of user A
  • Log in as user A
  • Open groupfolder
  • Upload a file
  • Share the groupfolder with user B
  • Log in as user B
  • Create a folder
  • Open shared groupfolder
  • Move the file into the folder

Result with this pull request

The move succeeds; opening the target directory shows the moved file

Result without this pull request

The move fails; the Nextcloud logs contain an error about not being able to move {NEXTCLOUD_DATA_DIRECTORY}/{NAME_OF_THE_FILE_TO_MOVE}

@danxuliu
Copy link
Member Author

danxuliu commented Sep 9, 2024

/backport to stable30

@danxuliu
Copy link
Member Author

danxuliu commented Sep 9, 2024

/backport to stable29

@danxuliu
Copy link
Member Author

danxuliu commented Sep 9, 2024

/backport to stable28

@joshtrichards
Copy link
Member

This seems like it must have some open Issues associated with it, but I didn't find any with a quick look. Are you aware of any open bug reports this likely fixes?

@danxuliu
Copy link
Member Author

danxuliu commented Sep 9, 2024

This seems like it must have some open Issues associated with it, but I didn't find any with a quick look. Are you aware of any open bug reports this likely fixes?

No, sorry 🤷

@icewind1991
Copy link
Member

Added a test

danxuliu and others added 2 commits October 10, 2024 15:16
When copying or moving between two local storages the source path (on
disk) to copy or move from is got from the unjailed path of the source
storage. However, if the source storage has more than one jail getting
the unjailed path resolves the most external jail, but the source path
needs to be got from the most internal jail instead (the one closer to
the local storage).

This can happen, for example, with a shared groupfolder: in that case
there is an external jail for the shared storage, and one internal jail
for the groupfolder storage wrapped by the shared storage.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@icewind1991 icewind1991 force-pushed the fix-copying-or-moving-from-shared-groupfolders branch from cef863a to 7cb07bf Compare October 10, 2024 13:16
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 29, 2024
@skjnldsv skjnldsv merged commit e3e22e2 into master Oct 29, 2024
178 checks passed
@skjnldsv skjnldsv deleted the fix-copying-or-moving-from-shared-groupfolders branch October 29, 2024 10:33
@danxuliu
Copy link
Member Author

/backport to stable30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: filesystem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants