From 534e127f8755e833b609f65602f450dc3b01f90c Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Wed, 15 Jan 2020 11:03:26 +0800 Subject: [PATCH] Test: qiniu handler get token --- middleware/auth_test.go | 82 ++++++++++++++++++++++++++++ models/policy_test.go | 8 +++ pkg/filesystem/qiniu/file.go | 38 ------------- pkg/filesystem/qiniu/handler_test.go | 42 ++++++++++++++ pkg/filesystem/qiniu/handller.go | 61 +++++++++++---------- 5 files changed, 164 insertions(+), 67 deletions(-) delete mode 100644 pkg/filesystem/qiniu/file.go create mode 100644 pkg/filesystem/qiniu/handler_test.go diff --git a/middleware/auth_test.go b/middleware/auth_test.go index 5361ea6..67fb250 100644 --- a/middleware/auth_test.go +++ b/middleware/auth_test.go @@ -10,6 +10,7 @@ import ( "github.com/HFO4/cloudreve/pkg/util" "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" + "github.com/qiniu/api.v7/v7/auth/qbox" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" @@ -342,3 +343,84 @@ func TestRemoteCallbackAuth(t *testing.T) { asserts.True(c.IsAborted()) } } + +func TestQiniuCallbackAuth(t *testing.T) { + asserts := assert.New(t) + rec := httptest.NewRecorder() + AuthFunc := QiniuCallbackAuth() + + // Callback Key 相关验证失败 + { + c, _ := gin.CreateTestContext(rec) + c.Params = []gin.Param{ + {"key", "testQiniuBackRemote"}, + } + c.Request, _ = http.NewRequest("POST", "/api/v3/callback/remote/testQiniuBackRemote", nil) + AuthFunc(c) + asserts.True(c.IsAborted()) + } + + // 成功 + { + cache.Set( + "callback_testCallBackQiniu", + serializer.UploadSession{ + UID: 1, + PolicyID: 2, + VirtualPath: "/", + }, + 0, + ) + cache.Deletes([]string{"1"}, "policy_") + mock.ExpectQuery("SELECT(.+)users(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "group_id"}).AddRow(1, 1)) + mock.ExpectQuery("SELECT(.+)groups(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "policies"}).AddRow(1, "[2]")) + mock.ExpectQuery("SELECT(.+)policies(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "access_key", "secret_key"}).AddRow(2, "123", "123")) + c, _ := gin.CreateTestContext(rec) + c.Params = []gin.Param{ + {"key", "testCallBackQiniu"}, + } + c.Request, _ = http.NewRequest("POST", "/api/v3/callback/qiniu/testCallBackQiniu", nil) + mac := qbox.NewMac("123", "123") + token, err := mac.SignRequest(c.Request) + asserts.NoError(err) + c.Request.Header["Authorization"] = []string{"QBox " + token} + AuthFunc(c) + asserts.NoError(mock.ExpectationsWereMet()) + asserts.False(c.IsAborted()) + } + + // 验证失败 + { + cache.Set( + "callback_testCallBackQiniu", + serializer.UploadSession{ + UID: 1, + PolicyID: 2, + VirtualPath: "/", + }, + 0, + ) + cache.Deletes([]string{"1"}, "policy_") + mock.ExpectQuery("SELECT(.+)users(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "group_id"}).AddRow(1, 1)) + mock.ExpectQuery("SELECT(.+)groups(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "policies"}).AddRow(1, "[2]")) + mock.ExpectQuery("SELECT(.+)policies(.+)"). + WillReturnRows(sqlmock.NewRows([]string{"id", "access_key", "secret_key"}).AddRow(2, "123", "123")) + c, _ := gin.CreateTestContext(rec) + c.Params = []gin.Param{ + {"key", "testCallBackQiniu"}, + } + c.Request, _ = http.NewRequest("POST", "/api/v3/callback/qiniu/testCallBackQiniu", nil) + mac := qbox.NewMac("123", "123") + token, err := mac.SignRequest(c.Request) + asserts.NoError(err) + c.Request.Header["Authorization"] = []string{"QBox " + token + " "} + AuthFunc(c) + asserts.NoError(mock.ExpectationsWereMet()) + asserts.True(c.IsAborted()) + } +} diff --git a/models/policy_test.go b/models/policy_test.go index 7717bb4..7fab980 100644 --- a/models/policy_test.go +++ b/models/policy_test.go @@ -164,3 +164,11 @@ func TestPolicy_GetUploadURL(t *testing.T) { } } + +func TestPolicy_IsPathGenerateNeeded(t *testing.T) { + asserts := assert.New(t) + policy := Policy{Type: "qiniu"} + asserts.True(policy.IsPathGenerateNeeded()) + policy.Type = "remote" + asserts.False(policy.IsPathGenerateNeeded()) +} diff --git a/pkg/filesystem/qiniu/file.go b/pkg/filesystem/qiniu/file.go deleted file mode 100644 index b97ad3c..0000000 --- a/pkg/filesystem/qiniu/file.go +++ /dev/null @@ -1,38 +0,0 @@ -package qiniu - -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 -} diff --git a/pkg/filesystem/qiniu/handler_test.go b/pkg/filesystem/qiniu/handler_test.go new file mode 100644 index 0000000..f80a1e3 --- /dev/null +++ b/pkg/filesystem/qiniu/handler_test.go @@ -0,0 +1,42 @@ +package qiniu + +import ( + "context" + model "github.com/HFO4/cloudreve/models" + "github.com/HFO4/cloudreve/pkg/cache" + "github.com/HFO4/cloudreve/pkg/filesystem/fsctx" + "github.com/stretchr/testify/assert" + "testing" +) + +func TestHandler_Token(t *testing.T) { + asserts := assert.New(t) + handler := Handler{ + Policy: &model.Policy{ + MaxSize: 10, + OptionsSerialized: model.PolicyOption{ + MimeType: "ss", + }, + AccessKey: "ak", + SecretKey: "sk", + Server: "http://test.com", + }, + } + ctx := context.Background() + + // 成功 + { + cache.Set("setting_siteURL", "http://test.cloudreve.org", 0) + ctx = context.WithValue(ctx, fsctx.SavePathCtx, "/123") + _, err := handler.Token(ctx, 10, "123") + asserts.NoError(err) + } + + // 上下文无存储路径 + { + ctx = context.Background() + cache.Set("setting_siteURL", "http://test.cloudreve.org", 0) + _, err := handler.Token(ctx, 10, "123") + asserts.Error(err) + } +} diff --git a/pkg/filesystem/qiniu/handller.go b/pkg/filesystem/qiniu/handller.go index 93cc4e8..cd717e0 100644 --- a/pkg/filesystem/qiniu/handller.go +++ b/pkg/filesystem/qiniu/handller.go @@ -3,12 +3,10 @@ package qiniu import ( "context" "errors" - "fmt" 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" @@ -28,31 +26,31 @@ func (handler Handler) Get(ctx context.Context, path string) (response.RSCloser, // 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 + //// 凭证生成 + //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 删除一个或多个文件， @@ -94,7 +92,6 @@ func (handler Handler) Token(ctx context.Context, TTL int64, key string) (serial // 创建上传策略 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", @@ -107,8 +104,14 @@ func (handler Handler) Token(ctx context.Context, TTL int64, key string) (serial putPolicy.MimeLimit = handler.Policy.OptionsSerialized.MimeType } + return handler.getUploadCredential(ctx, putPolicy, TTL) +} + +// getUploadCredential 签名上传策略 +func (handler Handler) getUploadCredential(ctx context.Context, policy storage.PutPolicy, TTL int64) (serializer.UploadCredential, error) { + policy.Expires = uint64(TTL) mac := qbox.NewMac(handler.Policy.AccessKey, handler.Policy.SecretKey) - upToken := putPolicy.UploadToken(mac) + upToken := policy.UploadToken(mac) return serializer.UploadCredential{ Token: upToken, -- GitLab