Enable overwrite for non-first chunk uploading request

pkg/filesystem/driver/remote/client.go

@@ -20,7 +20,9 @@ const (
 
 // Client to operate remote slave server
 type Client interface {
+	// CreateUploadSession creates remote upload session
 	CreateUploadSession(ctx context.Context, session *serializer.UploadSession, ttl int64) error
+	// GetUploadURL signs an url for uploading file
 	GetUploadURL(ttl int64, sessionID string) (string, string, error)
 }
 

pkg/filesystem/driver/remote/handler.go

@@ -323,7 +323,12 @@ func (handler Driver) Source(
 
 // Token 获取上传策略和认证Token
 func (handler Driver) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession, file fsctx.FileHeader) (*serializer.UploadCredential, error) {
+	siteURL := model.GetSiteURL()
+	apiBaseURI, _ := url.Parse(path.Join("/api/v3/callback/remote" + uploadSession.Key + uploadSession.CallbackSecret))
+	apiURL := siteURL.ResolveReference(apiBaseURI)
+
 	// 在从机端创建上传会话
+	uploadSession.Callback = apiURL.String()
 	if err := handler.client.CreateUploadSession(ctx, uploadSession, ttl); err != nil {
 		return nil, err
 	}
@@ -331,7 +336,7 @@ func (handler Driver) Token(ctx context.Context, ttl int64, uploadSession *seria
 	// 获取上传地址
 	uploadURL, sign, err := handler.client.GetUploadURL(ttl, uploadSession.Key)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to sign upload url: %w", err)
 	}
 
 	return &serializer.UploadCredential{

pkg/filesystem/hooks.go

@@ -2,13 +2,12 @@ package filesystem
 
 import (
 	"context"
-	"errors"
 	model "github.com/cloudreve/Cloudreve/v3/models"
 	"github.com/cloudreve/Cloudreve/v3/pkg/cache"
+	"github.com/cloudreve/Cloudreve/v3/pkg/cluster"
 	"github.com/cloudreve/Cloudreve/v3/pkg/conf"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/driver/local"
 	"github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx"
-	"github.com/cloudreve/Cloudreve/v3/pkg/request"
 	"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
 	"github.com/cloudreve/Cloudreve/v3/pkg/util"
 	"io/ioutil"
@@ -178,30 +177,30 @@ func GenericAfterUpdate(ctx context.Context, fs *FileSystem, newFile fsctx.FileH
 }
 
 // SlaveAfterUpload Slave模式下上传完成钩子
-func SlaveAfterUpload(ctx context.Context, fs *FileSystem, fileHeader fsctx.FileHeader) error {
-	return errors.New("")
-	policy := ctx.Value(fsctx.UploadPolicyCtx).(serializer.UploadPolicy)
-	fileInfo := fileHeader.Info()
+func SlaveAfterUpload(session *serializer.UploadSession) Hook {
+	return func(ctx context.Context, fs *FileSystem, fileHeader fsctx.FileHeader) error {
+		fileInfo := fileHeader.Info()
 
-	// 构造一个model.File，用于生成缩略图
-	file := model.File{
-		Name:       fileInfo.FileName,
-		SourceName: fileInfo.SavePath,
-	}
-	fs.GenerateThumbnail(ctx, &file)
+		// 构造一个model.File，用于生成缩略图
+		file := model.File{
+			Name:       fileInfo.FileName,
+			SourceName: fileInfo.SavePath,
+		}
+		fs.GenerateThumbnail(ctx, &file)
 
-	if policy.CallbackURL == "" {
-		return nil
-	}
+		if session.Callback == "" {
+			return nil
+		}
 
-	// 发送回调请求
-	callbackBody := serializer.UploadCallback{
-		Name:       file.Name,
-		SourceName: file.SourceName,
-		PicInfo:    file.PicInfo,
-		Size:       fileInfo.Size,
+		// 发送回调请求
+		callbackBody := serializer.UploadCallback{
+			SourceName: file.SourceName,
+			PicInfo:    file.PicInfo,
+			Size:       fileInfo.Size,
+		}
+
+		return cluster.RemoteCallback(session.Callback, callbackBody)
 	}
-	return request.RemoteCallback(policy.CallbackURL, callbackBody)
 }
 
 // GenericAfterUpload 文件上传完成后，包含数据库操作

pkg/filesystem/upload.go

@@ -182,14 +182,15 @@ func (fs *FileSystem) CreateUploadSession(ctx context.Context, file *fsctx.FileS
 	}
 
 	uploadSession := &serializer.UploadSession{
-		Key:          callbackKey,
-		UID:          fs.User.ID,
-		Policy:       *fs.Policy,
-		VirtualPath:  file.VirtualPath,
-		Name:         file.Name,
-		Size:         fileSize,
-		SavePath:     file.SavePath,
-		LastModified: file.LastModified,
+		Key:            callbackKey,
+		UID:            fs.User.ID,
+		Policy:         *fs.Policy,
+		VirtualPath:    file.VirtualPath,
+		Name:           file.Name,
+		Size:           fileSize,
+		SavePath:       file.SavePath,
+		LastModified:   file.LastModified,
+		CallbackSecret: util.RandStringRunes(32),
 	}
 
 	// 获取上传凭证