ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: spaces in filename will be replaced with plus sign (#3841)

Browse Source 
Co-authored-by: XZB <i@1248.ink>
This commit is contained in:
XZB-1248 2023-03-14 12:27:42 +08:00 committed by GitHub
parent f3db23a41e
commit c4108007cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s3/driver.go
View File

@ -59,7 +59,8 @@ func (d *S3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]mo
func (d *S3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) { func (d *S3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
path := getKey(file.GetPath(), false) path := getKey(file.GetPath(), false)
disposition := fmt.Sprintf(`attachment;filename="%s"`, url.QueryEscape(stdpath.Base(path))) filename := stdpath.Base(path)
disposition := fmt.Sprintf(`attachment; filename="%s"; filename*=UTF-8''%s`, filename, url.PathEscape(filename))
input := &s3.GetObjectInput{ input := &s3.GetObjectInput{
Bucket: &d.Bucket, Bucket: &d.Bucket,
Key: &path, Key: &path,

3
server/common/proxy.go
View File

@ -26,8 +26,9 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
defer func() { defer func() {
_ = link.Data.Close() _ = link.Data.Close()
}() }()
filename := file.GetName()
w.Header().Set("Content-Type", "application/octet-stream") w.Header().Set("Content-Type", "application/octet-stream")
w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"; filename*=UTF-8''%s`, file.GetName(), url.QueryEscape(file.GetName()))) w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"; filename*=UTF-8''%s`, filename, url.PathEscape(filename)))
w.Header().Set("Content-Length", strconv.FormatInt(file.GetSize(), 10)) w.Header().Set("Content-Length", strconv.FormatInt(file.GetSize(), 10))
if link.Header != nil { if link.Header != nil {
// TODO clean header with blacklist or whitelist // TODO clean header with blacklist or whitelist