Skip to content

Conversation

@mejo-
Copy link
Member

@mejo- mejo- commented Jan 12, 2022

When moving a file to trash with encryption enabled, the cache gets
moved before the actual file. According to @icewind1991 this is in order
to not break object storage.

When moving a file from an unencrypted storage (e.g. a collectives
storage) to the encrypted trashbin storage, this causes errors, see

This commit fixes it by doing updateEncryptedVersion() on the target
cache entry if the source cache entry doesn't exist anymore, but the
corresponding target cache entry does exist already.

Fixes: #26544

Signed-off-by: Jonas Meurer [email protected]

When moving a file to trash with encryption enabled, the cache gets
moved before the actual file. According to @icewind1991 this is in order
to not break object storage.

When moving a file from an unencrypted storage (e.g. a collectives
storage) to the encrypted trashbin storage, this causes errors, see

This commit fixes it by doing `updateEncryptedVersion()` on the target
cache entry *if* the source cache entry doesn't exist anymore, but the
corresponding target cache entry does exist already.

Fixes: #26544

Signed-off-by: Jonas Meurer <[email protected]>
Copy link
Member

@icewind1991 icewind1991 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 makes sense

@PVince81 PVince81 merged commit cfafd79 into master Jan 14, 2022
@PVince81 PVince81 deleted the fix/update_encrypted_version branch January 14, 2022 08:45
@solracsf
Copy link
Member

@PVince81 should this be backported?

@mejo-
Copy link
Member Author

mejo- commented Jan 14, 2022

/backport to stable23

@mejo-
Copy link
Member Author

mejo- commented Jan 14, 2022

/backport to stable22

Sign up for free to 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.

Call to a member function getId() on array at lib/private/Files/Cache/Updater.php on line 160

5 participants