Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Fix: cannot edit file in remote server / Modify: separate preview and text-file content controller

Browse source
This commit is contained in:
HFO4 2020-01-04 15:49:08 +08:00
parent 93dc25aabb
commit d94896041e
10 changed files with 84 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/filesystem/archive.go
View file

@ -93,7 +93,6 @@ func (fs *FileSystem) Compress(ctx context.Context, folderIDs, fileIDs []uint) (
}
// cancelCompress 取消压缩进程
// TODO 测试
func (fs *FileSystem) cancelCompress(ctx context.Context, zipWriter *zip.Writer, file *os.File, path string) {
util.Log().Debug("客户端取消压缩请求")
zipWriter.Close()

13
pkg/filesystem/file.go
View file

@ -88,14 +88,23 @@ func (fs *FileSystem) GetPhysicalFileContent(ctx context.Context, path string) (
}
// Preview 预览文件
func (fs *FileSystem) Preview(ctx context.Context, path string) (*response.ContentResponse, error) {
// path - 文件虚拟路径
// isText - 是否为文本文件，文本文件会忽略重定向，直接由
// 服务端拉取中转给用户，故会对文件大小进行限制
func (fs *FileSystem) Preview(ctx context.Context, path string, isText bool) (*response.ContentResponse, error) {
err := fs.resetFileIfNotExist(ctx, path)
if err != nil {
return nil, err
}
// 如果是文本文件预览，需要检查大小限制
sizeLimit := model.GetIntSetting("maxEditSize", 2<<20)
if fs.FileTarget[0].Size > uint64(sizeLimit) {
return nil, ErrFileSizeTooBig
}
// 是否直接返回文件内容
if fs.Policy.IsDirectlyPreview() {
if isText || fs.Policy.IsDirectlyPreview() {
resp, err := fs.GetDownloadContent(ctx, path)
if err != nil {
return nil, err

30
pkg/filesystem/file_test.go
View file

@ -510,7 +510,7 @@ func TestFileSystem_Preview(t *testing.T) {
User: &model.User{},
}
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id"}))
resp, err := fs.Preview(ctx, "/1.txt")
resp, err := fs.Preview(ctx, "/1.txt", false)
asserts.NoError(mock.ExpectationsWereMet())
asserts.Error(err)
asserts.Nil(resp)
@ -530,7 +530,7 @@ func TestFileSystem_Preview(t *testing.T) {
},
},
}
resp, err := fs.Preview(ctx, "/1.txt")
resp, err := fs.Preview(ctx, "/1.txt", false)
asserts.Error(err)
asserts.Nil(resp)
}
@ -550,7 +550,7 @@ func TestFileSystem_Preview(t *testing.T) {
},
},
}
resp, err := fs.Preview(ctx, "/1.txt")
resp, err := fs.Preview(ctx, "/1.txt", false)
asserts.NoError(err)
asserts.NotNil(resp)
asserts.False(resp.Redirect)
@ -573,9 +573,31 @@ func TestFileSystem_Preview(t *testing.T) {
},
}
asserts.NoError(cache.Set("setting_preview_timeout", "233", 0))
resp, err := fs.Preview(ctx, "/1.txt")
resp, err := fs.Preview(ctx, "/1.txt", false)
asserts.NoError(err)
asserts.NotNil(resp)
asserts.True(resp.Redirect)
}
// 文本文件，大小超出限制
{
fs := FileSystem{
User: &model.User{},
}
fs.FileTarget = []model.File{
{
SourceName: "tests/file1.txt",
PolicyID: 1,
Policy: model.Policy{
Model: gorm.Model{ID: 1},
Type: "remote",
},
Size: 11,
},
}
asserts.NoError(cache.Set("setting_maxEditSize", "10", 0))
resp, err := fs.Preview(ctx, "/1.txt", true)
asserts.Equal(ErrFileSizeTooBig, err)
asserts.Nil(resp)
}
}

13
pkg/request/request.go
View file

@ -151,6 +151,7 @@ func (resp *Response) CheckHTTPResponse(status int) *Response {
type nopRSCloser struct {
body io.ReadCloser
size int64
}
// GetRSCloser 返回带有空seeker的body reader
@ -161,6 +162,7 @@ func (resp *Response) GetRSCloser() (response.RSCloser, error) {
return nopRSCloser{
body: resp.Response.Body,
size: resp.Response.ContentLength,
}, resp.Err
}
@ -174,7 +176,16 @@ func (instance nopRSCloser) Close() error {
return instance.body.Close()
}
// 实现 nopRSCloser seeker
// 实现 nopRSCloser seeker, 只实现seek开头/结尾以便http.ServeContent用于确定正文大小
func (instance nopRSCloser) Seek(offset int64, whence int) (int64, error) {
if offset == 0 {
switch whence {
case io.SeekStart:
return 0, nil
case io.SeekEnd:
return instance.size, nil
}
}
return 0, errors.New("未实现")
}

10
pkg/request/request_test.go
View file

@ -156,14 +156,20 @@ func TestResponse_GetRSCloser(t *testing.T) {
// 正常
{
resp := Response{
Response: &http.Response{Body: ioutil.NopCloser(strings.NewReader("123"))},
Response: &http.Response{ContentLength: 3, Body: ioutil.NopCloser(strings.NewReader("123"))},
}
res, err := resp.GetRSCloser()
asserts.NoError(err)
content, err := ioutil.ReadAll(res)
asserts.NoError(err)
asserts.Equal("123", string(content))
_, err = res.Seek(0, 0)
offset, err := res.Seek(0, 0)
asserts.NoError(err)
asserts.Equal(int64(0), offset)
offset, err = res.Seek(0, 2)
asserts.NoError(err)
asserts.Equal(int64(3), offset)
_, err = res.Seek(1, 2)
asserts.Error(err)
asserts.NoError(res.Close())
}

2
pkg/request/slave_test.go
View file

@ -26,7 +26,7 @@ func TestRemoteCallback(t *testing.T) {
"http://test/test/url",
testMock.Anything,
testMock.Anything,
).Return(Response{
).Return(&Response{
Err: nil,
Response: &http.Response{
StatusCode: 200,

2
pkg/webdav/webdav.go
View file

@ -230,7 +230,7 @@ func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request, fs *
ctx := r.Context()
rs, err := fs.Preview(ctx, reqPath)
rs, err := fs.Preview(ctx, reqPath, false)
if err != nil {
if err == filesystem.ErrObjectNotExist {
return http.StatusNotFound, err

20
routers/controllers/file.go
View file

@ -143,7 +143,7 @@ func Preview(c *gin.Context) {
var service explorer.SingleFileService
if err := c.ShouldBindUri(&service); err == nil {
res := service.PreviewContent(ctx, c)
res := service.PreviewContent(ctx, c, false)
// 是否需要重定向
if res.Code == -301 {
c.Redirect(301, res.Data.(string))
@ -158,6 +158,24 @@ func Preview(c *gin.Context) {
}
}
// PreviewText 预览文本文件
func PreviewText(c *gin.Context) {
// 创建上下文
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
var service explorer.SingleFileService
if err := c.ShouldBindUri(&service); err == nil {
res := service.PreviewContent(ctx, c, true)
// 是否有错误发生
if res.Code != 0 {
c.JSON(200, res)
}
} else {
c.JSON(200, ErrorResponse(err))
}
}
// GetDocPreview 获取DOC文件预览地址
func GetDocPreview(c *gin.Context) {
// 创建上下文

2
routers/router.go
View file

@ -166,6 +166,8 @@ func InitMasterRouter() *gin.Engine {
file.PUT("download/*path", controllers.CreateDownloadSession)
// 预览文件
file.GET("preview/*path", controllers.Preview)
// 获取文本文件内容
file.GET("content/*path", controllers.PreviewText)
// 取得Office文档预览地址
file.GET("doc/*path", controllers.GetDocPreview)
// 获取缩略图

7
service/explorer/file.go
View file

@ -208,8 +208,9 @@ func (service *DownloadService) Download(ctx context.Context, c *gin.Context) se
}
}
// PreviewContent 预览文件，需要登录会话
func (service *SingleFileService) PreviewContent(ctx context.Context, c *gin.Context) serializer.Response {
// PreviewContent 预览文件，需要登录会话, isText - 是否为文本文件，文本文件会
// 强制经由服务端中转
func (service *SingleFileService) PreviewContent(ctx context.Context, c *gin.Context, isText bool) serializer.Response {
// 创建文件系统
fs, err := filesystem.NewFileSystemFromContext(c)
if err != nil {
@ -218,7 +219,7 @@ func (service *SingleFileService) PreviewContent(ctx context.Context, c *gin.Con
defer fs.Recycle()
// 获取文件预览响应
resp, err := fs.Preview(ctx, service.Path)
resp, err := fs.Preview(ctx, service.Path, isText)
if err != nil {
return serializer.Err(serializer.CodeNotSet, err.Error(), err)
}