Feat: disable overwrite for non-updating put request, only works under local,slave,OneDrive,OSS policy. (#764)

pkg/filesystem/driver/local/handler.go

@@ -100,6 +100,14 @@ func (handler Driver) Put(ctx context.Context, file io.ReadCloser, dst string, s
 	defer file.Close()
 	dst = util.RelativePath(filepath.FromSlash(dst))
 
+	// 如果禁止了 Overwrite，则检查是否有重名冲突
+	if ctx.Value(fsctx.DisableOverwrite) != nil {
+		if util.Exists(dst) {
+			util.Log().Warning("物理同名文件已存在或不可用: %s", dst)
+			return errors.New("物理同名文件已存在或不可用")
+		}
+	}
+
 	// 如果目标目录不存在，创建
 	basePath := filepath.Dir(dst)
 	if !util.Exists(basePath) {

pkg/filesystem/driver/local/handler_test.go

@@ -21,7 +21,8 @@ import (
 func TestHandler_Put(t *testing.T) {
 	asserts := assert.New(t)
 	handler := Driver{}
-	ctx := context.Background()
+	ctx := context.WithValue(context.Background(), fsctx.DisableOverwrite, true)
+	os.Remove(util.RelativePath("test/test/txt"))
 
 	testCases := []struct {
 		file io.ReadCloser
@@ -33,6 +34,11 @@ func TestHandler_Put(t *testing.T) {
 			dst:  "test/test/txt",
 			err:  false,
 		},
+		{
+			file: ioutil.NopCloser(strings.NewReader("test input file")),
+			dst:  "test/test/txt",
+			err:  true,
+		},
 		{
 			file: ioutil.NopCloser(strings.NewReader("test input file")),
 			dst:  "/notexist:/S.TXT",

pkg/filesystem/driver/oss/handler.go

@@ -235,8 +235,15 @@ func (handler Driver) Put(ctx context.Context, file io.ReadCloser, dst string, s
 	// 凭证有效期
 	credentialTTL := model.GetIntSetting("upload_credential_timeout", 3600)
 
+	// 是否允许覆盖
+	overwrite := true
+	if ctx.Value(fsctx.DisableOverwrite) != nil {
+		overwrite = false
+	}
+
 	options := []oss.Option{
 		oss.Expires(time.Now().Add(time.Duration(credentialTTL) * time.Second)),
+		oss.ForbidOverWrite(!overwrite),
 	}
 
 	// 上传文件

pkg/filesystem/driver/oss/handler_test.go

@@ -265,10 +265,11 @@ func TestDriver_Put(t *testing.T) {
 		},
 	}
 	cache.Set("setting_upload_credential_timeout", "3600", 0)
+	ctx := context.WithValue(context.Background(), fsctx.DisableOverwrite, true)
 
 	// 失败
 	{
-		err := handler.Put(context.Background(), ioutil.NopCloser(strings.NewReader("123")), "/123.txt", 3)
+		err := handler.Put(ctx, ioutil.NopCloser(strings.NewReader("123")), "/123.txt", 3)
 		asserts.Error(err)
 	}
 }

pkg/filesystem/driver/remote/handler.go

@@ -155,6 +155,13 @@ func (handler Driver) Put(ctx context.Context, file io.ReadCloser, dst string, s
 	if err != nil {
 		return err
 	}
+
+	// 决定是否要禁用文件覆盖
+	overwrite := "true"
+	if ctx.Value(fsctx.DisableOverwrite) != nil {
+		overwrite = "false"
+	}
+
 	// 上传文件
 	resp, err := handler.Client.Request(
 		"POST",
@@ -164,6 +171,7 @@ func (handler Driver) Put(ctx context.Context, file io.ReadCloser, dst string, s
 			"Authorization": {credential.Token},
 			"X-Policy":      {credential.Policy},
 			"X-FileName":    {fileName},
+			"X-Overwrite":   {overwrite},
 		}),
 		request.WithContentLength(int64(size)),
 		request.WithTimeout(time.Duration(0)),
@@ -321,7 +329,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-Policy":    {policyEncoded},
+		"X-Overwrite": {"false"},
 	}
 	auth.SignRequest(handler.AuthInstance, uploadRequest, TTL)
 

pkg/filesystem/driver/remote/handler_test.go

@@ -34,7 +34,7 @@ func TestHandler_Token(t *testing.T) {
 		},
 		AuthInstance: auth.HMACAuth{},
 	}
-	ctx := context.Background()
+	ctx := context.WithValue(context.Background(), fsctx.DisableOverwrite, true)
 	auth.General = auth.HMACAuth{SecretKey: []byte("test")}
 
 	// 成功
@@ -49,6 +49,7 @@ func TestHandler_Token(t *testing.T) {
 		asserts.Equal(true, policy.AutoRename)
 		asserts.Equal("dir", policy.SavePath)
 		asserts.Equal("file", policy.FileName)
+		asserts.Equal("file", policy.FileName)
 		asserts.Equal([]string{"txt"}, policy.AllowedExtension)
 	}