gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

escape file name only when necessary

Browse Source
This commit is contained in:
Chris Lu
2021-10-11 23:33:45 -07:00
parent 8e9273db99
commit 34f764007f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/server/common.go
View File

@@ -9,6 +9,7 @@ import (
"io/fs" "io/fs"
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"net/url"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@@ -256,6 +257,7 @@ func adjustHeaderContentDisposition(w http.ResponseWriter, r *http.Request, file
return return
} }
if filename != "" { if filename != "" {
filename = url.QueryEscape(filename)
contentDisposition := "inline" contentDisposition := "inline"
if r.FormValue("dl") != "" { if r.FormValue("dl") != "" {
if dl, _ := strconv.ParseBool(r.FormValue("dl")); dl { if dl, _ := strconv.ParseBool(r.FormValue("dl")); dl {

2
weed/server/filer_server_handlers_read.go
View File

@@ -7,7 +7,6 @@ import (
"io" "io"
"mime" "mime"
"net/http" "net/http"
"net/url"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@@ -133,7 +132,6 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
setEtag(w, etag) setEtag(w, etag)
filename := entry.Name() filename := entry.Name()
filename = url.QueryEscape(filename)
adjustHeaderContentDisposition(w, r, filename) adjustHeaderContentDisposition(w, r, filename)
totalSize := int64(entry.Size()) totalSize := int64(entry.Size())