mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-13 04:37:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

return 404 for /remote.php/webdav and /webdav/ previews

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-26 14:07:15 +02:00
committed by Jörn Friedrich Dreyer
parent a04c5c2f6f
commit ea9cbb8c2d
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
extensions/webdav/pkg/service/v0/service.go
View File

@@ -16,7 +16,6 @@ import (
gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/cs3org/reva/v2/pkg/storage/utils/templates"
"github.com/go-chi/render"
@@ -105,10 +104,11 @@ func NewService(opts ...Option) (Service, error) {
})
r.Group(func(r chi.Router) {
r.Use(svc.WebdavContext())
r.Get("/remote.php/webdav/*", svc.Thumbnail)
r.Get("/webdav/*", svc.Thumbnail)
// currently not implemented
// If we implement this endpoint, we need to get the user from the access token.
// We decided against doing it, so that this service can be started without the JWT secret.
r.Get("/remote.php/webdav/*", http.NotFound)
r.Get("/webdav/*", http.NotFound)
})
// r.MethodFunc("REPORT", "/remote.php/dav/files/{id}/*", svc.Search)
@@ -182,28 +182,6 @@ func (g Webdav) DavContext() func(next http.Handler) http.Handler {
}
}
func (g Webdav) WebdavContext() func(next http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
u, ok := revactx.ContextGetUser(r.Context())
if ok {
if u.Id == nil || u.Id.OpaqueId != "" {
ctx = context.WithValue(ctx, constants.ContextKeyID, u.Id.OpaqueId)
}
}
filePath := r.URL.Path
filePath = strings.TrimPrefix(filePath, "/remote.php/webdav/")
filePath = strings.TrimPrefix(filePath, "/webdav/")
ctx = context.WithValue(ctx, constants.ContextKeyPath, filePath)
next.ServeHTTP(w, r.WithContext(ctx))
})
}
}
// SpacesThumbnail is the endpoint for retrieving thumbnails inside of spaces.
func (g Webdav) SpacesThumbnail(w http.ResponseWriter, r *http.Request) {
tr, err := requests.ParseThumbnailRequest(r)