[stable29] Fix encryption wrapper not seen by groupfolder cache #3133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
come-nc
approved these changes
Aug 22, 2024
|
@danxuliu cypress failure, related? |
danxuliu
force-pushed
the
backport/2942/stable29
branch
from
1e69312
to
b61a0d9
Compare
The failure in Independently of that I amended the PHP stubs with an extra field that was not included in them (although it was already included in the stubs of stable30). |
These tests should be written as integration tests instead, but for practical reasons, as the integration tests have not been setup yet in the groupfolders app, they were written as E2E tests. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Jail wrappers reuse the cache of the wrapped storage even if another storage is explicitly given. Due to that, when the cache is got from an storage and that storage has a Jail all the wrappers above it are not known to the cache, and only those wrapped by the Jail are taken into account. In general that works fine, as in most cases the cache does not need to know the details of a storage. However, it needs to know if an Encryption wrapper is present in the storage when moving files into it, as the file cache explicitly clears the "encrypted" flag when moving a file from an encrypted storage to a non encrypted storage. As the Encryption wrapper of groupfolders was not known to the cache all files moved from an encrypted storage to an encrypted groupfolder ended wrongly marked as not encrypted. To solve that now the Jail used by groupfolders does not reuse the inner cache when encryption is enabled, and instead passes the given storage. This is applied only when encryption is enabled, as reusing the inner cache was done as a performance optimization. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
skjnldsv
force-pushed
the
backport/2942/stable29
branch
from
b61a0d9
to
155be22
Compare
|
Fixed cypress on master, 30 and 29 |
skjnldsv
added
4. to release
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of PR #2942