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 issues where unencrypted_size was being falsely used for non-encrypted home folders #38808

Merged
merged 2 commits into from
Sep 6, 2023

Conversation

juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Jun 14, 2023

This fixes issues that occur when encryption is enabled but the encryption of home folders is disabled on object storage.

Before this change the unencrypted_size might have been set but not always updated (e.g. when writing to a file through fopen). This lead to issues later on when trying to download the file but the size returned from the filecache didn't match with what the storage returns.

#34232 didn't help here since the scan command it uses is not available for object storage.

Steps to reproduce

  • Enable encryption
  • Disable home folder encryption
  • Upload a docx file
  • Open the docx file in Collabora, change something and save (this uses fopen)

Before:

  • The unencrypted_size column wasn't updated and the file was no longer downloadable

After:

  • The file is downloadable even if the unencrypted size has a wrong data, since the file isn't encrypted we should just stick to the regular size column
  • The unencrypted_size column will be properly updated by the ObjectStoreStorage already, for cases when encryption is enabled the Encryption Wrapper will anyways update the value afterwards

Checklist

@juliusknorr juliusknorr changed the title bugfix/noid/store unencrypted homefolder Fix issues where unencrypted_size was being falsely used for non-encrypted home folders Jun 14, 2023
@juliusknorr juliusknorr requested review from icewind1991, artonge, a team, ArtificialOwl and Fenn-CS and removed request for a team June 14, 2023 12:46
@juliusknorr juliusknorr added bug 3. to review Waiting for reviews labels Jun 14, 2023
@juliusknorr
Copy link
Member Author

/backport to stable27

@juliusknorr
Copy link
Member Author

/backport to stable26

@juliusknorr
Copy link
Member Author

/backport to stable25

@juliusknorr
Copy link
Member Author

/backport to stable24

@szaimen szaimen added this to the Nextcloud 28 milestone Jun 15, 2023
@juliusknorr
Copy link
Member Author

🏓 For reviews ... confirmed to work on the affected instance already

@juliusknorr juliusknorr force-pushed the bugfix/noid/store-unencrypted-homefolder branch 2 times, most recently from 7edb942 to bf888b3 Compare July 12, 2023 11:39
@juliusknorr juliusknorr force-pushed the bugfix/noid/store-unencrypted-homefolder branch from bf888b3 to bfd9e9b Compare August 16, 2023 10:10
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr force-pushed the bugfix/noid/store-unencrypted-homefolder branch from bfd9e9b to 13b9dd2 Compare September 6, 2023 05:25
@juliusknorr juliusknorr merged commit 5cb2713 into master Sep 6, 2023
39 checks passed
@juliusknorr juliusknorr deleted the bugfix/noid/store-unencrypted-homefolder branch September 6, 2023 17:58
@juliusknorr
Copy link
Member Author

/backport to stable27

@juliusknorr
Copy link
Member Author

/backport to stable26

@juliusknorr
Copy link
Member Author

/backport to stable25

@juliusknorr
Copy link
Member Author

/backport to stable24

@backportbot-nextcloud
Copy link

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
Copy link

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
Copy link

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

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# 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-stable27

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

@backportbot-nextcloud
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants