diff --git a/pkg/cluster/slave_test.go b/pkg/cluster/slave_test.go index 47f4bf2..1b1510f 100644 --- a/pkg/cluster/slave_test.go +++ b/pkg/cluster/slave_test.go @@ -451,7 +451,7 @@ func TestRemoteCallback(t *testing.T) { // 回调成功 { - clientMock := controllermock.RequestMock{} + clientMock := requestmock.RequestMock{} mockResp, _ := json.Marshal(serializer.Response{Code: 0}) clientMock.On( "Request", @@ -474,7 +474,7 @@ func TestRemoteCallback(t *testing.T) { // 服务端返回业务错误 { - clientMock := controllermock.RequestMock{} + clientMock := requestmock.RequestMock{} mockResp, _ := json.Marshal(serializer.Response{Code: 401}) clientMock.On( "Request", @@ -497,7 +497,7 @@ func TestRemoteCallback(t *testing.T) { // 无法解析回调响应 { - clientMock := controllermock.RequestMock{} + clientMock := requestmock.RequestMock{} clientMock.On( "Request", "POST", @@ -519,7 +519,7 @@ func TestRemoteCallback(t *testing.T) { // HTTP状态码非200 { - clientMock := controllermock.RequestMock{} + clientMock := requestmock.RequestMock{} clientMock.On( "Request", "POST", @@ -541,7 +541,7 @@ func TestRemoteCallback(t *testing.T) { // 无法发起回调 { - clientMock := controllermock.RequestMock{} + clientMock := requestmock.RequestMock{} clientMock.On( "Request", "POST", diff --git a/pkg/filesystem/archive_test.go b/pkg/filesystem/archive_test.go index 7a697ce..be65b29 100644 --- a/pkg/filesystem/archive_test.go +++ b/pkg/filesystem/archive_test.go @@ -3,6 +3,9 @@ package filesystem import ( "context" "errors" + "github.com/cloudreve/Cloudreve/v3/pkg/request" + "github.com/cloudreve/Cloudreve/v3/pkg/util" + testMock "github.com/stretchr/testify/mock" "io" "os" "strings" @@ -12,11 +15,8 @@ import ( model "github.com/cloudreve/Cloudreve/v3/models" "github.com/cloudreve/Cloudreve/v3/pkg/cache" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" - "github.com/cloudreve/Cloudreve/v3/pkg/request" - "github.com/cloudreve/Cloudreve/v3/pkg/util" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" - testMock "github.com/stretchr/testify/mock" ) func TestFileSystem_Compress(t *testing.T) { diff --git a/pkg/filesystem/driver/oss/callback_test.go b/pkg/filesystem/driver/oss/callback_test.go deleted file mode 100644 index 1d29341..0000000 --- a/pkg/filesystem/driver/oss/callback_test.go +++ /dev/null @@ -1,188 +0,0 @@ -package oss - -import ( - "io/ioutil" - "net/http" - "net/url" - "strings" - "testing" - - "github.com/cloudreve/Cloudreve/v3/pkg/cache" - "github.com/stretchr/testify/assert" -) - -func TestGetPublicKey(t *testing.T) { - asserts := assert.New(t) - testCases := []struct { - Request http.Request - ResNil bool - Error bool - }{ - // Header解码失败 - { - Request: http.Request{ - Header: http.Header{ - "X-Oss-Pub-Key-Url": {"中文"}, - }, - }, - ResNil: true, - Error: true, - }, - // 公钥URL无效 - { - Request: http.Request{ - Header: http.Header{ - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9wb3JuaHViLmNvbQ=="}, - }, - }, - ResNil: true, - Error: true, - }, - // 请求失败 - { - Request: http.Request{ - Header: http.Header{ - "X-Oss-Pub-Key-Url": {"aHR0cDovL2dvc3NwdWJsaWMuYWxpY2RuLmNvbS8yMzQyMzQ="}, - }, - }, - ResNil: true, - Error: true, - }, - // 成功 - { - Request: http.Request{ - Header: http.Header{ - "X-Oss-Pub-Key-Url": {"aHR0cDovL2dvc3NwdWJsaWMuYWxpY2RuLmNvbS9jYWxsYmFja19wdWJfa2V5X3YxLnBlbQ=="}, - }, - }, - ResNil: false, - Error: false, - }, - } - - for i, testCase := range testCases { - asserts.NoError(cache.Deletes([]string{"oss_public_key"}, "")) - res, err := GetPublicKey(&testCase.Request) - if testCase.Error { - asserts.Error(err, "Test Case #%d", i) - } else { - asserts.NoError(err, "Test Case #%d", i) - } - if testCase.ResNil { - asserts.Empty(res, "Test Case #%d", i) - } else { - asserts.NotEmpty(res, "Test Case #%d", i) - } - } - - // 测试缓存 - asserts.NoError(cache.Set("oss_public_key", []byte("123"), 0)) - res, err := GetPublicKey(nil) - asserts.NoError(err) - asserts.Equal([]byte("123"), res) -} - -func TestVerifyCallbackSignature(t *testing.T) { - asserts := assert.New(t) - testPubKey := `-----BEGIN PUBLIC KEY----- -MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKs/JBGzwUB2aVht4crBx3oIPBLNsjGs -C0fTXv+nvlmklvkcolvpvXLTjaxUHR3W9LXxQ2EHXAJfCB+6H2YF1k8CAwEAAQ== ------END PUBLIC KEY----- -` - - // 成功 - { - asserts.NoError(cache.Set("oss_public_key", []byte(testPubKey), 0)) - r := http.Request{ - URL: &url.URL{Path: "/api/v3/callback/oss/TnXx5E5VyfJUyM1UdkdDu1rtnJ34EbmH"}, - Header: map[string][]string{ - "Authorization": {"e5LwzwTkP9AFAItT4YzvdJOHd0Y0wqTMWhsV/h5SG90JYGAmMd+8LQyj96R+9qUfJWjMt6suuUh7LaOryR87Dw=="}, - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9nb3NzcHVibGljLmFsaWNkbi5jb20vY2FsbGJhY2tfcHViX2tleV92MS5wZW0="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.NoError(VerifyCallbackSignature(&r)) - } - - // 签名错误 - { - asserts.NoError(cache.Set("oss_public_key", []byte(testPubKey), 0)) - r := http.Request{ - URL: &url.URL{Path: "/api/v3/callback/oss/TnXx5E5VyfJUyM1UdkdDu1rtnJ34EbmH"}, - Header: map[string][]string{ - "Authorization": {"e3LwzwTkP9AFAItT4YzvdJOHd0Y0wqTMWhsV/h5SG90JYGAmMd+8LQyj96R+9qUfJWjMt6suuUh7LaOryR87Dw=="}, - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9nb3NzcHVibGljLmFsaWNkbi5jb20vY2FsbGJhY2tfcHViX2tleV92MS5wZW0="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.Error(VerifyCallbackSignature(&r)) - } - - // GetPubKey 失败 - { - asserts.NoError(cache.Deletes([]string{"oss_public_key"}, "")) - r := http.Request{ - URL: &url.URL{Path: "/api/v3/callback/oss/TnXx5E5VyfJUyM1UdkdDu1rtnJ34EbmH"}, - Header: map[string][]string{ - "Authorization": {"e5LwzwTkP9AFAItT4YzvdJOHd0Y0wqTMWhsV/h5SG90JYGAmMd+8LQyj96R+9qUfJWjMt6suuUh7LaOryR87Dw=="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.Error(VerifyCallbackSignature(&r)) - } - - // getRequestMD5 失败 - { - asserts.NoError(cache.Set("oss_public_key", []byte(testPubKey), 0)) - r := http.Request{ - URL: &url.URL{Path: "%测试"}, - Header: map[string][]string{ - "Authorization": {"e5LwzwTkP9AFAItT4YzvdJOHd0Y0wqTMWhsV/h5SG90JYGAmMd+8LQyj96R+9qUfJWjMt6suuUh7LaOryR87Dw=="}, - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9nb3NzcHVibGljLmFsaWNkbi5jb20vY2FsbGJhY2tfcHViX2tleV92MS5wZW0="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.Error(VerifyCallbackSignature(&r)) - } - - // 无 Authorization 头 - { - asserts.NoError(cache.Set("oss_public_key", []byte(testPubKey), 0)) - r := http.Request{ - URL: &url.URL{Path: "/api/v3/callback/oss/TnXx5E5VyfJUyM1UdkdDu1rtnJ34EbmH"}, - Header: map[string][]string{ - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9nb3NzcHVibGljLmFsaWNkbi5jb20vY2FsbGJhY2tfcHViX2tleV92MS5wZW0="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.Error(VerifyCallbackSignature(&r)) - } - - // pub block 不存在 - { - asserts.NoError(cache.Set("oss_public_key", []byte(""), 0)) - r := http.Request{ - URL: &url.URL{Path: "/api/v3/callback/oss/TnXx5E5VyfJUyM1UdkdDu1rtnJ34EbmH"}, - Header: map[string][]string{ - "Authorization": {"e5LwzwTkP9AFAItT4YzvdJOHd0Y0wqTMWhsV/h5SG90JYGAmMd+8LQyj96R+9qUfJWjMt6suuUh7LaOryR87Dw=="}, - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9nb3NzcHVibGljLmFsaWNkbi5jb20vY2FsbGJhY2tfcHViX2tleV92MS5wZW0="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.Error(VerifyCallbackSignature(&r)) - } - - // ParsePKIXPublicKey出错 - { - asserts.NoError(cache.Set("oss_public_key", []byte("-----BEGIN PUBLIC KEY-----\n-----END PUBLIC KEY-----"), 0)) - r := http.Request{ - URL: &url.URL{Path: "/api/v3/callback/oss/TnXx5E5VyfJUyM1UdkdDu1rtnJ34EbmH"}, - Header: map[string][]string{ - "Authorization": {"e5LwzwTkP9AFAItT4YzvdJOHd0Y0wqTMWhsV/h5SG90JYGAmMd+8LQyj96R+9qUfJWjMt6suuUh7LaOryR87Dw=="}, - "X-Oss-Pub-Key-Url": {"aHR0cHM6Ly9nb3NzcHVibGljLmFsaWNkbi5jb20vY2FsbGJhY2tfcHViX2tleV92MS5wZW0="}, - }, - Body: ioutil.NopCloser(strings.NewReader(`{"name":"2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","source_name":"1/1_hFRtDLgM_2f7b2ccf30e9270ea920f1ab8a4037a546a2f0d5.jpg","size":114020,"pic_info":"810,539"}`)), - } - asserts.Error(VerifyCallbackSignature(&r)) - } -} diff --git a/pkg/filesystem/driver/oss/handler_test.go b/pkg/filesystem/driver/oss/handler_test.go deleted file mode 100644 index d69c931..0000000 --- a/pkg/filesystem/driver/oss/handler_test.go +++ /dev/null @@ -1,354 +0,0 @@ -package oss - -import ( - "context" - "io" - "io/ioutil" - "net/http" - "net/url" - "strings" - "testing" - - model "github.com/cloudreve/Cloudreve/v3/models" - "github.com/cloudreve/Cloudreve/v3/pkg/cache" - "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" - "github.com/cloudreve/Cloudreve/v3/pkg/request" - "github.com/stretchr/testify/assert" - testMock "github.com/stretchr/testify/mock" -) - -func TestDriver_InitOSSClient(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "test.com", - }, - } - - // 成功 - { - asserts.NoError(handler.InitOSSClient(false)) - } - - // 使用内网Endpoint - { - handler.Policy.OptionsSerialized.ServerSideEndpoint = "endpoint2" - asserts.NoError(handler.InitOSSClient(false)) - } - - // 未指定存储策略 - { - handler := Driver{} - asserts.Error(handler.InitOSSClient(false)) - } -} - -func TestDriver_CORS(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "test.com", - }, - } - - // 失败 - { - asserts.NotPanics(func() { - handler.CORS() - }) - } -} - -func TestDriver_Token(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "test.com", - }, - } - - // 成功 - { - ctx := context.WithValue(context.Background(), fsctx.SavePathCtx, "/123") - cache.Set("setting_siteURL", "http://test.cloudreve.org", 0) - res, err := handler.Token(ctx, 10, "key", nil) - asserts.NoError(err) - asserts.NotEmpty(res.Policy) - asserts.NotEmpty(res.Token) - asserts.Equal(handler.Policy.AccessKey, res.AccessKey) - asserts.Equal("/123", res.Path) - } - - // 上下文错误 - { - ctx := context.Background() - _, err := handler.Token(ctx, 10, "key", nil) - asserts.Error(err) - } - -} - -func TestDriver_Source(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "test.com", - IsPrivate: true, - }, - } - - // 正常 非下载 无限速 - { - res, err := handler.Source(context.Background(), "/123", url.URL{}, 10, false, 0) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.NotEmpty(query.Get("Signature")) - asserts.NotEmpty(query.Get("Expires")) - asserts.Equal("ak", query.Get("OSSAccessKeyId")) - } - - // 限速 + 下载 - { - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, model.File{Name: "123.txt"}) - res, err := handler.Source(ctx, "/123", url.URL{}, 10, true, 102401) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.NotEmpty(query.Get("Signature")) - asserts.NotEmpty(query.Get("Expires")) - asserts.Equal("ak", query.Get("OSSAccessKeyId")) - asserts.EqualValues("819208", query.Get("x-oss-traffic-limit")) - asserts.NotEmpty(query.Get("response-content-disposition")) - } - - // 限速超出范围 + 下载 - { - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, model.File{Name: "123.txt"}) - res, err := handler.Source(ctx, "/123", url.URL{}, 10, true, 10) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.NotEmpty(query.Get("Signature")) - asserts.NotEmpty(query.Get("Expires")) - asserts.Equal("ak", query.Get("OSSAccessKeyId")) - asserts.EqualValues("819200", query.Get("x-oss-traffic-limit")) - asserts.NotEmpty(query.Get("response-content-disposition")) - } - - // 限速超出范围 + 下载 - { - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, model.File{Name: "123.txt"}) - res, err := handler.Source(ctx, "/123", url.URL{}, 10, true, 838860801) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.NotEmpty(query.Get("Signature")) - asserts.NotEmpty(query.Get("Expires")) - asserts.Equal("ak", query.Get("OSSAccessKeyId")) - asserts.EqualValues("838860800", query.Get("x-oss-traffic-limit")) - asserts.NotEmpty(query.Get("response-content-disposition")) - } - - // 公共空间 - { - handler.Policy.IsPrivate = false - res, err := handler.Source(context.Background(), "/123", url.URL{}, 10, false, 0) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.Empty(query.Get("Signature")) - } - - // 正常 指定了CDN域名 - { - handler.Policy.BaseURL = "https://cqu.edu.cn" - res, err := handler.Source(context.Background(), "/123", url.URL{}, 10, false, 0) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.Empty(query.Get("Signature")) - asserts.Contains(resURL.String(), handler.Policy.BaseURL) - } - - // 强制使用公网 Endpoint - { - handler.Policy.BaseURL = "" - handler.Policy.OptionsSerialized.ServerSideEndpoint = "endpoint.com" - res, err := handler.Source(context.WithValue(context.Background(), fsctx.ForceUsePublicEndpointCtx, false), "/123", url.URL{}, 10, false, 0) - asserts.NoError(err) - resURL, err := url.Parse(res) - asserts.NoError(err) - query := resURL.Query() - asserts.Empty(query.Get("Signature")) - asserts.Contains(resURL.String(), "endpoint.com") - } -} - -func TestDriver_Thumb(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "test.com", - }, - } - - // 上下文不存在 - { - ctx := context.Background() - res, err := handler.Thumb(ctx, "/123.txt") - asserts.Error(err) - asserts.Nil(res) - } - - // 成功 - { - cache.Set("setting_preview_timeout", "60", 0) - ctx := context.WithValue(context.Background(), fsctx.ThumbSizeCtx, [2]uint{10, 20}) - res, err := handler.Thumb(ctx, "/123.jpg") - asserts.NoError(err) - resURL, err := url.Parse(res.URL) - asserts.NoError(err) - urlQuery := resURL.Query() - asserts.Equal("image/resize,m_lfit,h_20,w_10", urlQuery.Get("x-oss-process")) - } -} - -func TestDriver_Delete(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "oss-cn-shanghai.aliyuncs.com", - }, - } - - // 失败 - { - res, err := handler.Delete(context.Background(), []string{"1", "2", "3"}) - asserts.Error(err) - asserts.Equal([]string{"1", "2", "3"}, res) - } -} - -func TestDriver_Put(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "oss-cn-shanghai.aliyuncs.com", - }, - } - cache.Set("setting_upload_credential_timeout", "3600", 0) - ctx := context.WithValue(context.Background(), fsctx.DisableOverwrite, true) - - // 失败 - { - err := handler.Put(ctx, ioutil.NopCloser(strings.NewReader("123")), "/123.txt", 3) - asserts.Error(err) - } -} - -type ClientMock struct { - testMock.Mock -} - -func (m ClientMock) Request(method, target string, body io.Reader, opts ...request.Option) *request.Response { - args := m.Called(method, target, body, opts) - return args.Get(0).(*request.Response) -} - -func TestDriver_Get(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "oss-cn-shanghai.aliyuncs.com", - }, - HTTPClient: request.NewClient(), - } - cache.Set("setting_preview_timeout", "3600", 0) - - // 响应失败 - { - res, err := handler.Get(context.Background(), "123.txt") - asserts.Error(err) - asserts.Nil(res) - } - - // 响应成功 - { - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, model.File{Size: 3}) - clientMock := ClientMock{} - clientMock.On( - "Request", - "GET", - testMock.Anything, - testMock.Anything, - testMock.Anything, - ).Return(&request.Response{ - Err: nil, - Response: &http.Response{ - StatusCode: 200, - Body: ioutil.NopCloser(strings.NewReader(`123`)), - }, - }) - handler.HTTPClient = clientMock - res, err := handler.Get(ctx, "123.txt") - clientMock.AssertExpectations(t) - asserts.NoError(err) - n, err := res.Seek(0, io.SeekEnd) - asserts.NoError(err) - asserts.EqualValues(3, n) - content, err := ioutil.ReadAll(res) - asserts.NoError(err) - asserts.Equal("123", string(content)) - } -} - -func TestDriver_List(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - AccessKey: "ak", - SecretKey: "sk", - BucketName: "test", - Server: "test.com", - IsPrivate: true, - }, - } - - // 连接失败 - { - res, err := handler.List(context.Background(), "/", true) - asserts.Error(err) - asserts.Empty(res) - } -} diff --git a/pkg/filesystem/driver/remote/client_test.go b/pkg/filesystem/driver/remote/client_test.go new file mode 100644 index 0000000..c195521 --- /dev/null +++ b/pkg/filesystem/driver/remote/client_test.go @@ -0,0 +1,262 @@ +package remote + +import ( + "context" + "errors" + model "github.com/cloudreve/Cloudreve/v3/models" + "github.com/cloudreve/Cloudreve/v3/pkg/cache" + "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" + "github.com/cloudreve/Cloudreve/v3/pkg/mocks/requestmock" + "github.com/cloudreve/Cloudreve/v3/pkg/request" + "github.com/stretchr/testify/assert" + testMock "github.com/stretchr/testify/mock" + "io/ioutil" + "net/http" + "strings" + "testing" +) + +func TestNewClient(t *testing.T) { + a := assert.New(t) + policy := &model.Policy{} + + // 无法解析服务端url + { + policy.Server = string([]byte{0x7f}) + c, err := NewClient(policy) + a.Error(err) + a.Nil(c) + } + + // 成功 + { + policy.Server = "" + c, err := NewClient(policy) + a.NoError(err) + a.NotNil(c) + } +} + +func TestRemoteClient_Upload(t *testing.T) { + a := assert.New(t) + c, _ := NewClient(&model.Policy{}) + + // 无法创建上传会话 + { + clientMock := requestmock.RequestMock{} + c.(*remoteClient).httpClient = &clientMock + clientMock.On( + "Request", + "PUT", + "upload", + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: errors.New("error"), + }) + err := c.Upload(context.Background(), &fsctx.FileStream{}) + a.Error(err) + a.Contains(err.Error(), "error") + clientMock.AssertExpectations(t) + } + + // 分片上传失败，成功删除上传会话 + { + cache.Set("setting_chunk_retries", "1", 0) + clientMock := requestmock.RequestMock{} + c.(*remoteClient).httpClient = &clientMock + clientMock.On( + "Request", + "PUT", + "upload", + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + clientMock.On( + "Request", + "POST", + testMock.Anything, + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: errors.New("error"), + }) + clientMock.On( + "Request", + "DELETE", + testMock.Anything, + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + err := c.Upload(context.Background(), &fsctx.FileStream{}) + a.Error(err) + a.Contains(err.Error(), "error") + clientMock.AssertExpectations(t) + } + + // 分片上传失败，无法删除上传会话 + { + cache.Set("setting_chunk_retries", "1", 0) + clientMock := requestmock.RequestMock{} + c.(*remoteClient).httpClient = &clientMock + clientMock.On( + "Request", + "PUT", + "upload", + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + clientMock.On( + "Request", + "POST", + testMock.Anything, + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: errors.New("error"), + }) + clientMock.On( + "Request", + "DELETE", + testMock.Anything, + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: errors.New("error2"), + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + err := c.Upload(context.Background(), &fsctx.FileStream{}) + a.Error(err) + a.Contains(err.Error(), "error") + clientMock.AssertExpectations(t) + } + + // 成功 + { + cache.Set("setting_chunk_retries", "1", 0) + clientMock := requestmock.RequestMock{} + c.(*remoteClient).httpClient = &clientMock + clientMock.On( + "Request", + "PUT", + "upload", + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + clientMock.On( + "Request", + "POST", + testMock.Anything, + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + err := c.Upload(context.Background(), &fsctx.FileStream{}) + a.NoError(err) + clientMock.AssertExpectations(t) + } +} + +func TestRemoteClient_CreateUploadSessionFailed(t *testing.T) { + a := assert.New(t) + c, _ := NewClient(&model.Policy{}) + + clientMock := requestmock.RequestMock{} + c.(*remoteClient).httpClient = &clientMock + clientMock.On( + "Request", + "PUT", + "upload", + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":500,"msg":"error"}`)), + }, + }) + err := c.Upload(context.Background(), &fsctx.FileStream{}) + a.Error(err) + a.Contains(err.Error(), "error") + clientMock.AssertExpectations(t) +} + +func TestRemoteClient_UploadChunkFailed(t *testing.T) { + a := assert.New(t) + c, _ := NewClient(&model.Policy{}) + + clientMock := requestmock.RequestMock{} + c.(*remoteClient).httpClient = &clientMock + clientMock.On( + "Request", + "POST", + testMock.Anything, + testMock.Anything, + testMock.Anything, + ).Return(&request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":500,"msg":"error"}`)), + }, + }) + err := c.(*remoteClient).uploadChunk(context.Background(), "", 0, strings.NewReader(""), false, 0) + a.Error(err) + a.Contains(err.Error(), "error") + clientMock.AssertExpectations(t) +} + +func TestRemoteClient_GetUploadURL(t *testing.T) { + a := assert.New(t) + c, _ := NewClient(&model.Policy{}) + + // url 解析失败 + { + c.(*remoteClient).policy.Server = string([]byte{0x7f}) + res, sign, err := c.GetUploadURL(0, "") + a.Error(err) + a.Empty(res) + a.Empty(sign) + } + + // 成功 + { + c.(*remoteClient).policy.Server = "" + res, sign, err := c.GetUploadURL(0, "") + a.NoError(err) + a.NotEmpty(res) + a.NotEmpty(sign) + } +} diff --git a/pkg/filesystem/driver/remote/handler_test.go b/pkg/filesystem/driver/remote/handler_test.go index 478b290..9320bf2 100644 --- a/pkg/filesystem/driver/remote/handler_test.go +++ b/pkg/filesystem/driver/remote/handler_test.go @@ -2,6 +2,9 @@ package remote import ( "context" + "errors" + "github.com/cloudreve/Cloudreve/v3/pkg/mocks/remoteclientmock" + "github.com/cloudreve/Cloudreve/v3/pkg/serializer" "io" "io/ioutil" "net/http" @@ -14,45 +17,26 @@ import ( "github.com/cloudreve/Cloudreve/v3/pkg/cache" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" "github.com/cloudreve/Cloudreve/v3/pkg/request" - "github.com/cloudreve/Cloudreve/v3/pkg/serializer" "github.com/stretchr/testify/assert" testMock "github.com/stretchr/testify/mock" ) -func TestHandler_Token(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - MaxSize: 10, - AutoRename: true, - DirNameRule: "dir", - FileNameRule: "file", - OptionsSerialized: model.PolicyOption{ - FileType: []string{"txt"}, - }, - Server: "http://test.com", - }, - AuthInstance: auth.HMACAuth{}, +func TestNewDriver(t *testing.T) { + a := assert.New(t) + + // remoteClient 初始化失败 + { + d, err := NewDriver(&model.Policy{Server: string([]byte{0x7f})}) + a.Error(err) + a.Nil(d) } - ctx := context.WithValue(context.Background(), fsctx.DisableOverwrite, true) - auth.General = auth.HMACAuth{SecretKey: []byte("test")} // 成功 { - cache.Set("setting_siteURL", "http://test.cloudreve.org", 0) - credential, err := handler.Token(ctx, 10, "123", nil) - asserts.NoError(err) - policy, err := serializer.DecodeUploadPolicy(credential.Policy) - asserts.NoError(err) - asserts.Equal("http://test.cloudreve.org/api/v3/callback/remote/123", policy.CallbackURL) - asserts.Equal(uint64(10), policy.MaxSize) - 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) + d, err := NewDriver(&model.Policy{}) + a.NoError(err) + a.NotNil(d) } - } func TestHandler_Source(t *testing.T) { @@ -369,6 +353,20 @@ func TestHandler_Get(t *testing.T) { } func TestHandler_Put(t *testing.T) { + a := assert.New(t) + handler, _ := NewDriver(&model.Policy{ + Type: "remote", + SecretKey: "test", + Server: "http://test.com", + }) + clientMock := &remoteclientmock.RemoteClientMock{} + handler.uploadClient = clientMock + clientMock.On("Upload", testMock.Anything, testMock.Anything).Return(errors.New("error")) + a.Error(handler.Put(context.Background(), &fsctx.FileStream{})) + clientMock.AssertExpectations(t) +} + +func TestHandler_Thumb(t *testing.T) { asserts := assert.New(t) handler := Driver{ Policy: &model.Policy{ @@ -379,92 +377,65 @@ func TestHandler_Put(t *testing.T) { AuthInstance: auth.HMACAuth{}, } ctx := context.Background() - asserts.NoError(cache.Set("setting_upload_credential_timeout", "3600", 0)) + asserts.NoError(cache.Set("setting_preview_timeout", "60", 0)) + resp, err := handler.Thumb(ctx, "/1.txt") + asserts.NoError(err) + asserts.True(resp.Redirect) +} - // 成功 +func TestHandler_Token(t *testing.T) { + a := assert.New(t) + handler, _ := NewDriver(&model.Policy{}) + + // 无法创建上传会话 { - ctx = context.WithValue(ctx, fsctx.UserCtx, model.User{}) - clientMock := ClientMock{} - clientMock.On( - "Request", - "POST", - "http://test.com/api/v3/slave/upload", - testMock.Anything, - testMock.Anything, - ).Return(&request.Response{ - Err: nil, - Response: &http.Response{ - StatusCode: 200, - Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), - }, - }) - handler.Client = clientMock - err := handler.Put(ctx, ioutil.NopCloser(strings.NewReader("test input file")), "/", 15) + clientMock := &remoteclientmock.RemoteClientMock{} + handler.uploadClient = clientMock + clientMock.On("CreateUploadSession", testMock.Anything, testMock.Anything, int64(10)).Return(errors.New("error")) + res, err := handler.Token(context.Background(), 10, &serializer.UploadSession{}, &fsctx.FileStream{}) + a.Error(err) + a.Contains(err.Error(), "error") + a.Nil(res) clientMock.AssertExpectations(t) - asserts.NoError(err) } - // 请求失败 + // 无法创建上传地址 { - ctx = context.WithValue(ctx, fsctx.UserCtx, model.User{}) - clientMock := ClientMock{} - clientMock.On( - "Request", - "POST", - "http://test.com/api/v3/slave/upload", - testMock.Anything, - testMock.Anything, - ).Return(&request.Response{ - Err: nil, - Response: &http.Response{ - StatusCode: 404, - Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), - }, - }) - handler.Client = clientMock - err := handler.Put(ctx, ioutil.NopCloser(strings.NewReader("test input file")), "/", 15) + clientMock := &remoteclientmock.RemoteClientMock{} + handler.uploadClient = clientMock + clientMock.On("CreateUploadSession", testMock.Anything, testMock.Anything, int64(10)).Return(nil) + clientMock.On("GetUploadURL", int64(10), "").Return("", "", errors.New("error")) + res, err := handler.Token(context.Background(), 10, &serializer.UploadSession{}, &fsctx.FileStream{}) + a.Error(err) + a.Contains(err.Error(), "error") + a.Nil(res) clientMock.AssertExpectations(t) - asserts.Error(err) } - // 返回错误 + // 成功 { - ctx = context.WithValue(ctx, fsctx.UserCtx, model.User{}) - clientMock := ClientMock{} - clientMock.On( - "Request", - "POST", - "http://test.com/api/v3/slave/upload", - testMock.Anything, - testMock.Anything, - ).Return(&request.Response{ - Err: nil, - Response: &http.Response{ - StatusCode: 200, - Body: ioutil.NopCloser(strings.NewReader(`{"code":1}`)), - }, - }) - handler.Client = clientMock - err := handler.Put(ctx, ioutil.NopCloser(strings.NewReader("test input file")), "/", 15) + clientMock := &remoteclientmock.RemoteClientMock{} + handler.uploadClient = clientMock + clientMock.On("CreateUploadSession", testMock.Anything, testMock.Anything, int64(10)).Return(nil) + clientMock.On("GetUploadURL", int64(10), "").Return("1", "2", nil) + res, err := handler.Token(context.Background(), 10, &serializer.UploadSession{}, &fsctx.FileStream{}) + a.NoError(err) + a.NotNil(res) + a.Equal("1", res.UploadURLs[0]) + a.Equal("2", res.Credential) clientMock.AssertExpectations(t) - asserts.Error(err) } - } -func TestHandler_Thumb(t *testing.T) { - asserts := assert.New(t) - handler := Driver{ - Policy: &model.Policy{ - Type: "remote", - SecretKey: "test", - Server: "http://test.com", - }, - AuthInstance: auth.HMACAuth{}, - } - ctx := context.Background() - asserts.NoError(cache.Set("setting_preview_timeout", "60", 0)) - resp, err := handler.Thumb(ctx, "/1.txt") - asserts.NoError(err) - asserts.True(resp.Redirect) +func TestDriver_CancelToken(t *testing.T) { + a := assert.New(t) + handler, _ := NewDriver(&model.Policy{}) + + clientMock := &remoteclientmock.RemoteClientMock{} + handler.uploadClient = clientMock + clientMock.On("DeleteUploadSession", testMock.Anything, "key").Return(errors.New("error")) + err := handler.CancelToken(context.Background(), &serializer.UploadSession{Key: "key"}) + a.Error(err) + a.Contains(err.Error(), "error") + clientMock.AssertExpectations(t) } diff --git a/pkg/filesystem/file.go b/pkg/filesystem/file.go index 3d244e4..0aa6780 100644 --- a/pkg/filesystem/file.go +++ b/pkg/filesystem/file.go @@ -48,9 +48,6 @@ func (fs *FileSystem) AddFile(ctx context.Context, parent *model.Folder, file fs // 添加文件记录前的钩子 err := fs.Trigger(ctx, "BeforeAddFile", file) if err != nil { - if err := fs.Trigger(ctx, "BeforeAddFileFailed", file); err != nil { - util.Log().Debug("BeforeAddFileFailed 钩子执行失败，%s", err) - } return nil, err } @@ -180,6 +177,7 @@ func (fs *FileSystem) deleteGroupedFile(ctx context.Context, files map[uint][]*m for policyID, toBeDeletedFiles := range files { // 列举出需要物理删除的文件的物理路径 sourceNamesAll := make([]string, 0, len(toBeDeletedFiles)) + uploadSessions := make([]*serializer.UploadSession, 0, len(toBeDeletedFiles)) for i := 0; i < len(toBeDeletedFiles); i++ { sourceNamesAll = append(sourceNamesAll, toBeDeletedFiles[i].SourceName) @@ -187,11 +185,7 @@ func (fs *FileSystem) deleteGroupedFile(ctx context.Context, files map[uint][]*m if toBeDeletedFiles[i].UploadSessionID != nil { if session, ok := cache.Get(UploadSessionCachePrefix + *toBeDeletedFiles[i].UploadSessionID); ok { uploadSession := session.(serializer.UploadSession) - if err := fs.Handler.CancelToken(ctx, &uploadSession); err != nil { - util.Log().Warning("无法取消 [%s] 的上传会话: %s", err) - } - - cache.Deletes([]string{*toBeDeletedFiles[i].UploadSessionID}, UploadSessionCachePrefix) + uploadSessions = append(uploadSessions, &uploadSession) } } @@ -205,6 +199,15 @@ func (fs *FileSystem) deleteGroupedFile(ctx context.Context, files map[uint][]*m continue } + // 取消上传会话 + for _, upSession := range uploadSessions { + if err := fs.Handler.CancelToken(ctx, upSession); err != nil { + util.Log().Warning("无法取消 [%s] 的上传会话: %s", upSession.Name, err) + } + + cache.Deletes([]string{upSession.Key}, UploadSessionCachePrefix) + } + // 执行删除 failedFile, _ := fs.Handler.Delete(ctx, sourceNamesAll) failed[policyID] = failedFile diff --git a/pkg/filesystem/file_test.go b/pkg/filesystem/file_test.go index cb3d24f..5e495c7 100644 --- a/pkg/filesystem/file_test.go +++ b/pkg/filesystem/file_test.go @@ -2,6 +2,7 @@ package filesystem import ( "context" + "errors" "os" "testing" @@ -19,8 +20,9 @@ import ( func TestFileSystem_AddFile(t *testing.T) { asserts := assert.New(t) file := fsctx.FileStream{ - Size: 5, - Name: "1.png", + Size: 5, + Name: "1.png", + SavePath: "/Uploads/1_sad.png", } folder := model.Folder{ Model: gorm.Model{ @@ -39,24 +41,55 @@ func TestFileSystem_AddFile(t *testing.T) { }, }, }, + Policy: &model.Policy{Type: "cos"}, } - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, file) - ctx = context.WithValue(ctx, fsctx.SavePathCtx, "/Uploads/1_sad.png") - _, err := fs.AddFile(ctx, &folder) + _, err := fs.AddFile(context.Background(), &folder, &file) asserts.Error(err) mock.ExpectBegin() mock.ExpectExec("INSERT(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectExec("UPDATE(.+)storage(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectCommit() - f, err := fs.AddFile(ctx, &folder) + f, err := fs.AddFile(context.Background(), &folder, &file) asserts.NoError(err) asserts.NoError(mock.ExpectationsWereMet()) asserts.Equal("/Uploads/1_sad.png", f.SourceName) asserts.NotEmpty(f.PicInfo) + + // 前置钩子执行失败 + { + hookExecuted := false + fs.Use("BeforeAddFile", func(ctx context.Context, fs *FileSystem, file fsctx.FileHeader) error { + hookExecuted = true + return errors.New("error") + }) + f, err := fs.AddFile(context.Background(), &folder, &file) + asserts.Error(err) + asserts.Nil(f) + asserts.True(hookExecuted) + } + + // 后置钩子执行失败 + { + hookExecuted := false + mock.ExpectBegin() + mock.ExpectExec("INSERT(.+)").WillReturnError(errors.New("error")) + mock.ExpectRollback() + fs.Hooks = map[string][]Hook{} + fs.Use("AfterValidateFailed", func(ctx context.Context, fs *FileSystem, file fsctx.FileHeader) error { + hookExecuted = true + return errors.New("error") + }) + f, err := fs.AddFile(context.Background(), &folder, &file) + asserts.Error(err) + asserts.Nil(f) + asserts.True(hookExecuted) + asserts.NoError(mock.ExpectationsWereMet()) + } } func TestFileSystem_GetContent(t *testing.T) { @@ -263,6 +296,22 @@ func TestFileSystem_deleteGroupedFile(t *testing.T) { 3: {}, }, failed) } + // 包含上传会话文件 + { + sessionID := "session" + cache.Set(UploadSessionCachePrefix+sessionID, serializer.UploadSession{Key: sessionID}, 0) + files[1].Policy.Type = "local" + files[3].Policy.Type = "local" + files[0].UploadSessionID = &sessionID + failed := fs.deleteGroupedFile(ctx, fs.GroupFileByPolicy(ctx, files)) + asserts.Equal(map[uint][]string{ + 1: {}, + 2: {}, + 3: {}, + }, failed) + _, ok := cache.Get(UploadSessionCachePrefix + sessionID) + asserts.False(ok) + } } func TestFileSystem_GetSource(t *testing.T) { diff --git a/pkg/filesystem/filesystem.go b/pkg/filesystem/filesystem.go index 51a13a8..b0da90e 100644 --- a/pkg/filesystem/filesystem.go +++ b/pkg/filesystem/filesystem.go @@ -121,12 +121,11 @@ func NewAnonymousFileSystem() (*FileSystem, error) { // DispatchHandler 根据存储策略分配文件适配器 func (fs *FileSystem) DispatchHandler() error { - currentPolicy := fs.Policy - policyType := currentPolicy.Type - - if currentPolicy == nil { - return ErrUnknownPolicyType + if fs.Policy == nil { + return errors.New("未设置存储策略") } + policyType := fs.Policy.Type + currentPolicy := fs.Policy switch policyType { case "mock", "anonymous": diff --git a/pkg/filesystem/filesystem_test.go b/pkg/filesystem/filesystem_test.go index 0c558d7..8b7aae3 100644 --- a/pkg/filesystem/filesystem_test.go +++ b/pkg/filesystem/filesystem_test.go @@ -2,16 +2,16 @@ package filesystem import ( "github.com/cloudreve/Cloudreve/v3/pkg/cluster" + "github.com/cloudreve/Cloudreve/v3/pkg/conf" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/driver/shadow/masterinslave" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/driver/shadow/slaveinmaster" + "github.com/cloudreve/Cloudreve/v3/pkg/serializer" "net/http/httptest" "github.com/DATA-DOG/go-sqlmock" model "github.com/cloudreve/Cloudreve/v3/models" - "github.com/cloudreve/Cloudreve/v3/pkg/cache" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/driver/local" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/driver/remote" - "github.com/cloudreve/Cloudreve/v3/pkg/serializer" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" @@ -36,7 +36,7 @@ func TestNewFileSystem(t *testing.T) { fs, err = NewFileSystem(&user) asserts.NoError(err) asserts.NotNil(fs.Handler) - asserts.IsType(remote.Driver{}, fs.Handler) + asserts.IsType(&remote.Driver{}, fs.Handler) user.Policy.Type = "unknown" fs, err = NewFileSystem(&user) @@ -64,9 +64,10 @@ func TestNewFileSystemFromContext(t *testing.T) { func TestDispatchHandler(t *testing.T) { asserts := assert.New(t) fs := &FileSystem{ - User: &model.User{Policy: model.Policy{ + User: &model.User{}, + Policy: &model.Policy{ Type: "local", - }}, + }, } // 未指定，使用用户默认 @@ -95,7 +96,7 @@ func TestDispatchHandler(t *testing.T) { err = fs.DispatchHandler() asserts.NoError(err) - fs.Policy = &model.Policy{Type: "oss"} + fs.Policy = &model.Policy{Type: "oss", Server: "https://s.com", BucketName: "1234"} err = fs.DispatchHandler() asserts.NoError(err) @@ -140,23 +141,6 @@ func TestNewFileSystemFromCallback(t *testing.T) { asserts.Error(err) } - // 找不到上传策略 - { - c, _ := gin.CreateTestContext(httptest.NewRecorder()) - c.Set("user", &model.User{ - Policy: model.Policy{ - Type: "local", - }, - }) - c.Set("callbackSession", &serializer.UploadSession{PolicyID: 138}) - cache.Deletes([]string{"138"}, "policy_") - mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id"})) - fs, err := NewFileSystemFromCallback(c) - asserts.NoError(mock.ExpectationsWereMet()) - asserts.Nil(fs) - asserts.Error(err) - } - // 成功 { c, _ := gin.CreateTestContext(httptest.NewRecorder()) @@ -165,11 +149,8 @@ func TestNewFileSystemFromCallback(t *testing.T) { Type: "local", }, }) - c.Set("callbackSession", &serializer.UploadSession{PolicyID: 138}) - cache.Deletes([]string{"138"}, "policy_") - mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type", "options"}).AddRow(138, "local", "{}")) + c.Set(UploadSessionCtx, &serializer.UploadSession{Policy: model.Policy{Type: "local"}}) fs, err := NewFileSystemFromCallback(c) - asserts.NoError(mock.ExpectationsWereMet()) asserts.NotNil(fs) asserts.NoError(err) } @@ -234,6 +215,16 @@ func TestNewAnonymousFileSystem(t *testing.T) { asserts.Error(err) asserts.Nil(fs) } + + // 从机 + { + conf.SystemConfig.Mode = "slave" + fs, err := NewAnonymousFileSystem() + asserts.NoError(mock.ExpectationsWereMet()) + asserts.NoError(err) + asserts.NotNil(fs) + asserts.NotNil(fs.Handler) + } } func TestFileSystem_Recycle(t *testing.T) { diff --git a/pkg/filesystem/fsctx/stream_test.go b/pkg/filesystem/fsctx/stream_test.go index 8cc0c85..1ef6e1f 100644 --- a/pkg/filesystem/fsctx/stream_test.go +++ b/pkg/filesystem/fsctx/stream_test.go @@ -1,30 +1,15 @@ package fsctx import ( + model "github.com/cloudreve/Cloudreve/v3/models" "github.com/stretchr/testify/assert" + "io" "io/ioutil" + "os" "strings" "testing" ) -func TestFileStream_GetFileName(t *testing.T) { - asserts := assert.New(t) - file := FileStream{Name: "123"} - asserts.Equal("123", file.GetFileName()) -} - -func TestFileStream_GetMIMEType(t *testing.T) { - asserts := assert.New(t) - file := FileStream{MIMEType: "123"} - asserts.Equal("123", file.GetMIMEType()) -} - -func TestFileStream_GetSize(t *testing.T) { - asserts := assert.New(t) - file := FileStream{Size: 123} - asserts.Equal(uint64(123), file.GetSize()) -} - func TestFileStream_Read(t *testing.T) { asserts := assert.New(t) file := FileStream{ @@ -40,9 +25,54 @@ func TestFileStream_Read(t *testing.T) { func TestFileStream_Close(t *testing.T) { asserts := assert.New(t) - file := FileStream{ - File: ioutil.NopCloser(strings.NewReader("123")), + { + file := FileStream{ + File: ioutil.NopCloser(strings.NewReader("123")), + } + err := file.Close() + asserts.NoError(err) + } + + { + file := FileStream{} + err := file.Close() + asserts.NoError(err) + } +} + +func TestFileStream_Seek(t *testing.T) { + asserts := assert.New(t) + f, _ := os.CreateTemp("", "*") + defer func() { + f.Close() + os.Remove(f.Name()) + }() + { + file := FileStream{ + File: f, + Seeker: f, + } + res, err := file.Seek(0, io.SeekStart) + asserts.NoError(err) + asserts.EqualValues(0, res) } - err := file.Close() - asserts.NoError(err) + + { + file := FileStream{} + res, err := file.Seek(0, io.SeekStart) + asserts.Error(err) + asserts.EqualValues(0, res) + } +} + +func TestFileStream_Info(t *testing.T) { + a := assert.New(t) + file := FileStream{} + a.NotNil(file.Info()) + + file.SetSize(10) + a.EqualValues(10, file.Info().Size) + + file.SetModel(&model.File{}) + a.NotNil(file.Info().Model) } diff --git a/pkg/filesystem/fsctx/taskinfo/taskinfo.go b/pkg/filesystem/fsctx/taskinfo/taskinfo.go deleted file mode 100644 index 1899c1b..0000000 --- a/pkg/filesystem/fsctx/taskinfo/taskinfo.go +++ /dev/null @@ -1 +0,0 @@ -package taskinfo diff --git a/pkg/filesystem/hooks.go b/pkg/filesystem/hooks.go index 0cd1cb9..fc4a68f 100644 --- a/pkg/filesystem/hooks.go +++ b/pkg/filesystem/hooks.go @@ -148,7 +148,6 @@ func HookCancelContext(ctx context.Context, fs *FileSystem, file fsctx.FileHeade } // HookUpdateSourceName 更新文件SourceName -// TODO：测试 func HookUpdateSourceName(ctx context.Context, fs *FileSystem, file fsctx.FileHeader) error { originFile, ok := ctx.Value(fsctx.FileModelCtx).(model.File) if !ok { diff --git a/pkg/filesystem/hooks_test.go b/pkg/filesystem/hooks_test.go index a247490..0daa8ec 100644 --- a/pkg/filesystem/hooks_test.go +++ b/pkg/filesystem/hooks_test.go @@ -3,22 +3,20 @@ package filesystem import ( "context" "errors" - "io" - "io/ioutil" - "net/http" - "os" - "strings" - "sync" - "testing" - "github.com/DATA-DOG/go-sqlmock" - model "github.com/cloudreve/Cloudreve/v3/models" "github.com/cloudreve/Cloudreve/v3/pkg/cache" "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/mocks/requestmock" "github.com/cloudreve/Cloudreve/v3/pkg/request" "github.com/cloudreve/Cloudreve/v3/pkg/serializer" + "io/ioutil" + "net/http" + "strings" + "testing" + + model "github.com/cloudreve/Cloudreve/v3/models" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" testMock "github.com/stretchr/testify/mock" @@ -26,78 +24,72 @@ import ( func TestGenericBeforeUpload(t *testing.T) { asserts := assert.New(t) - file := fsctx.FileStream{ + file := &fsctx.FileStream{ Size: 5, Name: "1.txt", } + ctx := context.Background() cache.Set("pack_size_0", uint64(0), 0) - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, file) fs := FileSystem{ User: &model.User{ Storage: 0, Group: model.Group{ MaxStorage: 11, }, - Policy: model.Policy{ - MaxSize: 4, - OptionsSerialized: model.PolicyOption{ - FileType: []string{"txt"}, - }, + }, + Policy: &model.Policy{ + MaxSize: 4, + OptionsSerialized: model.PolicyOption{ + FileType: []string{"txt"}, }, }, } - asserts.Error(HookValidateFile(ctx, &fs)) + asserts.Error(HookValidateFile(ctx, &fs, file)) file.Size = 1 file.Name = "1" - ctx = context.WithValue(context.Background(), fsctx.FileHeaderCtx, file) - asserts.Error(HookValidateFile(ctx, &fs)) + asserts.Error(HookValidateFile(ctx, &fs, file)) file.Name = "1.txt" - ctx = context.WithValue(context.Background(), fsctx.FileHeaderCtx, file) - asserts.NoError(HookValidateFile(ctx, &fs)) + asserts.NoError(HookValidateFile(ctx, &fs, file)) file.Name = "1.t/xt" - ctx = context.WithValue(context.Background(), fsctx.FileHeaderCtx, file) - asserts.Error(HookValidateFile(ctx, &fs)) + asserts.Error(HookValidateFile(ctx, &fs, file)) } func TestGenericAfterUploadCanceled(t *testing.T) { asserts := assert.New(t) - f, err := os.Create("TestGenericAfterUploadCanceled") - asserts.NoError(err) - f.Close() - file := fsctx.FileStream{ - Size: 5, - Name: "TestGenericAfterUploadCanceled", + file := &fsctx.FileStream{ + Size: 5, + Name: "TestGenericAfterUploadCanceled", + SavePath: "TestGenericAfterUploadCanceled", } - ctx := context.WithValue(context.Background(), fsctx.SavePathCtx, "TestGenericAfterUploadCanceled") - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, file) + ctx := context.Background() fs := FileSystem{ - User: &model.User{Storage: 5}, - Handler: local.Driver{}, + User: &model.User{}, } // 成功 - err = HookDeleteTempFile(ctx, &fs) - asserts.NoError(err) - err = HookGiveBackCapacity(ctx, &fs) - asserts.NoError(err) - asserts.Equal(uint64(0), fs.User.Storage) - - f, err = os.Create("TestGenericAfterUploadCanceled") - asserts.NoError(err) - f.Close() + { + mockHandler := &FileHeaderMock{} + fs.Handler = mockHandler + mockHandler.On("Delete", testMock.Anything, testMock.Anything).Return([]string{}, nil) + err := HookDeleteTempFile(ctx, &fs, file) + asserts.NoError(err) + mockHandler.AssertExpectations(t) + } - // 容量不能再降低 - err = HookGiveBackCapacity(ctx, &fs) - asserts.Error(err) + // 失败 + { + mockHandler := &FileHeaderMock{} + fs.Handler = mockHandler + mockHandler.On("Delete", testMock.Anything, testMock.Anything).Return([]string{}, errors.New("")) + err := HookDeleteTempFile(ctx, &fs, file) + asserts.NoError(err) + mockHandler.AssertExpectations(t) + } - //文件不存在 - fs.User.Storage = 5 - err = HookDeleteTempFile(ctx, &fs) - asserts.NoError(err) } func TestGenericAfterUpload(t *testing.T) { @@ -108,13 +100,14 @@ func TestGenericAfterUpload(t *testing.T) { ID: 1, }, }, + Policy: &model.Policy{}, } - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, fsctx.FileStream{ + ctx := context.Background() + file := &fsctx.FileStream{ VirtualPath: "/我的文件", Name: "test.txt", - }) - ctx = context.WithValue(ctx, fsctx.SavePathCtx, "") + } // 正常 mock.ExpectQuery("SELECT(.+)"). @@ -127,9 +120,10 @@ func TestGenericAfterUpload(t *testing.T) { mock.ExpectQuery("SELECT(.+)files(.+)").WillReturnError(errors.New("not found")) mock.ExpectBegin() mock.ExpectExec("INSERT(.+)files(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectExec("UPDATE(.+)storage(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectCommit() - err := GenericAfterUpload(ctx, &fs) + err := GenericAfterUpload(ctx, &fs, file) asserts.NoError(err) asserts.NoError(mock.ExpectationsWereMet()) @@ -137,7 +131,7 @@ func TestGenericAfterUpload(t *testing.T) { mock.ExpectQuery("SELECT(.+)folders(.+)").WillReturnRows( mock.NewRows([]string{"name"}), ) - err = GenericAfterUpload(ctx, &fs) + err = GenericAfterUpload(ctx, &fs, file) asserts.Equal(ErrRootProtected, err) asserts.NoError(mock.ExpectationsWereMet()) @@ -152,10 +146,25 @@ func TestGenericAfterUpload(t *testing.T) { mock.ExpectQuery("SELECT(.+)files(.+)").WillReturnRows( mock.NewRows([]string{"name"}).AddRow("test.txt"), ) - err = GenericAfterUpload(ctx, &fs) + err = GenericAfterUpload(ctx, &fs, file) asserts.Equal(ErrFileExisted, err) asserts.NoError(mock.ExpectationsWereMet()) + // 文件已存在, 且为上传占位符 + mock.ExpectQuery("SELECT(.+)"). + WithArgs(1). + WillReturnRows(sqlmock.NewRows([]string{"id", "owner_id"}).AddRow(1, 1)) + // 1 + mock.ExpectQuery("SELECT(.+)"). + WithArgs(1, 1, "我的文件"). + WillReturnRows(sqlmock.NewRows([]string{"id", "owner_id"}).AddRow(2, 1)) + mock.ExpectQuery("SELECT(.+)files(.+)").WillReturnRows( + mock.NewRows([]string{"name", "upload_session_id"}).AddRow("test.txt", "1"), + ) + err = GenericAfterUpload(ctx, &fs, file) + asserts.Equal(ErrFileUploadSessionExisted, err) + asserts.NoError(mock.ExpectationsWereMet()) + // 插入失败 mock.ExpectQuery("SELECT(.+)"). WithArgs(1). @@ -170,7 +179,7 @@ func TestGenericAfterUpload(t *testing.T) { mock.ExpectExec("INSERT(.+)files(.+)").WillReturnError(errors.New("error")) mock.ExpectRollback() - err = GenericAfterUpload(ctx, &fs) + err = GenericAfterUpload(ctx, &fs, file) asserts.Equal(ErrInsertFileRecord, err) asserts.NoError(mock.ExpectationsWereMet()) @@ -180,7 +189,7 @@ func TestFileSystem_Use(t *testing.T) { asserts := assert.New(t) fs := FileSystem{} - hook := func(ctx context.Context, fs *FileSystem) error { + hook := func(ctx context.Context, fs *FileSystem, fileHeader fsctx.FileHeader) error { return nil } @@ -215,77 +224,79 @@ func TestFileSystem_Trigger(t *testing.T) { } ctx := context.Background() - hook := func(ctx context.Context, fs *FileSystem) error { + hook := func(ctx context.Context, fs *FileSystem, fileHeader fsctx.FileHeader) error { fs.User.Storage++ return nil } // 一个 fs.Use("BeforeUpload", hook) - err := fs.Trigger(ctx, "BeforeUpload") + err := fs.Trigger(ctx, "BeforeUpload", nil) asserts.NoError(err) asserts.Equal(uint64(1), fs.User.Storage) // 多个 fs.Use("BeforeUpload", hook) fs.Use("BeforeUpload", hook) - err = fs.Trigger(ctx, "BeforeUpload") + err = fs.Trigger(ctx, "BeforeUpload", nil) asserts.NoError(err) asserts.Equal(uint64(4), fs.User.Storage) + + // 多个,有失败 + fs.Use("BeforeUpload", func(ctx context.Context, fs *FileSystem, file fsctx.FileHeader) error { + return errors.New("error") + }) + fs.Use("BeforeUpload", func(ctx context.Context, fs *FileSystem, file fsctx.FileHeader) error { + asserts.Fail("following hooks executed") + return nil + }) + err = fs.Trigger(ctx, "BeforeUpload", nil) + asserts.Error(err) } -func TestHookIsFileExist(t *testing.T) { +func TestHookValidateCapacity(t *testing.T) { asserts := assert.New(t) + cache.Set("pack_size_1", uint64(0), 0) fs := &FileSystem{User: &model.User{ - Model: gorm.Model{ - ID: 1, + Model: gorm.Model{ID: 1}, + Storage: 0, + Group: model.Group{ + MaxStorage: 11, }, }} - ctx := context.WithValue(context.Background(), fsctx.PathCtx, "/test.txt") + ctx := context.Background() + file := &fsctx.FileStream{Size: 11} { - mock.ExpectQuery("SELECT(.+)"). - WithArgs(1). - WillReturnRows(sqlmock.NewRows([]string{"id", "owner_id"}).AddRow(1, 1)) - mock.ExpectQuery("SELECT(.+)").WithArgs(uint(1), "test.txt").WillReturnRows( - sqlmock.NewRows([]string{"Name"}).AddRow("s"), - ) - err := HookIsFileExist(ctx, fs) - asserts.NoError(mock.ExpectationsWereMet()) + err := HookValidateCapacity(ctx, fs, file) asserts.NoError(err) } { - mock.ExpectQuery("SELECT(.+)"). - WithArgs(1). - WillReturnRows(sqlmock.NewRows([]string{"id", "owner_id"}).AddRow(1, 1)) - mock.ExpectQuery("SELECT(.+)").WithArgs(uint(1), "test.txt").WillReturnRows( - sqlmock.NewRows([]string{"Name"}), - ) - err := HookIsFileExist(ctx, fs) - asserts.NoError(mock.ExpectationsWereMet()) + file.Size = 12 + err := HookValidateCapacity(ctx, fs, file) asserts.Error(err) } - } -func TestHookValidateCapacity(t *testing.T) { - asserts := assert.New(t) - cache.Set("pack_size_1", uint64(0), 0) +func TestHookValidateCapacityDiff(t *testing.T) { + a := assert.New(t) fs := &FileSystem{User: &model.User{ - Model: gorm.Model{ID: 1}, - Storage: 0, Group: model.Group{ MaxStorage: 11, }, }} - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, fsctx.FileStream{Size: 10}) + file := model.File{Size: 10} + ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, file) + + // 无需操作 { - err := HookValidateCapacity(ctx, fs) - asserts.NoError(err) + a.NoError(HookValidateCapacityDiff(ctx, fs, &fsctx.FileStream{Size: 10})) } + + // 需要验证 { - err := HookValidateCapacity(ctx, fs) - asserts.Error(err) + a.Error(HookValidateCapacityDiff(ctx, fs, &fsctx.FileStream{Size: 12})) } + } func TestHookResetPolicy(t *testing.T) { @@ -301,7 +312,7 @@ func TestHookResetPolicy(t *testing.T) { mock.ExpectQuery("SELECT(.+)policies(.+)"). WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(2, "local")) ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, file) - err := HookResetPolicy(ctx, fs) + err := HookResetPolicy(ctx, fs, nil) asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(err) } @@ -310,76 +321,22 @@ func TestHookResetPolicy(t *testing.T) { { cache.Deletes([]string{"2"}, "policy_") ctx := context.Background() - err := HookResetPolicy(ctx, fs) + err := HookResetPolicy(ctx, fs, nil) asserts.Error(err) } } -func TestHookChangeCapacity(t *testing.T) { - asserts := assert.New(t) - cache.Set("pack_size_1", uint64(0), 0) - - // 容量增加 失败 - { - fs := &FileSystem{User: &model.User{ - Model: gorm.Model{ID: 1}, - }} - - newFile := fsctx.FileStream{Size: 10} - oldFile := model.File{Size: 9} - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, oldFile) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, newFile) - err := HookChangeCapacity(ctx, fs) - asserts.Equal(ErrInsufficientCapacity, err) - } - - // 容量增加 成功 - { - fs := &FileSystem{User: &model.User{ - Model: gorm.Model{ID: 1}, - Group: model.Group{MaxStorage: 1}, - }} - - newFile := fsctx.FileStream{Size: 10} - oldFile := model.File{Size: 9} - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, oldFile) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, newFile) - mock.ExpectBegin() - mock.ExpectExec("UPDATE(.+)").WithArgs(1, sqlmock.AnyArg(), 1).WillReturnResult(sqlmock.NewResult(1, 1)) - err := HookChangeCapacity(ctx, fs) - asserts.NoError(mock.ExpectationsWereMet()) - asserts.NoError(err) - asserts.Equal(uint64(1), fs.User.Storage) - } - - // 容量减少 - { - fs := &FileSystem{User: &model.User{ - Model: gorm.Model{ID: 1}, - Storage: 1, - }} - - newFile := fsctx.FileStream{Size: 9} - oldFile := model.File{Size: 10} - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, oldFile) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, newFile) - err := HookChangeCapacity(ctx, fs) - asserts.NoError(err) - asserts.Equal(uint64(0), fs.User.Storage) - } -} - func TestHookCleanFileContent(t *testing.T) { asserts := assert.New(t) fs := &FileSystem{User: &model.User{ Model: gorm.Model{ID: 1}, }} - ctx := context.WithValue(context.Background(), fsctx.SavePathCtx, "123/123") + file := &fsctx.FileStream{SavePath: "123/123"} handlerMock := FileHeaderMock{} - handlerMock.On("Put", testMock.Anything, testMock.Anything, "123/123").Return(errors.New("error")) + handlerMock.On("Put", testMock.Anything, testMock.Anything).Return(errors.New("error")) fs.Handler = handlerMock - err := HookCleanFileContent(ctx, fs) + err := HookCleanFileContent(context.Background(), fs, file) asserts.Error(err) handlerMock.AssertExpectations(t) } @@ -395,14 +352,17 @@ func TestHookClearFileSize(t *testing.T) { ctx := context.WithValue( context.Background(), fsctx.FileModelCtx, - model.File{Model: gorm.Model{ID: 1}}, + model.File{Model: gorm.Model{ID: 1}, Size: 10}, ) mock.ExpectBegin() - mock.ExpectExec("UPDATE(.+)"). - WithArgs(0, sqlmock.AnyArg(), 1). + mock.ExpectExec("UPDATE(.+)files(.+)"). + WithArgs(0, sqlmock.AnyArg(), 1, 10). + WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectExec("UPDATE(.+)users(.+)"). + WithArgs(10, sqlmock.AnyArg()). WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectCommit() - err := HookClearFileSize(ctx, fs) + err := HookClearFileSize(ctx, fs, nil) asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(err) } @@ -410,7 +370,7 @@ func TestHookClearFileSize(t *testing.T) { // 上下文对象不存在 { ctx := context.Background() - err := HookClearFileSize(ctx, fs) + err := HookClearFileSize(ctx, fs, nil) asserts.Error(err) } @@ -432,7 +392,7 @@ func TestHookUpdateSourceName(t *testing.T) { mock.ExpectBegin() mock.ExpectExec("UPDATE(.+)").WithArgs("new.txt", sqlmock.AnyArg(), 1).WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectCommit() - err := HookUpdateSourceName(ctx, fs) + err := HookUpdateSourceName(ctx, fs, nil) asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(err) } @@ -440,7 +400,7 @@ func TestHookUpdateSourceName(t *testing.T) { // 上下文错误 { ctx := context.Background() - err := HookUpdateSourceName(ctx, fs) + err := HookUpdateSourceName(ctx, fs, nil) asserts.Error(err) } } @@ -457,41 +417,32 @@ func TestGenericAfterUpdate(t *testing.T) { Model: gorm.Model{ID: 1}, PicInfo: "1,1", } - newFile := fsctx.FileStream{Size: 10} + newFile := &fsctx.FileStream{Size: 10} ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, originFile) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, newFile) handlerMock := FileHeaderMock{} handlerMock.On("Delete", testMock.Anything, []string{"._thumb"}).Return([]string{}, nil) fs.Handler = handlerMock mock.ExpectBegin() - mock.ExpectExec("UPDATE(.+)"). - WithArgs(10, sqlmock.AnyArg(), 1). + mock.ExpectExec("UPDATE(.+)files(.+)"). + WithArgs(10, sqlmock.AnyArg(), 1, 0). + WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectExec("UPDATE(.+)users(.+)"). + WithArgs(10, sqlmock.AnyArg()). WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectCommit() - err := GenericAfterUpdate(ctx, fs) + err := GenericAfterUpdate(ctx, fs, newFile) asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(err) } - // 新文件上下文不存在 - { - originFile := model.File{ - Model: gorm.Model{ID: 1}, - PicInfo: "1,1", - } - ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, originFile) - err := GenericAfterUpdate(ctx, fs) - asserts.Error(err) - } - // 原始文件上下文不存在 { - newFile := fsctx.FileStream{Size: 10} - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, newFile) - err := GenericAfterUpdate(ctx, fs) + newFile := &fsctx.FileStream{Size: 10} + ctx := context.Background() + err := GenericAfterUpdate(ctx, fs, newFile) asserts.Error(err) } @@ -502,91 +453,41 @@ func TestGenericAfterUpdate(t *testing.T) { Model: gorm.Model{ID: 1}, PicInfo: "1,1", } - newFile := fsctx.FileStream{Size: 10} + newFile := &fsctx.FileStream{Size: 10} ctx := context.WithValue(context.Background(), fsctx.FileModelCtx, originFile) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, newFile) mock.ExpectBegin() mock.ExpectExec("UPDATE(.+)"). - WithArgs(10, sqlmock.AnyArg(), 1). + WithArgs(10, sqlmock.AnyArg(), 1, 0). WillReturnError(errors.New("error")) mock.ExpectRollback() - err := GenericAfterUpdate(ctx, fs) + err := GenericAfterUpdate(ctx, fs, newFile) asserts.NoError(mock.ExpectationsWereMet()) asserts.Error(err) } } -func TestHookSlaveUploadValidate(t *testing.T) { - asserts := assert.New(t) - conf.SystemConfig.Mode = "slave" - fs, err := NewAnonymousFileSystem() - conf.SystemConfig.Mode = "master" - asserts.NoError(err) - - // 正常 - { - policy := serializer.UploadPolicy{ - SavePath: "", - MaxSize: 10, - AllowedExtension: nil, - } - file := fsctx.FileStream{Name: "1.txt", Size: 10} - ctx := context.WithValue(context.Background(), fsctx.UploadPolicyCtx, policy) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, file) - asserts.NoError(HookSlaveUploadValidate(ctx, fs)) - } - - // 尺寸太大 - { - policy := serializer.UploadPolicy{ - SavePath: "", - MaxSize: 10, - AllowedExtension: nil, - } - file := fsctx.FileStream{Name: "1.txt", Size: 11} - ctx := context.WithValue(context.Background(), fsctx.UploadPolicyCtx, policy) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, file) - asserts.Equal(ErrFileSizeTooBig, HookSlaveUploadValidate(ctx, fs)) - } - - // 文件名非法 - { - policy := serializer.UploadPolicy{ - SavePath: "", - MaxSize: 10, - AllowedExtension: nil, - } - file := fsctx.FileStream{Name: "/1.txt", Size: 10} - ctx := context.WithValue(context.Background(), fsctx.UploadPolicyCtx, policy) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, file) - asserts.Equal(ErrIllegalObjectName, HookSlaveUploadValidate(ctx, fs)) - } - - // 扩展名非法 - { - policy := serializer.UploadPolicy{ - SavePath: "", - MaxSize: 10, - AllowedExtension: []string{"jpg"}, - } - file := fsctx.FileStream{Name: "1.txt", Size: 10} - ctx := context.WithValue(context.Background(), fsctx.UploadPolicyCtx, policy) - ctx = context.WithValue(ctx, fsctx.FileHeaderCtx, file) - asserts.Equal(ErrFileExtensionNotAllowed, HookSlaveUploadValidate(ctx, fs)) +func TestHookGenerateThumb(t *testing.T) { + a := assert.New(t) + mockHandler := &FileHeaderMock{} + fs := &FileSystem{ + User: &model.User{ + Model: gorm.Model{ID: 1}, + }, + Handler: mockHandler, + Policy: &model.Policy{Type: "local"}, } -} - -type ClientMock struct { - testMock.Mock -} - -func (m ClientMock) Request(method, target string, body io.Reader, opts ...request.Option) *request.Response { - args := m.Called(method, target, body, opts) - return args.Get(0).(*request.Response) + mockHandler.On("Delete", testMock.Anything, []string{"1.txt._thumb"}).Return([]string{}, nil) + a.NoError(HookGenerateThumb(context.Background(), fs, &fsctx.FileStream{ + Model: &model.File{ + SourceName: "1.txt", + }, + })) + fs.Recycle() + mockHandler.AssertExpectations(t) } func TestSlaveAfterUpload(t *testing.T) { @@ -598,7 +499,7 @@ func TestSlaveAfterUpload(t *testing.T) { // 成功 { - clientMock := ClientMock{} + clientMock := requestmock.RequestMock{} clientMock.On( "Request", "POST", @@ -613,19 +514,28 @@ func TestSlaveAfterUpload(t *testing.T) { }, }) request.GeneralClient = clientMock - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, fsctx.FileStream{ + file := &fsctx.FileStream{ Size: 10, VirtualPath: "/my", Name: "test.txt", - }) - ctx = context.WithValue(ctx, fsctx.UploadPolicyCtx, serializer.UploadPolicy{ - CallbackURL: "http://test/callbakc", - }) - ctx = context.WithValue(ctx, fsctx.SavePathCtx, "/not_exist") - err := SlaveAfterUpload(ctx, fs) + SavePath: "/not_exist", + } + err := SlaveAfterUpload(&serializer.UploadSession{Callback: "http://test/callbakc"})(context.Background(), fs, file) clientMock.AssertExpectations(t) asserts.NoError(err) } + + // 跳过回调 + { + file := &fsctx.FileStream{ + Size: 10, + VirtualPath: "/my", + Name: "test.txt", + SavePath: "/not_exist", + } + err := SlaveAfterUpload(&serializer.UploadSession{})(context.Background(), fs, file) + asserts.NoError(err) + } } func TestFileSystem_CleanHooks(t *testing.T) { @@ -663,7 +573,7 @@ func TestHookCancelContext(t *testing.T) { // empty ctx { - asserts.NoError(HookCancelContext(ctx, fs)) + asserts.NoError(HookCancelContext(ctx, fs, nil)) select { case <-ctx.Done(): t.Errorf("Channel should not be closed") @@ -675,62 +585,99 @@ func TestHookCancelContext(t *testing.T) { // with cancel ctx { ctx = context.WithValue(ctx, fsctx.CancelFuncCtx, cancel) - asserts.NoError(HookCancelContext(ctx, fs)) + asserts.NoError(HookCancelContext(ctx, fs, nil)) _, ok := <-ctx.Done() asserts.False(ok) } } -func TestHookGiveBackCapacity(t *testing.T) { - asserts := assert.New(t) - fs := &FileSystem{ - User: &model.User{ - Model: gorm.Model{ID: 1}, - Storage: 10, +func TestHookClearFileHeaderSize(t *testing.T) { + a := assert.New(t) + fs := &FileSystem{} + file := &fsctx.FileStream{Size: 10} + a.NoError(HookClearFileHeaderSize(context.Background(), fs, file)) + a.EqualValues(0, file.Size) +} + +func TestHookTruncateFileTo(t *testing.T) { + a := assert.New(t) + fs := &FileSystem{} + file := &fsctx.FileStream{} + a.NoError(HookTruncateFileTo(0)(context.Background(), fs, file)) + + fs.Handler = local.Driver{} + a.Error(HookTruncateFileTo(0)(context.Background(), fs, file)) +} + +func TestHookChunkUploaded(t *testing.T) { + a := assert.New(t) + fs := &FileSystem{} + file := &fsctx.FileStream{ + AppendStart: 10, + Size: 10, + Model: &model.File{ + Model: gorm.Model{ID: 1}, }, } - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, fsctx.FileStream{Size: 1}) - // without once limit - { - asserts.NoError(HookGiveBackCapacity(ctx, fs)) - asserts.EqualValues(9, fs.User.Storage) - asserts.NoError(HookGiveBackCapacity(ctx, fs)) - asserts.EqualValues(8, fs.User.Storage) - } + mock.ExpectBegin() + mock.ExpectExec("UPDATE(.+)files(.+)").WithArgs(20, sqlmock.AnyArg(), 1, 0).WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectExec("UPDATE(.+)users(.+)"). + WithArgs(20, sqlmock.AnyArg()). + WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectCommit() + a.NoError(HookChunkUploaded(context.Background(), fs, file)) + a.NoError(mock.ExpectationsWereMet()) +} - // with once limit - { - ctx = context.WithValue(ctx, fsctx.ValidateCapacityOnceCtx, &sync.Once{}) - asserts.NoError(HookGiveBackCapacity(ctx, fs)) - asserts.EqualValues(7, fs.User.Storage) - asserts.NoError(HookGiveBackCapacity(ctx, fs)) - asserts.EqualValues(7, fs.User.Storage) +func TestHookChunkUploadFailed(t *testing.T) { + a := assert.New(t) + fs := &FileSystem{} + file := &fsctx.FileStream{ + AppendStart: 10, + Size: 10, + Model: &model.File{ + Model: gorm.Model{ID: 1}, + }, } + + mock.ExpectBegin() + mock.ExpectExec("UPDATE(.+)files(.+)").WithArgs(10, sqlmock.AnyArg(), 1, 0).WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectExec("UPDATE(.+)users(.+)"). + WithArgs(10, sqlmock.AnyArg()). + WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectCommit() + a.NoError(HookChunkUploadFailed(context.Background(), fs, file)) + a.NoError(mock.ExpectationsWereMet()) } -func TestHookValidateCapacityWithoutIncrease(t *testing.T) { +func TestHookPopPlaceholderToFile(t *testing.T) { a := assert.New(t) - fs := &FileSystem{ - User: &model.User{ - Model: gorm.Model{ID: 1}, - Storage: 10, - Group: model.Group{}, + fs := &FileSystem{} + file := &fsctx.FileStream{ + Model: &model.File{ + Model: gorm.Model{ID: 1}, }, } - ctx := context.WithValue(context.Background(), fsctx.FileHeaderCtx, fsctx.FileStream{Size: 1}) - // not enough - { - fs.User.Group.MaxStorage = 10 - a.Error(HookValidateCapacity(ctx, fs)) - a.EqualValues(10, fs.User.Storage) - } + mock.ExpectBegin() + mock.ExpectExec("UPDATE(.+)files(.+)").WillReturnResult(sqlmock.NewResult(1, 1)) + mock.ExpectCommit() + a.NoError(HookPopPlaceholderToFile("1,1")(context.Background(), fs, file)) + a.NoError(mock.ExpectationsWereMet()) +} - // enough - { - fs.User.Group.MaxStorage = 11 - a.NoError(HookValidateCapacity(ctx, fs)) - a.EqualValues(10, fs.User.Storage) +func TestHookDeleteUploadSession(t *testing.T) { + a := assert.New(t) + fs := &FileSystem{} + file := &fsctx.FileStream{ + Model: &model.File{ + Model: gorm.Model{ID: 1}, + }, } + + cache.Set(UploadSessionCachePrefix+"TestHookDeleteUploadSession", "", 0) + a.NoError(HookDeleteUploadSession("TestHookDeleteUploadSession")(context.Background(), fs, file)) + _, ok := cache.Get(UploadSessionCachePrefix + "TestHookDeleteUploadSession") + a.False(ok) } diff --git a/pkg/filesystem/image_test.go b/pkg/filesystem/image_test.go index 9678df9..42c7f45 100644 --- a/pkg/filesystem/image_test.go +++ b/pkg/filesystem/image_test.go @@ -1,43 +1,38 @@ package filesystem import ( - "context" "testing" - model "github.com/cloudreve/Cloudreve/v3/models" - "github.com/cloudreve/Cloudreve/v3/pkg/cache" - "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/response" "github.com/stretchr/testify/assert" - testMock "github.com/stretchr/testify/mock" ) -func TestFileSystem_GetThumb(t *testing.T) { - asserts := assert.New(t) - fs := &FileSystem{User: &model.User{}} - - // 非图像文件 - { - fs.SetTargetFile(&[]model.File{{}}) - _, err := fs.GetThumb(context.Background(), 1) - asserts.Equal(err, ErrObjectNotExist) - } - - // 成功 - { - cache.Set("setting_thumb_width", "10", 0) - cache.Set("setting_thumb_height", "10", 0) - cache.Set("setting_preview_timeout", "50", 0) - testHandller2 := new(FileHeaderMock) - testHandller2.On("Thumb", testMock.Anything, "").Return(&response.ContentResponse{}, nil) - fs.CleanTargets() - fs.SetTargetFile(&[]model.File{{PicInfo: "1,1", Policy: model.Policy{Type: "mock"}}}) - fs.FileTarget[0].Policy.ID = 1 - fs.Handler = testHandller2 - res, err := fs.GetThumb(context.Background(), 1) - asserts.NoError(err) - asserts.EqualValues(50, res.MaxAge) - } -} +//func TestFileSystem_GetThumb(t *testing.T) { +// asserts := assert.New(t) +// fs := &FileSystem{User: &model.User{}} +// +// // 非图像文件 +// { +// fs.SetTargetFile(&[]model.File{{}}) +// _, err := fs.GetThumb(context.Background(), 1) +// asserts.Equal(err, ErrObjectNotExist) +// } +// +// // 成功 +// { +// cache.Set("setting_thumb_width", "10", 0) +// cache.Set("setting_thumb_height", "10", 0) +// cache.Set("setting_preview_timeout", "50", 0) +// testHandller2 := new(FileHeaderMock) +// testHandller2.On("Thumb", testMock.Anything, "").Return(&response.ContentResponse{}, nil) +// fs.CleanTargets() +// fs.SetTargetFile(&[]model.File{{PicInfo: "1,1", Policy: model.Policy{Type: "mock"}}}) +// fs.FileTarget[0].Policy.ID = 1 +// fs.Handler = testHandller2 +// res, err := fs.GetThumb(context.Background(), 1) +// asserts.NoError(err) +// asserts.EqualValues(50, res.MaxAge) +// } +//} func TestFileSystem_ThumbWorker(t *testing.T) { asserts := assert.New(t) diff --git a/pkg/filesystem/manage_test.go b/pkg/filesystem/manage_test.go index f3186ef..7357371 100644 --- a/pkg/filesystem/manage_test.go +++ b/pkg/filesystem/manage_test.go @@ -11,59 +11,57 @@ import ( "github.com/cloudreve/Cloudreve/v3/pkg/cache" "github.com/cloudreve/Cloudreve/v3/pkg/conf" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" - "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/response" "github.com/cloudreve/Cloudreve/v3/pkg/serializer" "github.com/cloudreve/Cloudreve/v3/pkg/util" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" - testMock "github.com/stretchr/testify/mock" ) -func TestFileSystem_ListPhysical(t *testing.T) { - asserts := assert.New(t) - fs := &FileSystem{ - User: &model.User{ - Model: gorm.Model{ - ID: 1, - }, - }, - Policy: &model.Policy{Type: "mock"}, - } - ctx := context.Background() - - // 未知存储策略 - { - fs.Policy.Type = "unknown" - res, err := fs.ListPhysical(ctx, "/") - asserts.Equal(ErrUnknownPolicyType, err) - asserts.Empty(res) - fs.Policy.Type = "mock" - } - - // 无法列取目录 - { - testHandler := new(FileHeaderMock) - testHandler.On("List", testMock.Anything, "/", testMock.Anything).Return([]response.Object{}, errors.New("error")) - fs.Handler = testHandler - res, err := fs.ListPhysical(ctx, "/") - asserts.EqualError(err, "error") - asserts.Empty(res) - } - - // 成功 - { - testHandler := new(FileHeaderMock) - testHandler.On("List", testMock.Anything, "/", testMock.Anything).Return( - []response.Object{{IsDir: true, Name: "1"}, {IsDir: false, Name: "2"}}, - nil, - ) - fs.Handler = testHandler - res, err := fs.ListPhysical(ctx, "/") - asserts.NoError(err) - asserts.Len(res, 1) - asserts.Equal("1", res[0].Name) - } -} +//func TestFileSystem_ListPhysical(t *testing.T) { +// asserts := assert.New(t) +// fs := &FileSystem{ +// User: &model.User{ +// Model: gorm.Model{ +// ID: 1, +// }, +// }, +// Policy: &model.Policy{Type: "mock"}, +// } +// ctx := context.Background() +// +// // 未知存储策略 +// { +// fs.Policy.Type = "unknown" +// res, err := fs.ListPhysical(ctx, "/") +// asserts.Equal(ErrUnknownPolicyType, err) +// asserts.Empty(res) +// fs.Policy.Type = "mock" +// } +// +// // 无法列取目录 +// { +// testHandler := new(FileHeaderMock) +// testHandler.On("List", testMock.Anything, "/", testMock.Anything).Return([]response.Object{}, errors.New("error")) +// fs.Handler = testHandler +// res, err := fs.ListPhysical(ctx, "/") +// asserts.EqualError(err, "error") +// asserts.Empty(res) +// } +// +// // 成功 +// { +// testHandler := new(FileHeaderMock) +// testHandler.On("List", testMock.Anything, "/", testMock.Anything).Return( +// []response.Object{{IsDir: true, Name: "1"}, {IsDir: false, Name: "2"}}, +// nil, +// ) +// fs.Handler = testHandler +// res, err := fs.ListPhysical(ctx, "/") +// asserts.NoError(err) +// asserts.Len(res, 1) +// asserts.Equal("1", res[0].Name) +// } +//} func TestFileSystem_List(t *testing.T) { asserts := assert.New(t) diff --git a/pkg/filesystem/upload_test.go b/pkg/filesystem/upload_test.go index 74f7abe..1f1b963 100644 --- a/pkg/filesystem/upload_test.go +++ b/pkg/filesystem/upload_test.go @@ -2,30 +2,32 @@ package filesystem import ( "context" - "errors" - "io" - "io/ioutil" - "net/http" - "net/http/httptest" - "net/url" - "strings" - "testing" - - model "github.com/cloudreve/Cloudreve/v3/models" - "github.com/cloudreve/Cloudreve/v3/pkg/cache" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/response" "github.com/cloudreve/Cloudreve/v3/pkg/serializer" - "github.com/gin-gonic/gin" - "github.com/jinzhu/gorm" - "github.com/stretchr/testify/assert" testMock "github.com/stretchr/testify/mock" + "net/url" ) type FileHeaderMock struct { testMock.Mock } +func (m FileHeaderMock) Put(ctx context.Context, file fsctx.FileHeader) error { + args := m.Called(ctx, file) + return args.Error(0) +} + +func (m FileHeaderMock) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession, file fsctx.FileHeader) (*serializer.UploadCredential, error) { + args := m.Called(ctx, ttl, uploadSession, file) + return args.Get(0).(*serializer.UploadCredential), args.Error(1) +} + +func (m FileHeaderMock) CancelToken(ctx context.Context, uploadSession *serializer.UploadSession) error { + args := m.Called(ctx, uploadSession) + return args.Error(0) +} + func (m FileHeaderMock) List(ctx context.Context, path string, recursive bool) ([]response.Object, error) { args := m.Called(ctx, path, recursive) return args.Get(0).([]response.Object), args.Error(1) @@ -36,11 +38,6 @@ func (m FileHeaderMock) Get(ctx context.Context, path string) (response.RSCloser return args.Get(0).(response.RSCloser), args.Error(1) } -func (m FileHeaderMock) Put(ctx context.Context, file io.ReadCloser, dst string, size uint64) error { - args := m.Called(ctx, file, dst) - return args.Error(0) -} - func (m FileHeaderMock) Delete(ctx context.Context, files []string) ([]string, error) { args := m.Called(ctx, files) return args.Get(0).([]string), args.Error(1) @@ -56,182 +53,177 @@ func (m FileHeaderMock) Source(ctx context.Context, path string, url url.URL, ex return args.Get(0).(string), args.Error(1) } -func (m FileHeaderMock) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession) (serializer.UploadCredential, error) { - args := m.Called(ctx, ttl, uploadSession) - return args.Get(0).(serializer.UploadCredential), args.Error(1) -} - -func TestFileSystem_Upload(t *testing.T) { - asserts := assert.New(t) - - // 正常 - testHandler := new(FileHeaderMock) - testHandler.On("Put", testMock.Anything, testMock.Anything, testMock.Anything).Return(nil) - fs := &FileSystem{ - Handler: testHandler, - User: &model.User{ - Model: gorm.Model{ - ID: 1, - }, - Policy: model.Policy{ - AutoRename: false, - DirNameRule: "{path}", - }, - }, - } - ctx, cancel := context.WithCancel(context.Background()) - c, _ := gin.CreateTestContext(httptest.NewRecorder()) - c.Request, _ = http.NewRequest("POST", "/", nil) - ctx = context.WithValue(ctx, fsctx.GinCtx, c) - cancel() - file := fsctx.FileStream{ - Size: 5, - VirtualPath: "/", - Name: "1.txt", - } - err := fs.Upload(ctx, file) - asserts.NoError(err) - - // 正常，上下文已指定源文件 - testHandler = new(FileHeaderMock) - testHandler.On("Put", testMock.Anything, testMock.Anything, "123/123.txt").Return(nil) - fs = &FileSystem{ - Handler: testHandler, - User: &model.User{ - Model: gorm.Model{ - ID: 1, - }, - Policy: model.Policy{ - AutoRename: false, - DirNameRule: "{path}", - }, - }, - } - ctx, cancel = context.WithCancel(context.Background()) - c, _ = gin.CreateTestContext(httptest.NewRecorder()) - c.Request, _ = http.NewRequest("POST", "/", nil) - ctx = context.WithValue(ctx, fsctx.GinCtx, c) - ctx = context.WithValue(ctx, fsctx.FileModelCtx, model.File{SourceName: "123/123.txt"}) - cancel() - file = fsctx.FileStream{ - Size: 5, - VirtualPath: "/", - Name: "1.txt", - File: ioutil.NopCloser(strings.NewReader("")), - } - err = fs.Upload(ctx, file) - asserts.NoError(err) - - // BeforeUpload 返回错误 - fs.Use("BeforeUpload", func(ctx context.Context, fs *FileSystem) error { - return errors.New("error") - }) - err = fs.Upload(ctx, file) - asserts.Error(err) - fs.Hooks["BeforeUpload"] = nil - testHandler.AssertExpectations(t) - - // 上传文件失败 - testHandler2 := new(FileHeaderMock) - testHandler2.On("Put", testMock.Anything, testMock.Anything, testMock.Anything).Return(errors.New("error")) - fs.Handler = testHandler2 - err = fs.Upload(ctx, file) - asserts.Error(err) - testHandler2.AssertExpectations(t) - - // AfterUpload失败 - testHandler3 := new(FileHeaderMock) - testHandler3.On("Put", testMock.Anything, testMock.Anything, testMock.Anything).Return(nil) - fs.Handler = testHandler3 - fs.Use("AfterUpload", func(ctx context.Context, fs *FileSystem) error { - return errors.New("error") - }) - fs.Use("AfterValidateFailed", func(ctx context.Context, fs *FileSystem) error { - return errors.New("error") - }) - err = fs.Upload(ctx, file) - asserts.Error(err) - testHandler2.AssertExpectations(t) - -} - -func TestFileSystem_GenerateSavePath_Anonymous(t *testing.T) { - asserts := assert.New(t) - fs := FileSystem{User: &model.User{}} - ctx := context.WithValue( - context.Background(), - fsctx.UploadPolicyCtx, - serializer.UploadPolicy{ - SavePath: "{randomkey16}", - AutoRename: false, - }, - ) - - savePath := fs.GenerateSavePath(ctx, fsctx.FileStream{ - Name: "test.test", - }) - asserts.Len(savePath, 26) - asserts.Contains(savePath, "test.test") -} - -func TestFileSystem_GetUploadToken(t *testing.T) { - asserts := assert.New(t) - fs := FileSystem{User: &model.User{Model: gorm.Model{ID: 1}}} - ctx := context.Background() - - // 成功 - { - cache.SetSettings(map[string]string{ - "upload_credential_timeout": "10", - "upload_session_timeout": "10", - }, "setting_") - testHandler := new(FileHeaderMock) - testHandler.On("Token", testMock.Anything, int64(10), testMock.Anything).Return(serializer.UploadCredential{Token: "test"}, nil) - fs.Handler = testHandler - res, err := fs.CreateUploadSession(ctx, "/", 10, "123") - testHandler.AssertExpectations(t) - asserts.NoError(err) - asserts.Equal("test", res.Token) - } - - // 无法获取上传凭证 - { - cache.SetSettings(map[string]string{ - "upload_credential_timeout": "10", - "upload_session_timeout": "10", - }, "setting_") - testHandler := new(FileHeaderMock) - testHandler.On("Token", testMock.Anything, int64(10), testMock.Anything).Return(serializer.UploadCredential{}, errors.New("error")) - fs.Handler = testHandler - _, err := fs.CreateUploadSession(ctx, "/", 10, "123") - testHandler.AssertExpectations(t) - asserts.Error(err) - } -} - -func TestFileSystem_UploadFromStream(t *testing.T) { - asserts := assert.New(t) - fs := FileSystem{User: &model.User{Model: gorm.Model{ID: 1}}} - ctx := context.Background() - - err := fs.UploadFromStream(ctx, ioutil.NopCloser(strings.NewReader("123")), "/1.txt", 1) - asserts.Error(err) -} - -func TestFileSystem_UploadFromPath(t *testing.T) { - asserts := assert.New(t) - fs := FileSystem{User: &model.User{Policy: model.Policy{Type: "mock"}, Model: gorm.Model{ID: 1}}} - ctx := context.Background() - - // 文件不存在 - { - err := fs.UploadFromPath(ctx, "test/not_exist", "/", true) - asserts.Error(err) - } - - // 文存在,上传失败 - { - err := fs.UploadFromPath(ctx, "tests/test.zip", "/", true) - asserts.Error(err) - } -} +//func TestFileSystem_Upload(t *testing.T) { +// asserts := assert.New(t) +// +// // 正常 +// testHandler := new(FileHeaderMock) +// testHandler.On("Put", testMock.Anything, testMock.Anything, testMock.Anything).Return(nil) +// fs := &FileSystem{ +// Handler: testHandler, +// User: &model.User{ +// Model: gorm.Model{ +// ID: 1, +// }, +// Policy: model.Policy{ +// AutoRename: false, +// DirNameRule: "{path}", +// }, +// }, +// } +// ctx, cancel := context.WithCancel(context.Background()) +// c, _ := gin.CreateTestContext(httptest.NewRecorder()) +// c.Request, _ = http.NewRequest("POST", "/", nil) +// ctx = context.WithValue(ctx, fsctx.GinCtx, c) +// cancel() +// file := fsctx.FileStream{ +// Size: 5, +// VirtualPath: "/", +// Name: "1.txt", +// } +// err := fs.Upload(ctx, file) +// asserts.NoError(err) +// +// // 正常，上下文已指定源文件 +// testHandler = new(FileHeaderMock) +// testHandler.On("Put", testMock.Anything, testMock.Anything, "123/123.txt").Return(nil) +// fs = &FileSystem{ +// Handler: testHandler, +// User: &model.User{ +// Model: gorm.Model{ +// ID: 1, +// }, +// Policy: model.Policy{ +// AutoRename: false, +// DirNameRule: "{path}", +// }, +// }, +// } +// ctx, cancel = context.WithCancel(context.Background()) +// c, _ = gin.CreateTestContext(httptest.NewRecorder()) +// c.Request, _ = http.NewRequest("POST", "/", nil) +// ctx = context.WithValue(ctx, fsctx.GinCtx, c) +// ctx = context.WithValue(ctx, fsctx.FileModelCtx, model.File{SourceName: "123/123.txt"}) +// cancel() +// file = fsctx.FileStream{ +// Size: 5, +// VirtualPath: "/", +// Name: "1.txt", +// File: ioutil.NopCloser(strings.NewReader("")), +// } +// err = fs.Upload(ctx, file) +// asserts.NoError(err) +// +// // BeforeUpload 返回错误 +// fs.Use("BeforeUpload", func(ctx context.Context, fs *FileSystem) error { +// return errors.New("error") +// }) +// err = fs.Upload(ctx, file) +// asserts.Error(err) +// fs.Hooks["BeforeUpload"] = nil +// testHandler.AssertExpectations(t) +// +// // 上传文件失败 +// testHandler2 := new(FileHeaderMock) +// testHandler2.On("Put", testMock.Anything, testMock.Anything, testMock.Anything).Return(errors.New("error")) +// fs.Handler = testHandler2 +// err = fs.Upload(ctx, file) +// asserts.Error(err) +// testHandler2.AssertExpectations(t) +// +// // AfterUpload失败 +// testHandler3 := new(FileHeaderMock) +// testHandler3.On("Put", testMock.Anything, testMock.Anything, testMock.Anything).Return(nil) +// fs.Handler = testHandler3 +// fs.Use("AfterUpload", func(ctx context.Context, fs *FileSystem) error { +// return errors.New("error") +// }) +// fs.Use("AfterValidateFailed", func(ctx context.Context, fs *FileSystem) error { +// return errors.New("error") +// }) +// err = fs.Upload(ctx, file) +// asserts.Error(err) +// testHandler2.AssertExpectations(t) +// +//} +// +//func TestFileSystem_GenerateSavePath_Anonymous(t *testing.T) { +// asserts := assert.New(t) +// fs := FileSystem{User: &model.User{}} +// ctx := context.WithValue( +// context.Background(), +// fsctx.UploadPolicyCtx, +// serializer.UploadPolicy{ +// SavePath: "{randomkey16}", +// AutoRename: false, +// }, +// ) +// +// savePath := fs.GenerateSavePath(ctx, fsctx.FileStream{ +// Name: "test.test", +// }) +// asserts.Len(savePath, 26) +// asserts.Contains(savePath, "test.test") +//} +// +//func TestFileSystem_GetUploadToken(t *testing.T) { +// asserts := assert.New(t) +// fs := FileSystem{User: &model.User{Model: gorm.Model{ID: 1}}} +// ctx := context.Background() +// +// // 成功 +// { +// cache.SetSettings(map[string]string{ +// "upload_credential_timeout": "10", +// "upload_session_timeout": "10", +// }, "setting_") +// testHandler := new(FileHeaderMock) +// testHandler.On("Token", testMock.Anything, int64(10), testMock.Anything).Return(serializer.UploadCredential{Token: "test"}, nil) +// fs.Handler = testHandler +// res, err := fs.CreateUploadSession(ctx, "/", 10, "123") +// testHandler.AssertExpectations(t) +// asserts.NoError(err) +// asserts.Equal("test", res.Token) +// } +// +// // 无法获取上传凭证 +// { +// cache.SetSettings(map[string]string{ +// "upload_credential_timeout": "10", +// "upload_session_timeout": "10", +// }, "setting_") +// testHandler := new(FileHeaderMock) +// testHandler.On("Token", testMock.Anything, int64(10), testMock.Anything).Return(serializer.UploadCredential{}, errors.New("error")) +// fs.Handler = testHandler +// _, err := fs.CreateUploadSession(ctx, "/", 10, "123") +// testHandler.AssertExpectations(t) +// asserts.Error(err) +// } +//} +// +//func TestFileSystem_UploadFromStream(t *testing.T) { +// asserts := assert.New(t) +// fs := FileSystem{User: &model.User{Model: gorm.Model{ID: 1}}} +// ctx := context.Background() +// +// err := fs.UploadFromStream(ctx, ioutil.NopCloser(strings.NewReader("123")), "/1.txt", 1) +// asserts.Error(err) +//} +// +//func TestFileSystem_UploadFromPath(t *testing.T) { +// asserts := assert.New(t) +// fs := FileSystem{User: &model.User{Policy: model.Policy{Type: "mock"}, Model: gorm.Model{ID: 1}}} +// ctx := context.Background() +// +// // 文件不存在 +// { +// err := fs.UploadFromPath(ctx, "test/not_exist", "/", true) +// asserts.Error(err) +// } +// +// // 文存在,上传失败 +// { +// err := fs.UploadFromPath(ctx, "tests/test.zip", "/", true) +// asserts.Error(err) +// } +//} diff --git a/pkg/mocks/remoteclientmock/mock.go b/pkg/mocks/remoteclientmock/mock.go new file mode 100644 index 0000000..dee4735 --- /dev/null +++ b/pkg/mocks/remoteclientmock/mock.go @@ -0,0 +1,32 @@ +package remoteclientmock + +import ( + "context" + "github.com/cloudreve/Cloudreve/v3/pkg/filesystem/fsctx" + "github.com/cloudreve/Cloudreve/v3/pkg/serializer" + "github.com/stretchr/testify/mock" +) + +type RemoteClientMock struct { + mock.Mock +} + +func (r *RemoteClientMock) CreateUploadSession(ctx context.Context, session *serializer.UploadSession, ttl int64) error { + return r.Called(ctx, session, ttl).Error(0) +} + +func (r *RemoteClientMock) GetUploadURL(ttl int64, sessionID string) (string, string, error) { + args := r.Called(ttl, sessionID) + + return args.String(0), args.String(1), args.Error(2) +} + +func (r *RemoteClientMock) Upload(ctx context.Context, file fsctx.FileHeader) error { + args := r.Called(ctx, file) + return args.Error(0) +} + +func (r *RemoteClientMock) DeleteUploadSession(ctx context.Context, sessionID string) error { + args := r.Called(ctx, sessionID) + return args.Error(0) +} diff --git a/pkg/mocks/requestmock/request.go b/pkg/mocks/requestmock/request.go index 41581b2..7e6ca1b 100644 --- a/pkg/mocks/requestmock/request.go +++ b/pkg/mocks/requestmock/request.go @@ -1,4 +1,4 @@ -package controllermock +package requestmock import ( "github.com/cloudreve/Cloudreve/v3/pkg/request"