Make trashbin restores work again after DAV fixes (#5430)

jessegeens · web-flow · commit 6f9a1488da7f · 2025-12-11T11:38:01.000+01:00
diff --git a/changelog/unreleased/fix-trash-restore.md b/changelog/unreleased/fix-trash-restore.md
@@ -0,0 +1,3 @@
+Bugfix: fix trashbin restores
+
+https://github.com/cs3org/reva/pull/5430
diff --git a/internal/http/services/owncloud/ocdav/trashbin.go b/internal/http/services/owncloud/ocdav/trashbin.go
@@ -89,7 +89,6 @@ func (h *TrashbinHandler) handleTrashbinSpaces(s *svc, w http.ResponseWriter, r
 			return
 		}
 		dst = path.Clean(dst)
-		_, dst = router.ShiftPath(dst)
 
 		log.Debug().Str("key", key).Str("dst", dst).Msg("restore")
 
@@ -541,7 +540,7 @@ func (h *TrashbinHandler) restore(w http.ResponseWriter, r *http.Request, s *svc
 	}
 
 	dstRef := &provider.Reference{
-		Path: path.Join(basePath, dst),
+		Path: dst,
 	}
 
 	dstStatReq := &provider.StatRequest{
@@ -564,7 +563,7 @@ func (h *TrashbinHandler) restore(w http.ResponseWriter, r *http.Request, s *svc
 	// restore location exists, and if it doesn't returns a conflict error code.
 	if dstStatRes.Status.Code == rpc.Code_CODE_NOT_FOUND && isNested(dst) {
 		parentStatReq := &provider.StatRequest{
-			Ref: &provider.Reference{Path: path.Join(basePath, filepath.Dir(dst))},
+			Ref: &provider.Reference{Path: filepath.Dir(dst)},
 		}
 
 		parentStatResponse, err := client.Stat(ctx, parentStatReq)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Bugfix: fix trashbin restores`
	`2`	`+`
	`3`	`+https://github.com/cs3org/reva/pull/5430`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ func (h TrashbinHandler) handleTrashbinSpaces(s svc, w http.ResponseWriter, r`
`89`	`89`	`return`
`90`	`90`	`}`
`91`	`91`	`dst = path.Clean(dst)`
`92`		`- _, dst = router.ShiftPath(dst)`
`93`	`92`
`94`	`93`	`log.Debug().Str("key", key).Str("dst", dst).Msg("restore")`
`95`	`94`
`@@ -541,7 +540,7 @@ func (h TrashbinHandler) restore(w http.ResponseWriter, r http.Request, s *svc`
`541`	`540`	`}`
`542`	`541`
`543`	`542`	`dstRef := &provider.Reference{`
`544`		`- Path: path.Join(basePath, dst),`
	`543`	`+ Path: dst,`
`545`	`544`	`}`
`546`	`545`
`547`	`546`	`dstStatReq := &provider.StatRequest{`
`@@ -564,7 +563,7 @@ func (h TrashbinHandler) restore(w http.ResponseWriter, r http.Request, s *svc`
`564`	`563`	`// restore location exists, and if it doesn't returns a conflict error code.`
`565`	`564`	`if dstStatRes.Status.Code == rpc.Code_CODE_NOT_FOUND && isNested(dst) {`
`566`	`565`	`parentStatReq := &provider.StatRequest{`
`567`		`- Ref: &provider.Reference{Path: path.Join(basePath, filepath.Dir(dst))},`
	`566`	`+ Ref: &provider.Reference{Path: filepath.Dir(dst)},`
`568`	`567`	`}`
`569`	`568`
`570`	`569`	`parentStatResponse, err := client.Stat(ctx, parentStatReq)`