Merge pull request #3791 from owncloud/thumnails-id

fix thumbnails for empty trailing paths
owncloud · May 13, 2022 · 42c4abb · 42c4abb
2 parents 9ccde70 + eb07e05
commit 42c4abb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/changelog/unreleased/share-jail-fixes.md b/changelog/unreleased/share-jail-fixes.md
@@ -0,0 +1,5 @@
+Bugfix: Fix Thumbnails for IDs without a trailing path
+
+The routes in the chi router were not matching thumbnail requests without a trailing path.
+
+https://github.com/owncloud/ocis/pull/3791
diff --git a/extensions/webdav/pkg/dav/requests/thumbnail.go b/extensions/webdav/pkg/dav/requests/thumbnail.go
@@ -1,7 +1,6 @@
 package requests
 
 import (
-	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -43,9 +42,6 @@ func ParseThumbnailRequest(r *http.Request) (*ThumbnailRequest, error) {
 	ctx := r.Context()
 
 	fp := ctx.Value(constants.ContextKeyPath).(string)
-	if fp == "" {
-		return nil, errors.New("invalid file path")
-	}
 
 	id := ""
 	v := ctx.Value(constants.ContextKeyID)

diff --git a/extensions/webdav/pkg/service/v0/service.go b/extensions/webdav/pkg/service/v0/service.go
@@ -79,10 +79,14 @@ func NewService(opts ...Option) (Service, error) {
 		r.Group(func(r chi.Router) {
 			r.Use(svc.DavUserContext())
 
+			r.Get("/remote.php/dav/spaces/{id}", svc.SpacesThumbnail)
 			r.Get("/remote.php/dav/spaces/{id}/*", svc.SpacesThumbnail)
+			r.Get("/dav/spaces/{id}", svc.SpacesThumbnail)
 			r.Get("/dav/spaces/{id}/*", svc.SpacesThumbnail)
 
+			r.Get("/remote.php/dav/files/{id}", svc.Thumbnail)
 			r.Get("/remote.php/dav/files/{id}/*", svc.Thumbnail)
+			r.Get("/dav/files/{id}", svc.Thumbnail)
 			r.Get("/dav/files/{id}/*", svc.Thumbnail)
 		})
 
@@ -151,11 +155,12 @@ func (g Webdav) DavUserContext() func(next http.Handler) http.Handler {
 			}
 
 			if id != "" {
-				filePath = strings.TrimPrefix(filePath, path.Join("/remote.php/dav/spaces", id)+"/")
-				filePath = strings.TrimPrefix(filePath, path.Join("/dav/spaces", id)+"/")
+				filePath = strings.TrimPrefix(filePath, path.Join("/remote.php/dav/spaces", id))
+				filePath = strings.TrimPrefix(filePath, path.Join("/dav/spaces", id))
 
-				filePath = strings.TrimPrefix(filePath, path.Join("/remote.php/dav/files", id)+"/")
-				filePath = strings.TrimPrefix(filePath, path.Join("/dav/files", id)+"/")
+				filePath = strings.TrimPrefix(filePath, path.Join("/remote.php/dav/files", id))
+				filePath = strings.TrimPrefix(filePath, path.Join("/dav/files", id))
+				filePath = strings.TrimPrefix(filePath, "/")
 			}
 
 			ctx = context.WithValue(ctx, constants.ContextKeyPath, filePath)