diff --git a/pkg/filesystem/filesystem.go b/pkg/filesystem/filesystem.go index 90bad07..be0b825 100644 --- a/pkg/filesystem/filesystem.go +++ b/pkg/filesystem/filesystem.go @@ -7,6 +7,7 @@ import ( "github.com/HFO4/cloudreve/pkg/filesystem/local" "github.com/HFO4/cloudreve/pkg/filesystem/remote" "github.com/HFO4/cloudreve/pkg/filesystem/response" + "github.com/HFO4/cloudreve/pkg/request" "github.com/HFO4/cloudreve/pkg/serializer" "github.com/gin-gonic/gin" "io" @@ -152,6 +153,7 @@ func (fs *FileSystem) dispatchHandler() error { case "remote": fs.Handler = remote.Handler{ Policy: currentPolicy, + Client: request.HTTPClient{}, } return nil default: diff --git a/pkg/filesystem/remote/handler.go b/pkg/filesystem/remote/handler.go index f83b662..f80715d 100644 --- a/pkg/filesystem/remote/handler.go +++ b/pkg/filesystem/remote/handler.go @@ -22,7 +22,7 @@ import ( // Handler 远程存储策略适配器 type Handler struct { - client request.HTTPClient + Client request.Client Policy *model.Policy } @@ -69,7 +69,7 @@ func (handler Handler) Delete(ctx context.Context, files []string) ([]string, er // 发送删除请求 bodyReader := strings.NewReader(string(reqBodyEncoded)) authInstance := auth.HMACAuth{SecretKey: []byte(handler.Policy.SecretKey)} - resp, err := handler.client.Request( + resp, err := handler.Client.Request( "POST", handler.getAPI("delete"), bodyReader, @@ -87,9 +87,11 @@ func (handler Handler) Delete(ctx context.Context, files []string) ([]string, er } if reqResp.Code != 0 { var failedResp serializer.RemoteDeleteRequest - err = json.Unmarshal([]byte(reqResp.Data.(string)), &failedResp) - if err == nil { - return failedResp.Files, errors.New(reqResp.Error) + if failed, ok := reqResp.Data.(string); ok { + err = json.Unmarshal([]byte(failed), &failedResp) + if err == nil { + return failedResp.Files, errors.New(reqResp.Error) + } } return files, errors.New("未知的返回结果格式") } diff --git a/pkg/filesystem/remote/handler_test.go b/pkg/filesystem/remote/handler_test.go index 5a24465..1cc5b9e 100644 --- a/pkg/filesystem/remote/handler_test.go +++ b/pkg/filesystem/remote/handler_test.go @@ -6,9 +6,15 @@ import ( "github.com/HFO4/cloudreve/pkg/auth" "github.com/HFO4/cloudreve/pkg/cache" "github.com/HFO4/cloudreve/pkg/filesystem/fsctx" + "github.com/HFO4/cloudreve/pkg/request" "github.com/HFO4/cloudreve/pkg/serializer" "github.com/stretchr/testify/assert" + testMock "github.com/stretchr/testify/mock" + "io" + "io/ioutil" + "net/http" "net/url" + "strings" "testing" ) @@ -85,3 +91,93 @@ func TestHandler_Source(t *testing.T) { asserts.Contains(res, "api/v3/slave/source/0") } } + +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 TestHandler_Delete(t *testing.T) { + asserts := assert.New(t) + handler := Handler{ + Policy: &model.Policy{ + SecretKey: "test", + Server: "http://test.com", + }, + } + ctx := context.Background() + + // 成功 + { + clientMock := ClientMock{} + clientMock.On( + "Request", + "POST", + "http://test.com/api/v3/slave/delete", + testMock.Anything, + testMock.Anything, + ).Return(request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":0}`)), + }, + }) + handler.Client = clientMock + failed, err := handler.Delete(ctx, []string{"/test1.txt", "test2.txt"}) + clientMock.AssertExpectations(t) + asserts.NoError(err) + asserts.Len(failed, 0) + + } + + // 结果解析失败 + { + clientMock := ClientMock{} + clientMock.On( + "Request", + "POST", + "http://test.com/api/v3/slave/delete", + testMock.Anything, + testMock.Anything, + ).Return(request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":203}`)), + }, + }) + handler.Client = clientMock + failed, err := handler.Delete(ctx, []string{"/test1.txt", "test2.txt"}) + clientMock.AssertExpectations(t) + asserts.Error(err) + asserts.Len(failed, 2) + } + + // 一个失败 + { + clientMock := ClientMock{} + clientMock.On( + "Request", + "POST", + "http://test.com/api/v3/slave/delete", + testMock.Anything, + testMock.Anything, + ).Return(request.Response{ + Err: nil, + Response: &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(strings.NewReader(`{"code":203,"data":"{\"files\":[\"1\"]}"}`)), + }, + }) + handler.Client = clientMock + failed, err := handler.Delete(ctx, []string{"/test1.txt", "test2.txt"}) + clientMock.AssertExpectations(t) + asserts.Error(err) + asserts.Len(failed, 1) + } +}