wsy182/Cloudreve
1
0
Fork 0
mirror of https://github.com/halejohn/Cloudreve.git synced 2026-01-27 18:11:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify: decoupling getSignedURL modules

Browse Source
This commit is contained in:
HFO4
2019-12-16 12:52:35 +08:00
parent 6ada69f637
commit 9a942f8b48
7 changed files with 98 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
pkg/filesystem/local/handler.go
View File

@@ -111,47 +111,52 @@ func (handler Handler) Thumb(ctx context.Context, path string) (*response.Conten
}
// Source 获取外链URL
func (handler Handler) Source(ctx context.Context, path string, url url.URL, expires int64) (string, error) {
func (handler Handler) Source(
ctx context.Context,
path string,
baseURL url.URL,
ttl int64,
isDownload bool,
) (string, error) {
file, ok := ctx.Value(fsctx.FileModelCtx).(model.File)
if !ok {
return "", errors.New("无法获取文件记录上下文")
}
// 签名生成文件记录
signedURI, err := auth.SignURI(
fmt.Sprintf("/api/v3/file/get/%d/%s", file.ID, file.Name),
0,
var expires int64
if ttl > 0 {
expires = time.Now().Unix() + ttl
}
var (
signedURI *url.URL
err error
)
if isDownload {
// 创建下载会话，将文件信息写入缓存
downloadSessionID := util.RandStringRunes(16)
err = cache.Set("download_"+downloadSessionID, file, int(ttl))
if err != nil {
return "", serializer.NewError(serializer.CodeCacheOperation, "无法创建下載会话", err)
}
// 签名生成文件记录
signedURI, err = auth.SignURI(
fmt.Sprintf("/api/v3/file/download/%s", downloadSessionID),
expires,
)
} else {
// 签名生成文件记录
signedURI, err = auth.SignURI(
fmt.Sprintf("/api/v3/file/get/%d/%s", file.ID, file.Name),
expires,
)
}
if err != nil {
return "", serializer.NewError(serializer.CodeEncryptError, "无法对URL进行签名", err)
}
finalURL := url.ResolveReference(signedURI).String()
return finalURL, nil
}
func (handler Handler) GetDownloadURL(ctx context.Context, path string, url url.URL, ttl int64) (string, error) {
file, ok := ctx.Value(fsctx.FileModelCtx).(model.File)
if !ok {
return "", errors.New("无法获取文件记录上下文")
}
// 创建下载会话，将文件信息写入缓存
downloadSessionID := util.RandStringRunes(16)
err := cache.Set("download_"+downloadSessionID, file, int(ttl))
if err != nil {
return "", serializer.NewError(serializer.CodeCacheOperation, "无法创建下載会话", err)
}
// 签名生成文件记录
signedURI, err := auth.SignURI(
fmt.Sprintf("/api/v3/file/download/%s", downloadSessionID),
time.Now().Unix()+ttl,
)
if err != nil {
return "", serializer.NewError(serializer.CodeEncryptError, "无法对URL进行签名", err)
}
finalURL := url.ResolveReference(signedURI).String()
finalURL := baseURL.ResolveReference(signedURI).String()
return finalURL, nil
}

8
pkg/filesystem/local/handller_test.go
View File

@@ -135,7 +135,7 @@ func TestHandler_Source(t *testing.T) {
ctx := context.WithValue(ctx, fsctx.FileModelCtx, file)
baseURL, err := url.Parse("https://cloudreve.org")
asserts.NoError(err)
sourceURL, err := handler.Source(ctx, "", *baseURL, 0)
sourceURL, err := handler.Source(ctx, "", *baseURL, 0, false)
asserts.NoError(err)
asserts.NotEmpty(sourceURL)
asserts.Contains(sourceURL, "sign=")
@@ -146,7 +146,7 @@ func TestHandler_Source(t *testing.T) {
{
baseURL, err := url.Parse("https://cloudreve.org")
asserts.NoError(err)
sourceURL, err := handler.Source(ctx, "", *baseURL, 0)
sourceURL, err := handler.Source(ctx, "", *baseURL, 0, false)
asserts.Error(err)
asserts.Empty(sourceURL)
}
@@ -169,7 +169,7 @@ func TestHandler_GetDownloadURL(t *testing.T) {
ctx := context.WithValue(ctx, fsctx.FileModelCtx, file)
baseURL, err := url.Parse("https://cloudreve.org")
asserts.NoError(err)
downloadURL, err := handler.GetDownloadURL(ctx, "", *baseURL, 10)
downloadURL, err := handler.Source(ctx, "", *baseURL, 10, true)
asserts.NoError(err)
asserts.Contains(downloadURL, "sign=")
asserts.Contains(downloadURL, "https://cloudreve.org")
@@ -179,7 +179,7 @@ func TestHandler_GetDownloadURL(t *testing.T) {
{
baseURL, err := url.Parse("https://cloudreve.org")
asserts.NoError(err)
downloadURL, err := handler.GetDownloadURL(ctx, "", *baseURL, 10)
downloadURL, err := handler.Source(ctx, "", *baseURL, 10, true)
asserts.Error(err)
asserts.Empty(downloadURL)
}