zias/wolk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass a struct with the info

Browse Source 
Former-commit-id: 6f9843613e6abfe0b19e6e43f9299afb98645477 [formerly 805fa39b073401c946b559e0e967fdc553f16295] [formerly f9e2de337abc0cbeb5ccdb8b6962871b0bd3ee0e [formerly 1d26b8e95e73a94ba92673861c4e83dfded0d92e]]
Former-commit-id: 259a1ba8cdc71e7d32add58f9487e5827aa6685e [formerly 161a1a49bc1158f11f07fc9ff638506dafb6c918]
Former-commit-id: 67fe1fef4602baf4ddae40b28e65ac9a2a42ca9d
This commit is contained in:
Henrique Dias
2017-06-27 09:57:11 +01:00
parent a3941facd9
commit f2b492e0ce
12 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webdav.go
View File

@@ -8,11 +8,11 @@ import (
)
// serveWebDAV handles the webDAV route of the File Manager.
func serveWebDAV(w http.ResponseWriter, r *http.Request, m *FileManager, u *User) (int, error) {
func serveWebDAV(ctx *requestContext, w http.ResponseWriter, r *http.Request) (int, error) {
var err error
// Checks for user permissions relatively to this path.
if !u.Allowed(strings.TrimPrefix(r.URL.Path, m.WebDavURL)) {
if !ctx.User.Allowed(strings.TrimPrefix(r.URL.Path, ctx.FileManager.WebDavURL)) {
return http.StatusForbidden, nil
}
@@ -26,8 +26,8 @@ func serveWebDAV(w http.ResponseWriter, r *http.Request, m *FileManager, u *User
//
// It was decided on https://github.com/hacdias/caddy-filemanager/issues/85
// that GET, for collections, will return the same as PROPFIND method.
path := strings.Replace(r.URL.Path, m.WebDavURL, "", 1)
path = u.scope + "/" + path
path := strings.Replace(r.URL.Path, ctx.FileManager.WebDavURL, "", 1)
path = ctx.User.scope + "/" + path
path = filepath.Clean(path)
var i os.FileInfo
@@ -45,28 +45,28 @@ func serveWebDAV(w http.ResponseWriter, r *http.Request, m *FileManager, u *User
}
}
case "PROPPATCH", "MOVE", "PATCH", "PUT", "DELETE":
if !u.AllowEdit {
if !ctx.User.AllowEdit {
return http.StatusForbidden, nil
}
case "MKCOL", "COPY":
if !u.AllowNew {
if !ctx.User.AllowNew {
return http.StatusForbidden, nil
}
}
// Preprocess the PUT request if it's the case
if r.Method == http.MethodPut {
if err = m.BeforeSave(r, m, u); err != nil {
if err = ctx.FileManager.BeforeSave(r, ctx.FileManager, ctx.User); err != nil {
return http.StatusInternalServerError, err
}
if put(w, r, m, u) != nil {
if put(ctx, w, r) != nil {
return http.StatusInternalServerError, err
}
}
m.handler.ServeHTTP(w, r)
if err = m.AfterSave(r, m, u); err != nil {
ctx.FileManager.handler.ServeHTTP(w, r)
if err = ctx.FileManager.AfterSave(r, ctx.FileManager, ctx.User); err != nil {
return http.StatusInternalServerError, err
}