fix(files_trashbin): cleanup trash metadata after failed cross-user moves - #63070
Open
joshtrichards wants to merge 1 commit into
Open
fix(files_trashbin): cleanup trash metadata after failed cross-user moves#63070joshtrichards wants to merge 1 commit into
joshtrichards wants to merge 1 commit into
Conversation
When moving a shared file to the trash fails after its metadata row has been inserted, the failure-cleanup path calls `deleteTrashRow()` with the deleting user. The row was inserted for the file owner, so this leaves orphaned `files_trash` metadata whenever the owner and deleting user differ. Doesn't impact success path; just the rollback path. This change uses `$owner` for the cleanup call, ensuring the inserted metadata row is removed. Signed-off-by: Josh <josh.t.richards@gmail.com>
Member
Author
|
/backport to stable34 |
joshtrichards
marked this pull request as ready for review
August 8, 2026 03:00
joshtrichards
requested review from
Altahrim,
leftybournes,
provokateurin and
salmart-dev
and removed request for
a team
August 8, 2026 03:00
CarlSchwan
approved these changes
Aug 8, 2026
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.
Summary
Discovered this while working on #63069.
When moving a shared file to the trash fails (after its metadata row has been inserted), the failure-cleanup path calls
deleteTrashRow()with the deleting user.The row was inserted for the file owner (not deleting user), so this leaves orphaned
files_trashmetadata whenever the owner and deleting user differ.Doesn't impact success path; just the rollback path.
This change uses
$ownerfor the cleanup call, ensuring the inserted metadata row is removed. Other call sites for deleteTrashRow() in the class are correct in their context.TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)