Fix deleting references to subtrees that have been restored

cs3org · Feb 14, 2023 · 26c253a · 26c253a
1 parent 06904e1
commit 26c253a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/storage/utils/decomposedfs/tree/tree.go b/pkg/storage/utils/decomposedfs/tree/tree.go
@@ -639,7 +639,12 @@ func (t *Tree) RestoreRecycleItemFunc(ctx context.Context, spaceid, key, trashPa
 		}
 
 		// delete item link in trash
-		if err = os.Remove(trashItem); err != nil {
+		resolvedTrashItem, err := filepath.EvalSymlinks(trashItem)
+		if err != nil {
+			return errors.Wrap(err, "Decomposedfs: could not resolve trash item")
+		}
+		deletePath := filepath.Join(resolvedTrashItem+".children", trashPath)
+		if err = os.Remove(deletePath); err != nil {
 			log.Error().Err(err).Str("trashItem", trashItem).Msg("error deleting trash item")
 		}