Feat: qiniu upload & callback

pkg/filesystem/filesystem.go

@@ -6,6 +6,7 @@ import (
 	"github.com/HFO4/cloudreve/pkg/auth"
 	"github.com/HFO4/cloudreve/pkg/conf"
 	"github.com/HFO4/cloudreve/pkg/filesystem/local"
+	"github.com/HFO4/cloudreve/pkg/filesystem/qiniu"
 	"github.com/HFO4/cloudreve/pkg/filesystem/remote"
 	"github.com/HFO4/cloudreve/pkg/filesystem/response"
 	"github.com/HFO4/cloudreve/pkg/request"
@@ -159,6 +160,11 @@ func (fs *FileSystem) dispatchHandler() error {
 			AuthInstance: auth.HMACAuth{[]byte(currentPolicy.SecretKey)},
 		}
 		return nil
+	case "qiniu":
+		fs.Handler = qiniu.Handler{
+			Policy: currentPolicy,
+		}
+		return nil
 	default:
 		return ErrUnknownPolicyType
 	}

pkg/filesystem/hooks.go

@@ -224,7 +224,7 @@ func SlaveAfterUpload(ctx context.Context, fs *FileSystem) error {
 	}
 
 	// 发送回调请求
-	callbackBody := serializer.RemoteUploadCallback{
+	callbackBody := serializer.UploadCallback{
 		Name:       file.Name,
 		SourceName: file.SourceName,
 		PicInfo:    file.PicInfo,

pkg/filesystem/qiniu/handller.go

@@ -2,20 +2,32 @@ package qiniu
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"github.com/HFO4/cloudreve/pkg/util"
-	"io"
-	"os"
-
+	model "github.com/HFO4/cloudreve/models"
+	"github.com/HFO4/cloudreve/pkg/filesystem/fsctx"
+	"github.com/HFO4/cloudreve/pkg/filesystem/response"
+	"github.com/HFO4/cloudreve/pkg/serializer"
 	"github.com/qiniu/api.v7/v7/auth"
+	"github.com/qiniu/api.v7/v7/auth/qbox"
 	"github.com/qiniu/api.v7/v7/storage"
+	"io"
+	"net/url"
 )
 
 // Handler 本地策略适配器
-type Handler struct{}
+type Handler struct {
+	Policy *model.Policy
+}
+
+// Get 获取文件
+func (handler Handler) Get(ctx context.Context, path string) (response.RSCloser, error) {
+	return nil, errors.New("未实现")
+}
 
 // Put 将文件流保存到指定目录
 func (handler Handler) Put(ctx context.Context, file io.ReadCloser, dst string, size uint64) error {
+	return errors.New("未实现")
 	// 凭证生成
 	putPolicy := storage.PutPolicy{
 		Scope: "cloudrevetest",
@@ -44,20 +56,61 @@ func (handler Handler) Put(ctx context.Context, file io.ReadCloser, dst string,
 }
 
 // Delete 删除一个或多个文件，
-// 返回已删除的文件，及遇到的最后一个错误
+// 返回未删除的文件，及遇到的最后一个错误
 func (handler Handler) Delete(ctx context.Context, files []string) ([]string, error) {
-	deleted := make([]string, 0, len(files))
-	var retErr error
+	return []string{}, errors.New("未实现")
+}
 
-	for _, value := range files {
-		err := os.Remove(value)
-		if err == nil {
-			deleted = append(deleted, value)
-		} else {
-			util.Log().Warning("无法删除文件，%s", err)
-			retErr = err
-		}
+// Thumb 获取文件缩略图
+func (handler Handler) Thumb(ctx context.Context, path string) (*response.ContentResponse, error) {
+	return nil, errors.New("未实现")
+}
+
+// Source 获取外链URL
+func (handler Handler) Source(
+	ctx context.Context,
+	path string,
+	baseURL url.URL,
+	ttl int64,
+	isDownload bool,
+	speed int,
+) (string, error) {
+	return "", errors.New("未实现")
+}
+
+// Token 获取上传策略和认证Token
+func (handler Handler) Token(ctx context.Context, TTL int64, key string) (serializer.UploadCredential, error) {
+	// 生成回调地址
+	siteURL := model.GetSiteURL()
+	apiBaseURI, _ := url.Parse("/api/v3/callback/qiniu/" + key)
+	apiURL := siteURL.ResolveReference(apiBaseURI)
+
+	// 读取上下文中生成的存储路径
+	savePath, ok := ctx.Value(fsctx.SavePathCtx).(string)
+	if !ok {
+		return serializer.UploadCredential{}, errors.New("无法获取存储路径")
 	}
 
-	return deleted, retErr
+	// 创建上传策略
+	putPolicy := storage.PutPolicy{
+		Scope:            handler.Policy.BucketName,
+		Expires:          uint64(TTL),
+		CallbackURL:      apiURL.String(),
+		CallbackBody:     `{"name":"$(fname)","source_name":"$(key)","size":$(fsize),"pic_info":"$(imageInfo.width),$(imageInfo.height)"}`,
+		CallbackBodyType: "application/json",
+		SaveKey:          savePath,
+		ForceSaveKey:     true,
+		FsizeLimit:       int64(handler.Policy.MaxSize),
+	}
+	// 是否开启了MIMEType限制
+	if handler.Policy.OptionsSerialized.MimeType != "" {
+		putPolicy.MimeLimit = handler.Policy.OptionsSerialized.MimeType
+	}
+
+	mac := qbox.NewMac(handler.Policy.AccessKey, handler.Policy.SecretKey)
+	upToken := putPolicy.UploadToken(mac)
+
+	return serializer.UploadCredential{
+		Token: upToken,
+	}, nil
 }

pkg/filesystem/template/file.go

@@ -0,0 +1,38 @@
+package template
+
+import (
+	"io"
+)
+
+// FileStream 用户传来的文件
+type FileStream struct {
+	File        io.ReadCloser
+	Size        uint64
+	VirtualPath string
+	Name        string
+	MIMEType    string
+}
+
+func (file FileStream) Read(p []byte) (n int, err error) {
+	return file.File.Read(p)
+}
+
+func (file FileStream) GetMIMEType() string {
+	return file.MIMEType
+}
+
+func (file FileStream) GetSize() uint64 {
+	return file.Size
+}
+
+func (file FileStream) Close() error {
+	return file.File.Close()
+}
+
+func (file FileStream) GetFileName() string {
+	return file.Name
+}
+
+func (file FileStream) GetVirtualPath() string {
+	return file.VirtualPath
+}

pkg/filesystem/template/handller.go

@@ -0,0 +1,82 @@
+package template
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	model "github.com/HFO4/cloudreve/models"
+	"github.com/HFO4/cloudreve/pkg/filesystem/response"
+	"github.com/HFO4/cloudreve/pkg/serializer"
+	"github.com/qiniu/api.v7/v7/auth"
+	"github.com/qiniu/api.v7/v7/storage"
+	"io"
+	"net/url"
+)
+
+// Handler 本地策略适配器
+type Handler struct {
+	Policy *model.Policy
+}
+
+// Get 获取文件
+func (handler Handler) Get(ctx context.Context, path string) (response.RSCloser, error) {
+	return nil, errors.New("未实现")
+}
+
+// Put 将文件流保存到指定目录
+func (handler Handler) Put(ctx context.Context, file io.ReadCloser, dst string, size uint64) error {
+	return errors.New("未实现")
+	// 凭证生成
+	putPolicy := storage.PutPolicy{
+		Scope: "cloudrevetest",
+	}
+	mac := auth.New("YNzTBBpDUq4EEiFV0-vyJCZCJ0LvUEI0_WvxtEXE", "Clm9d9M2CH7pZ8vm049ZlGZStQxrRQVRTjU_T5_0")
+	upToken := putPolicy.UploadToken(mac)
+
+	cfg := storage.Config{}
+	// 空间对应的机房
+	cfg.Zone = &storage.ZoneHuadong
+	formUploader := storage.NewFormUploader(&cfg)
+	ret := storage.PutRet{}
+	putExtra := storage.PutExtra{
+		Params: map[string]string{},
+	}
+
+	defer file.Close()
+
+	err := formUploader.Put(ctx, &ret, upToken, dst, file, int64(size), &putExtra)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	fmt.Println(ret.Key, ret.Hash)
+	return nil
+}
+
+// Delete 删除一个或多个文件，
+// 返回未删除的文件，及遇到的最后一个错误
+func (handler Handler) Delete(ctx context.Context, files []string) ([]string, error) {
+	return []string{}, errors.New("未实现")
+}
+
+// Thumb 获取文件缩略图
+func (handler Handler) Thumb(ctx context.Context, path string) (*response.ContentResponse, error) {
+	return nil, errors.New("未实现")
+}
+
+// Source 获取外链URL
+func (handler Handler) Source(
+	ctx context.Context,
+	path string,
+	baseURL url.URL,
+	ttl int64,
+	isDownload bool,
+	speed int,
+) (string, error) {
+	return "", errors.New("未实现")
+}
+
+// Token 获取上传策略和认证Token
+func (handler Handler) Token(ctx context.Context, TTL int64, key string) (serializer.UploadCredential, error) {
+	return serializer.UploadCredential{}, errors.New("未实现")
+}

pkg/filesystem/upload.go

@@ -5,6 +5,7 @@ import (
 	model "github.com/HFO4/cloudreve/models"
 	"github.com/HFO4/cloudreve/pkg/cache"
 	"github.com/HFO4/cloudreve/pkg/filesystem/fsctx"
+	"github.com/HFO4/cloudreve/pkg/filesystem/local"
 	"github.com/HFO4/cloudreve/pkg/serializer"
 	"github.com/HFO4/cloudreve/pkg/util"
 	"github.com/gin-gonic/gin"
@@ -146,6 +147,11 @@ func (fs *FileSystem) GetUploadToken(ctx context.Context, path string, size uint
 
 	var err error
 
+	// 是否需要预先生成存储路径
+	if fs.User.Policy.IsPathGenerateNeeded() {
+		ctx = context.WithValue(ctx, fsctx.SavePathCtx, fs.GenerateSavePath(ctx, local.FileStream{}))
+	}
+
 	// 获取上传凭证
 	callbackKey := util.RandStringRunes(32)
 	credential, err := fs.Handler.Token(ctx, int64(credentialTTL), callbackKey)

pkg/request/slave.go

@@ -11,9 +11,9 @@ import (
 )
 
 // RemoteCallback 发送远程存储策略上传回调请求
-func RemoteCallback(url string, body serializer.RemoteUploadCallback) error {
+func RemoteCallback(url string, body serializer.UploadCallback) error {
 	callbackBody, err := json.Marshal(struct {
-		Data serializer.RemoteUploadCallback `json:"data"`
+		Data serializer.UploadCallback `json:"data"`
 	}{
 		Data: body,
 	})

pkg/request/slave_test.go

@@ -34,7 +34,7 @@ func TestRemoteCallback(t *testing.T) {
 			},
 		})
 		GeneralClient = clientMock
-		resp := RemoteCallback("http://test/test/url", serializer.RemoteUploadCallback{
+		resp := RemoteCallback("http://test/test/url", serializer.UploadCallback{
 			SourceName: "source",
 		})
 		asserts.NoError(resp)
@@ -59,7 +59,7 @@ func TestRemoteCallback(t *testing.T) {
 			},
 		})
 		GeneralClient = clientMock
-		resp := RemoteCallback("http://test/test/url", serializer.RemoteUploadCallback{
+		resp := RemoteCallback("http://test/test/url", serializer.UploadCallback{
 			SourceName: "source",
 		})
 		asserts.EqualValues(401, resp.(serializer.AppError).Code)
@@ -83,7 +83,7 @@ func TestRemoteCallback(t *testing.T) {
 			},
 		})
 		GeneralClient = clientMock
-		resp := RemoteCallback("http://test/test/url", serializer.RemoteUploadCallback{
+		resp := RemoteCallback("http://test/test/url", serializer.UploadCallback{
 			SourceName: "source",
 		})
 		asserts.Error(resp)
@@ -107,7 +107,7 @@ func TestRemoteCallback(t *testing.T) {
 			},
 		})
 		GeneralClient = clientMock
-		resp := RemoteCallback("http://test/test/url", serializer.RemoteUploadCallback{
+		resp := RemoteCallback("http://test/test/url", serializer.UploadCallback{
 			SourceName: "source",
 		})
 		asserts.Error(resp)
@@ -127,7 +127,7 @@ func TestRemoteCallback(t *testing.T) {
 			Err: errors.New("error"),
 		})
 		GeneralClient = clientMock
-		resp := RemoteCallback("http://test/test/url", serializer.RemoteUploadCallback{
+		resp := RemoteCallback("http://test/test/url", serializer.UploadCallback{
 			SourceName: "source",
 		})
 		asserts.Error(resp)

pkg/serializer/upload.go

@@ -29,14 +29,19 @@ type UploadSession struct {
 	VirtualPath string
 }
 
-// RemoteUploadCallback 远程存储策略上传回调正文
-type RemoteUploadCallback struct {
+// UploadCallback 上传回调正文
+type UploadCallback struct {
 	Name       string `json:"name"`
 	SourceName string `json:"source_name"`
 	PicInfo    string `json:"pic_info"`
 	Size       uint64 `json:"size"`
 }
 
+// QiniuCallbackFailed 七牛存储策略上传回调失败响应
+type QiniuCallbackFailed struct {
+	Error string `json:"error"`
+}
+
 func init() {
 	gob.Register(UploadSession{})
 }