fix(deps): bump reva to fix restoring already-restored trash item returns 500 - #12969
Merged
mzner merged 1 commit intoSep 18, 2026
Merged
Conversation
…RecycleItem Restoring an already-restored/purged trash item returned 500 CODE_INTERNAL instead of 404. Fixed upstream in owncloud/reva#740; bump the vendored reva to 98fec04d9 to pick it up.
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
LukasHirt
approved these changes
Sep 17, 2026
deyankiteworks
approved these changes
Sep 17, 2026
mzner
deleted the
fix/OCISDEV-1370/restoring-already-trashed-item-returns-500
branch
September 18, 2026 05:05
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
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.
Description
RestoreRecycleItemreturned a bare500 CODE_INTERNALwhen restoring a trash item whose trash entry no longer existed (e.g. it was already restored, or purged), instead of a404 Not Found. This bumps the vendoredrevadependency to pick up the fix (owncloud/reva#740), which maps the underlyingErrNotExisttoerrtypes.NotFoundinRestoreRecycleItem, mirroring the existing handling inPurgeRecycleItem.Related Issue
Motivation and Context
A second restore request for the same trash key, such as a sync client re-submitting a request, produced a 500 that looked like a server error even though the original restore had already succeeded. This was observed in production, where a single bulk restore-from-trash burst produced ~138 benign 500s that masked the fact that the underlying restores had actually succeeded.
How Has This Been Tested?
pkg/storage/utils/decomposedfs)errtypes.NotFoundinstead of a bare*fs.PathErrorgo build ./...andgo test ./pkg/storage/utils/decomposedfs/...pass in ocis after the reva bumpScreenshots (if appropriate):
Types of changes
Checklist: