diff --git a/go.sum b/go.sum index bc02974..c26a136 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= @@ -5,6 +6,7 @@ github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -19,9 +21,11 @@ github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRP github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1 h1:9/4Hyp+A98nqssD7qceXwoLeAn75MZr25IN76dxlfbg= github.com/dop251/goja v0.0.0-20220408131256-ffe77e20c6f1/go.mod h1:TQJQ+ZNyFVvUtUEtCZxBhfWiH7RJqR3EivNmvD6Waik= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= +github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d h1:W1n4DvpzZGOISgp7wWNtraLcHtnmnTwBlJidqtMIuwQ= github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM= github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -32,6 +36,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -61,8 +66,11 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0= github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= @@ -88,17 +96,20 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/internal/webdav/user.go b/internal/webdav/user.go index 481179f..5ea4550 100644 --- a/internal/webdav/user.go +++ b/internal/webdav/user.go @@ -21,8 +21,8 @@ type User struct { Username string Password string Scope string - Modify bool - Rules []*Rule + Modify bool // 用户是否具备修改权限 + Rules []*Rule // 根据访问路径进行精细化权限控制 Handler *webdav.Handler } diff --git a/internal/webdav/webdav.go b/internal/webdav/webdav.go index c1afca3..6b0687e 100644 --- a/internal/webdav/webdav.go +++ b/internal/webdav/webdav.go @@ -3,6 +3,7 @@ package webdav import ( "context" "github.com/tickstep/library-go/logger" + "golang.org/x/net/webdav" "net/http" "strconv" "strings" @@ -111,11 +112,11 @@ func (c *Config) ServeHTTP(w http.ResponseWriter, r *http.Request) { r.Method == "HEAD" || r.Method == "OPTIONS" || r.Method == "PROPFIND" || - r.Method == "PUT" || r.Method == "LOCK" || - r.Method == "UNLOCK" || - r.Method == "MOVE" || - r.Method == "DELETE" + r.Method == "UNLOCK" + //r.Method == "PUT" || + //r.Method == "MOVE" || + //r.Method == "DELETE" if !u.Allowed(r.URL.Path, noModification) { w.WriteHeader(http.StatusForbidden) @@ -144,7 +145,7 @@ func (c *Config) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } // Runs the WebDAV. - //u.Handler.LockSystem = webdav.NewMemLS() + u.Handler.LockSystem = webdav.NewMemLS() u.Handler.ServeHTTP(w, addContextValue(r)) } diff --git a/internal/webdav/webdav_config.go b/internal/webdav/webdav_config.go index 9a05d9f..1769501 100644 --- a/internal/webdav/webdav_config.go +++ b/internal/webdav/webdav_config.go @@ -19,22 +19,22 @@ type WebdavUser struct { type WebdavConfig struct { // 指定Webdav使用哪个账号的云盘资源 - PanUserId string `json:"panUserId"` - PanDriveId string `json:"panDriveId"` - PanUser *config.PanUser `json:"-"` - UploadChunkSize int `json:"uploadChunkSize"` // 上传文件分片数据块大小，该数值不能太小，建议大于等于512KB - TransferUrlType int `json:"transferUrlType"` // 上传/下载URL类别，1-默认，2-阿里云ECS + PanUserId string `json:"panUserId"` + PanDriveId string `json:"panDriveId"` + PanUser *config.PanUser `json:"-"` + UploadChunkSize int `json:"uploadChunkSize"` // 上传文件分片数据块大小，该数值不能太小，建议大于等于512KB + TransferUrlType int `json:"transferUrlType"` // 上传/下载URL类别，1-默认，2-阿里云ECS - Address string `json:"address"` - Port int `json:"port"` - Prefix string `json:"prefix"` - Users []WebdavUser `json:"users"` + Address string `json:"address"` + Port int `json:"port"` + Prefix string `json:"prefix"` + Users []WebdavUser `json:"users"` } func (w *WebdavConfig) StartServer() { users := map[string]*User{} - for _,u := range w.Users { - fileItem,e := w.PanUser.PanClient().FileInfoByPath(w.PanDriveId, u.Scope) + for _, u := range w.Users { + fileItem, e := w.PanUser.PanClient().FileInfoByPath(w.PanDriveId, u.Scope) if e != nil { logger.Verboseln("scope not existed, shutting server") return @@ -44,8 +44,8 @@ func (w *WebdavConfig) StartServer() { wdfi.fullPath = "/" + wdfi.fullPath } panClientProxy := &PanClientProxy{ - PanUser: w.PanUser, - PanDriveId: w.PanDriveId, + PanUser: w.PanUser, + PanDriveId: w.PanDriveId, PanTransferUrlType: w.TransferUrlType, } users[u.Username] = &User{ @@ -54,12 +54,12 @@ func (w *WebdavConfig) StartServer() { Scope: u.Scope, Modify: true, Rules: nil, - Handler: &webdav.Handler{ + Handler: &webdav.Handler{ Prefix: w.Prefix, FileSystem: WebDavDir{ - Dir: webdav.Dir(u.Scope), - NoSniff: false, - panClientProxy: panClientProxy, + Dir: webdav.Dir(u.Scope), + NoSniff: false, + panClientProxy: panClientProxy, fileInfo: wdfi, uploadChunkSize: w.UploadChunkSize, }, @@ -70,9 +70,9 @@ func (w *WebdavConfig) StartServer() { _, _ = panClientProxy.FileListGetAll(u.Scope) } cfg := &Config{ - Auth: true, - NoSniff: false, - Cors: CorsCfg{ + Auth: true, + NoSniff: false, + Cors: CorsCfg{ Enabled: false, Credentials: false, }, @@ -80,7 +80,7 @@ func (w *WebdavConfig) StartServer() { LogFormat: "", } - listener, err := net.Listen("tcp", w.Address + ":" + strconv.Itoa(w.Port)) + listener, err := net.Listen("tcp", w.Address+":"+strconv.Itoa(w.Port)) if err != nil { log.Fatal(err) } @@ -88,4 +88,3 @@ func (w *WebdavConfig) StartServer() { logger.Verboseln("shutting server", err) } } -