From 3948ee7f3aec00091de326f8a5c3ae6c81961514 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Tue, 23 Nov 2021 21:22:23 +0800 Subject: [PATCH] Fix: use `X-Cr-` as custom header prefix --- assets | 2 +- middleware/cluster.go | 8 ++++---- middleware/cluster_test.go | 12 ++++++------ models/scripts/invoker/invoker.go | 3 ++- pkg/auth/auth.go | 6 +++--- pkg/auth/auth_test.go | 4 ++-- pkg/conf/defaults.go | 2 +- pkg/filesystem/driver/remote/handler.go | 10 +++++----- pkg/request/request.go | 8 ++++---- routers/controllers/file.go | 4 ++-- routers/controllers/slave.go | 6 +++--- routers/file_router_test.go | 6 +++--- 12 files changed, 36 insertions(+), 35 deletions(-) diff --git a/assets b/assets index e3d3e79..691e828 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit e3d3e790f1a44ed38eaa6e2d636867c1b1418983 +Subproject commit 691e82868d69963d7620e758833ffdbcbf9936b5 diff --git a/middleware/cluster.go b/middleware/cluster.go index d8bf979..5744ceb 100644 --- a/middleware/cluster.go +++ b/middleware/cluster.go @@ -10,9 +10,9 @@ import ( // MasterMetadata 解析主机节点发来请求的包含主机节点信息的元数据 func MasterMetadata() gin.HandlerFunc { return func(c *gin.Context) { - c.Set("MasterSiteID", c.GetHeader("X-Site-Id")) - c.Set("MasterSiteURL", c.GetHeader("X-Site-Url")) - c.Set("MasterVersion", c.GetHeader("X-Cloudreve-Version")) + c.Set("MasterSiteID", c.GetHeader("X-Cr-Site-Id")) + c.Set("MasterSiteURL", c.GetHeader("X-Cr-Site-Url")) + c.Set("MasterVersion", c.GetHeader("X-Cr-Cloudreve-Version")) c.Next() } } @@ -41,7 +41,7 @@ func UseSlaveAria2Instance(clusterController cluster.Controller) gin.HandlerFunc func SlaveRPCSignRequired(nodePool cluster.Pool) gin.HandlerFunc { return func(c *gin.Context) { - nodeID, err := strconv.ParseUint(c.GetHeader("X-Node-Id"), 10, 64) + nodeID, err := strconv.ParseUint(c.GetHeader("X-Cr-Node-Id"), 10, 64) if err != nil { c.JSON(200, serializer.ParamErr("未知的主机节点ID", err)) c.Abort() diff --git a/middleware/cluster_test.go b/middleware/cluster_test.go index 7e28e6f..440163d 100644 --- a/middleware/cluster_test.go +++ b/middleware/cluster_test.go @@ -22,9 +22,9 @@ func TestMasterMetadata(t *testing.T) { c.Request = httptest.NewRequest("GET", "/", nil) c.Request.Header = map[string][]string{ - "X-Site-Id": {"expectedSiteID"}, - "X-Site-Url": {"expectedSiteURL"}, - "X-Cloudreve-Version": {"expectedMasterVersion"}, + "X-Cr-Site-Id": {"expectedSiteID"}, + "X-Cr-Site-Url": {"expectedSiteURL"}, + "X-Cr-Cloudreve-Version": {"expectedMasterVersion"}, } masterMetaDataFunc(c) siteID, _ := c.Get("MasterSiteID") @@ -47,7 +47,7 @@ func TestSlaveRPCSignRequired(t *testing.T) { { c, _ := gin.CreateTestContext(rec) c.Request = httptest.NewRequest("GET", "/", nil) - c.Request.Header.Set("X-Node-Id", "unknown") + c.Request.Header.Set("X-Cr-Node-Id", "unknown") slaveRPCSignRequiredFunc(c) a.True(c.IsAborted()) } @@ -56,7 +56,7 @@ func TestSlaveRPCSignRequired(t *testing.T) { { c, _ := gin.CreateTestContext(rec) c.Request = httptest.NewRequest("GET", "/", nil) - c.Request.Header.Set("X-Node-Id", "38") + c.Request.Header.Set("X-Cr-Node-Id", "38") slaveRPCSignRequiredFunc(c) a.True(c.IsAborted()) } @@ -70,7 +70,7 @@ func TestSlaveRPCSignRequired(t *testing.T) { c, _ := gin.CreateTestContext(rec) c.Request = httptest.NewRequest("POST", "/", nil) - c.Request.Header.Set("X-Node-Id", "38") + c.Request.Header.Set("X-Cr-Node-Id", "38") c.Request = auth.SignRequest(authInstance, c.Request, 0) slaveRPCSignRequiredFunc(c) a.False(c.IsAborted()) diff --git a/models/scripts/invoker/invoker.go b/models/scripts/invoker/invoker.go index adb2f97..e9a0b05 100644 --- a/models/scripts/invoker/invoker.go +++ b/models/scripts/invoker/invoker.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "github.com/cloudreve/Cloudreve/v3/pkg/util" + "strings" ) type DBScript interface { @@ -29,7 +30,7 @@ func Register(name string, script DBScript) { func ListPrefix(prefix string) []string { var scripts []string for name := range availableScripts { - if name[:len(prefix)] == prefix { + if strings.HasPrefix(name, prefix) { scripts = append(scripts, name) } } diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 20b9e10..094a37f 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -35,7 +35,7 @@ type Auth interface { } // SignRequest 对PUT\POST等复杂HTTP请求签名，只会对URI部分、 -// 请求正文、`X-`开头的header进行签名 +// 请求正文、`X-Cr-`开头的header进行签名 func SignRequest(instance Auth, r *http.Request, expires int64) *http.Request { // 处理有效期 if expires > 0 { @@ -69,7 +69,7 @@ func CheckRequest(instance Auth, r *http.Request) error { func getSignContent(r *http.Request) (rawSignString string) { // 读取所有body正文 var body = []byte{} - if _, ok := r.Header["X-Policy"]; !ok { + if _, ok := r.Header["X-Cr-Policy"]; !ok { if r.Body != nil { body, _ = ioutil.ReadAll(r.Body) _ = r.Body.Close() @@ -80,7 +80,7 @@ func getSignContent(r *http.Request) (rawSignString string) { // 决定要签名的header var signedHeader []string for k, _ := range r.Header { - if strings.HasPrefix(k, "X-") && k != "X-Filename" { + if strings.HasPrefix(k, "X-Cr-") && k != "X-Cr-Filename" { signedHeader = append(signedHeader, fmt.Sprintf("%s=%s", k, r.Header.Get(k))) } } diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index 46533fb..42c5603 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -70,7 +70,7 @@ func TestSignRequest(t *testing.T) { strings.NewReader("I am body."), ) asserts.NoError(err) - req.Header["X-Policy"] = []string{"I am Policy"} + req.Header["X-Cr-Policy"] = []string{"I am Policy"} req = SignRequest(General, req, 10) asserts.NotEmpty(req.Header["Authorization"]) } @@ -114,7 +114,7 @@ func TestCheckRequest(t *testing.T) { strings.NewReader("I am body."), ) asserts.NoError(err) - req.Header["X-Policy"] = []string{"I am Policy"} + req.Header["X-Cr-Policy"] = []string{"I am Policy"} req = SignRequest(General, req, 0) err = CheckRequest(General, req) asserts.NoError(err) diff --git a/pkg/conf/defaults.go b/pkg/conf/defaults.go index cbc0e07..d930c97 100644 --- a/pkg/conf/defaults.go +++ b/pkg/conf/defaults.go @@ -44,7 +44,7 @@ var CaptchaConfig = &captcha{ var CORSConfig = &cors{ AllowOrigins: []string{"UNSET"}, AllowMethods: []string{"PUT", "POST", "GET", "OPTIONS"}, - AllowHeaders: []string{"Cookie", "X-Policy", "Authorization", "Content-Length", "Content-Type", "X-Path", "X-FileName"}, + AllowHeaders: []string{"Cookie", "X-Cr-Policy", "Authorization", "Content-Length", "Content-Type", "X-Path", "X-FileName"}, AllowCredentials: false, ExposeHeaders: nil, } diff --git a/pkg/filesystem/driver/remote/handler.go b/pkg/filesystem/driver/remote/handler.go index 536ceb4..7fcad52 100644 --- a/pkg/filesystem/driver/remote/handler.go +++ b/pkg/filesystem/driver/remote/handler.go @@ -167,9 +167,9 @@ func (handler Driver) Put(ctx context.Context, file io.ReadCloser, dst string, s handler.Policy.GetUploadURL(), file, request.WithHeader(map[string][]string{ - "X-Policy": {credential.Policy}, - "X-FileName": {fileName}, - "X-Overwrite": {overwrite}, + "X-Cr-Policy": {credential.Policy}, + "X-Cr-FileName": {fileName}, + "X-Cr-Overwrite": {overwrite}, }), request.WithContentLength(int64(size)), request.WithTimeout(time.Duration(0)), @@ -332,8 +332,8 @@ func (handler Driver) getUploadCredential(ctx context.Context, policy serializer // 签名上传策略 uploadRequest, _ := http.NewRequest("POST", "/api/v3/slave/upload", nil) uploadRequest.Header = map[string][]string{ - "X-Policy": {policyEncoded}, - "X-Overwrite": {"false"}, + "X-Cr-Policy": {policyEncoded}, + "X-Cr-Overwrite": {"false"}, } auth.SignRequest(handler.AuthInstance, uploadRequest, TTL) diff --git a/pkg/request/request.go b/pkg/request/request.go index c543c2f..94a088d 100644 --- a/pkg/request/request.go +++ b/pkg/request/request.go @@ -97,13 +97,13 @@ func (c HTTPClient) Request(method, target string, body io.Reader, opts ...Optio } if options.masterMeta && conf.SystemConfig.Mode == "master" { - req.Header.Add("X-Site-Url", model.GetSiteURL().String()) - req.Header.Add("X-Site-Id", model.GetSettingByName("siteID")) - req.Header.Add("X-Cloudreve-Version", conf.BackendVersion) + req.Header.Add("X-Cr-Site-Url", model.GetSiteURL().String()) + req.Header.Add("X-Cr-Site-Id", model.GetSettingByName("siteID")) + req.Header.Add("X-Cr-Cloudreve-Version", conf.BackendVersion) } if options.slaveNodeID != "" && conf.SystemConfig.Mode == "slave" { - req.Header.Add("X-Node-Id", options.slaveNodeID) + req.Header.Add("X-Cr-Node-Id", options.slaveNodeID) } if options.contentLength != -1 { diff --git a/routers/controllers/file.go b/routers/controllers/file.go index 21cda34..a3bf7cc 100644 --- a/routers/controllers/file.go +++ b/routers/controllers/file.go @@ -308,8 +308,8 @@ func FileUploadStream(c *gin.Context) { } // 解码文件名和路径 - fileName, err := url.QueryUnescape(c.Request.Header.Get("X-FileName")) - filePath, err := url.QueryUnescape(c.Request.Header.Get("X-Path")) + fileName, err := url.QueryUnescape(c.Request.Header.Get("X-Cr-FileName")) + filePath, err := url.QueryUnescape(c.Request.Header.Get("X-Cr-Path")) if err != nil { c.JSON(200, ErrorResponse(err)) return diff --git a/routers/controllers/slave.go b/routers/controllers/slave.go index 10c46ff..2748582 100644 --- a/routers/controllers/slave.go +++ b/routers/controllers/slave.go @@ -32,7 +32,7 @@ func SlaveUpload(c *gin.Context) { fs.Handler = local.Driver{} // 从请求中取得上传策略 - uploadPolicyRaw := c.GetHeader("X-Policy") + uploadPolicyRaw := c.GetHeader("X-Cr-Policy") if uploadPolicyRaw == "" { c.JSON(200, serializer.ParamErr("未指定上传策略", nil)) return @@ -54,7 +54,7 @@ func SlaveUpload(c *gin.Context) { } // 解码文件名和路径 - fileName, err := url.QueryUnescape(c.Request.Header.Get("X-FileName")) + fileName, err := url.QueryUnescape(c.Request.Header.Get("X-Cr-FileName")) if err != nil { c.JSON(200, ErrorResponse(err)) return @@ -74,7 +74,7 @@ func SlaveUpload(c *gin.Context) { fs.Use("AfterValidateFailed", filesystem.HookDeleteTempFile) // 是否允许覆盖 - if c.Request.Header.Get("X-Overwrite") == "false" { + if c.Request.Header.Get("X-Cr-Overwrite") == "false" { ctx = context.WithValue(ctx, fsctx.DisableOverwrite, true) } diff --git a/routers/file_router_test.go b/routers/file_router_test.go index 50104b7..41ff072 100644 --- a/routers/file_router_test.go +++ b/routers/file_router_test.go @@ -73,7 +73,7 @@ func TestLocalFileUpload(t *testing.T) { strings.NewReader("2333"), ) req.Header.Add("Content-Length", "4") - req.Header.Add("X-FileName", "大地的%sfsf") + req.Header.Add("X-Cr-FileName", "大地的%sfsf") return req }, ExpectCode: 40002, @@ -87,8 +87,8 @@ func TestLocalFileUpload(t *testing.T) { strings.NewReader("2333"), ) req.Header.Add("Content-Length", "4") - req.Header.Add("X-FileName", "TestFileUploadRoute.txt") - req.Header.Add("X-Path", "/") + req.Header.Add("X-Cr-FileName", "TestFileUploadRoute.txt") + req.Header.Add("X-Cr-Path", "/") return req }, ExpectCode: 0,