[stable35] fix(encryption): keep version and size in sync for files not in the cache - #64485
Open
backportbot[bot] wants to merge 3 commits into
Open
backportbot[bot] wants to merge 3 commits into
backportbot[bot] wants to merge 3 commits into
Conversation
backportbot
Bot
added
bug
3. to review
susnux
force-pushed
the
backport/64365/stable35
branch
from
September 20, 2026 12:45
dd9a95a to
4e72faa
Compare
susnux
marked this pull request as ready for review
September 20, 2026 12:46
susnux
requested review from
Altahrim,
icewind1991,
provokateurin and
salmart-dev
and removed request for
a team
September 20, 2026 12:46
susnux
approved these changes
Sep 20, 2026
Merged
icewind1991
approved these changes
Sep 20, 2026
…ache A file written through a stream has no file cache entry until the caller scans it, but both inputs of the block signature are read from that entry: stream_close() can only bump `encryptedVersion` if the entry exists, while the reader got version 0 instead of the 1 the blocks were signed with, and filesize() returned the wrapped storage's ciphertext size, which moved the 'end' position marker to the wrong block. Reading such a file back - e.g. moving a part file to a target on another storage - failed with "Bad Signature". Treat a missing version as 1 on read, and let the size tracked while writing win over the wrapped storage's size even without a cache entry. Also stop reading `encryptedVersion` off a missing source entry when updating the encrypted version of a copy or rename. Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
A copy re-encrypts the target, so the signature of its blocks is keyed on the version of the target - the version of the file it overwrites plus one - and not on the version of the source. Two writers overwrite that value after the stream recorded it: updateEncryptedVersion() resets it to 1 for every copy, and Cache::copyFromCache() then puts the source's version on the target. Reading the copy back fails with "Bad Signature" whenever those differ, which is the case for every copy of a file that was written more than once and for every copy onto an existing file. Take the version the stream recorded for the target instead of resetting it, and let it win over the source's version when the cache entry of the copy is written. Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
susnux
force-pushed
the
backport/64365/stable35
branch
from
September 20, 2026 22:29
4e72faa to
58c9b86
Compare
7 tasks
The size of an encrypted file lives in `unencrypted_size`, and both CacheEntry::getUnencryptedSize() and FileInfo::getSize() prefer it over `size`. Cache::copyFromCache() copied the `encrypted` mark without it, so the copy of an encrypted file was marked encrypted with an unencrypted size of 0 and reported as empty - in the web UI, to clients and for quota - until something rescanned it. Copy the unencrypted size alongside the encrypted version, and reset it when the mark is dropped for a target that is not encrypted, where the size is read from `size`. Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
7 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.