github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(wopi): anonymous users cannot preview files

pull/1741/head
Aaron Liu 2023-06-11 09:45:06 +08:00
parent 173ca6cdf8
commit cbc549229b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/wopi/wopi.go
View File

@ -18,7 +18,7 @@ import (
type Client interface { type Client interface {
// NewSession creates a new document session with access token. // NewSession creates a new document session with access token.
NewSession(user *model.User, file *model.File, action ActonType) (*Session, error) NewSession(uid uint, file *model.File, action ActonType) (*Session, error)
// AvailableExts returns a list of file extensions that are supported by WOPI. // AvailableExts returns a list of file extensions that are supported by WOPI.
AvailableExts() []string AvailableExts() []string
} }
@ -116,7 +116,7 @@ func NewClient(endpoint string, cache cache.Driver, http request.Client) (Client
}, nil }, nil
} }
func (c *client) NewSession(user *model.User, file *model.File, action ActonType) (*Session, error) { func (c *client) NewSession(uid uint, file *model.File, action ActonType) (*Session, error) {
if err := c.checkDiscovery(); err != nil { if err := c.checkDiscovery(); err != nil {
return nil, err return nil, err
} }
@ -163,7 +163,7 @@ func (c *client) NewSession(user *model.User, file *model.File, action ActonType
session := &SessionCache{ session := &SessionCache{
AccessToken: fmt.Sprintf("%s.%s", sessionID, token), AccessToken: fmt.Sprintf("%s.%s", sessionID, token),
FileID: file.ID, FileID: file.ID,
UserID: user.ID, UserID: uid,
Action: action, Action: action,
} }
err = c.cache.Set(SessionCachePrefix+sessionID.String(), *session, ttl) err = c.cache.Set(SessionCachePrefix+sessionID.String(), *session, ttl)

14
pkg/wopi/wopi_test.go
View File

@ -55,7 +55,7 @@ func TestNewSession(t *testing.T) {
).Return(&request.Response{ ).Return(&request.Response{
Err: expectedErr, Err: expectedErr,
}) })
res, err := client.NewSession(&model.User{}, &model.File{}, ActionPreview) res, err := client.NewSession(0, &model.File{}, ActionPreview)
a.Nil(res) a.Nil(res)
a.ErrorIs(err, expectedErr) a.ErrorIs(err, expectedErr)
mockHttp.AssertExpectations(t) mockHttp.AssertExpectations(t)
@ -65,7 +65,7 @@ func TestNewSession(t *testing.T) {
{ {
client.discovery = &WopiDiscovery{} client.discovery = &WopiDiscovery{}
client.actions = make(map[string]map[string]Action) client.actions = make(map[string]map[string]Action)
res, err := client.NewSession(&model.User{}, &model.File{}, ActionPreview) res, err := client.NewSession(0, &model.File{}, ActionPreview)
a.Nil(res) a.Nil(res)
a.ErrorIs(err, ErrActionNotSupported) a.ErrorIs(err, ErrActionNotSupported)
} }
@ -76,7 +76,7 @@ func TestNewSession(t *testing.T) {
client.actions = map[string]map[string]Action{ client.actions = map[string]map[string]Action{
".doc": {}, ".doc": {},
} }
res, err := client.NewSession(&model.User{}, &model.File{Name: "1.doc"}, ActionPreview) res, err := client.NewSession(0, &model.File{Name: "1.doc"}, ActionPreview)
a.Nil(res) a.Nil(res)
a.ErrorIs(err, ErrActionNotSupported) a.ErrorIs(err, ErrActionNotSupported)
} }
@ -91,7 +91,7 @@ func TestNewSession(t *testing.T) {
}, },
}, },
} }
res, err := client.NewSession(&model.User{}, &model.File{Name: "1.doc"}, ActionEdit) res, err := client.NewSession(0, &model.File{Name: "1.doc"}, ActionEdit)
a.Nil(res) a.Nil(res)
a.ErrorContains(err, "invalid control character in URL") a.ErrorContains(err, "invalid control character in URL")
} }
@ -106,7 +106,7 @@ func TestNewSession(t *testing.T) {
}, },
}, },
} }
res, err := client.NewSession(&model.User{}, &model.File{Name: "1.doc"}, ActionEdit) res, err := client.NewSession(0, &model.File{Name: "1.doc"}, ActionEdit)
a.NotNil(res) a.NotNil(res)
a.NoError(err) a.NoError(err)
resUrl := res.ActionURL.String() resUrl := res.ActionURL.String()
@ -123,7 +123,7 @@ func TestNewSession(t *testing.T) {
}, },
}, },
} }
res, err := client.NewSession(&model.User{}, &model.File{Name: "1.doc"}, ActionEdit) res, err := client.NewSession(0, &model.File{Name: "1.doc"}, ActionEdit)
a.NotNil(res) a.NotNil(res)
a.NoError(err) a.NoError(err)
resUrl := res.ActionURL.String() resUrl := res.ActionURL.String()
@ -147,7 +147,7 @@ func TestNewSession(t *testing.T) {
}, },
} }
mockCache.On("Set", testMock.Anything, testMock.Anything, testMock.Anything).Return(expectedErr) mockCache.On("Set", testMock.Anything, testMock.Anything, testMock.Anything).Return(expectedErr)
res, err := client.NewSession(&model.User{}, &model.File{Name: "1.doc"}, ActionEdit) res, err := client.NewSession(0, &model.File{Name: "1.doc"}, ActionEdit)
a.Nil(res) a.Nil(res)
a.ErrorIs(err, expectedErr) a.ErrorIs(err, expectedErr)
} }

2
service/explorer/file.go
View File

@ -245,7 +245,7 @@ func (service *FileIDService) CreateDocPreviewSession(ctx context.Context, c *gi
action = wopi.ActionEdit action = wopi.ActionEdit
} }
session, err := wopi.Default.NewSession(fs.User, &fs.FileTarget[0], action) session, err := wopi.Default.NewSession(fs.FileTarget[0].UserID, &fs.FileTarget[0], action)
if err != nil { if err != nil {
return serializer.Err(serializer.CodeInternalSetting, "Failed to create WOPI session", err) return serializer.Err(serializer.CodeInternalSetting, "Failed to create WOPI session", err)
} }