Skip to content

[stable30] fix(files): preserve encryptedVersion when copying cache entries - #62340

Merged
sorbaugh merged 2 commits into
stable30from
backport/62255/stable30
Jul 21, 2026
Merged

[stable30] fix(files): preserve encryptedVersion when copying cache entries#62340
sorbaugh merged 2 commits into
stable30from
backport/62255/stable30

Conversation

@backportbot

@backportbotbackportbotBot commented Jul 20, 2026

Copy link
Copy Markdown

Backport of #62255

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Cache::copyFromCache() rebuilt the target's cache row via
cacheEntryToArray(), which only carried over a boolean `encrypted`
flag and dropped the real `encryptedVersion` count. Since
View::copy() unconditionally calls copyFromCache() after the storage
copy completes, this silently overwrote the correct encryptedVersion
that Encryption::updateEncryptedVersion() had just set, collapsing it
back to 0/1 on every copy of a file whose encryptedVersion was above 1.
cacheEntryToArray() now includes the source entry's encryptedVersion
when it is encrypted. The existing encrypted-to-non-encrypted-storage
override in copyFromCache() also clears encryptedVersion alongside
`encrypted`, since normalizeData() prefers encryptedVersion over
`encrypted` when both are present in the update data.
Signed-off-by: Kent Delante <kent@delante.me>
Assisted-by: ClaudeCode:claude-sonnet-5
@leftybournes
leftybournes marked this pull request as ready for review July 20, 2026 14:04
@leftybournes
leftybournesforce-pushed the backport/62255/stable30 branch from 234b242 to 3590360CompareJuly 20, 2026 14:20
Signed-off-by: Kent Delante <kent@delante.me>
Assisted-by: ClaudeCode:claude-sonnet-5
@leftybournes
leftybournesforce-pushed the backport/62255/stable30 branch from 3590360 to eb4df90CompareJuly 20, 2026 14:34
@sorbaugh
sorbaugh merged commit 11f9ac5 into stable30Jul 21, 2026
180 of 203 checks passed
@sorbaugh
sorbaugh deleted the backport/62255/stable30 branch July 21, 2026 08:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@leftybournes@cristianscheid@sorbaugh