diff options
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/common.go | 11 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 930695f4b..dfed891b4 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -9,9 +9,9 @@ import ( "fmt" "io" "io/fs" + "mime" "mime/multipart" "net/http" - "net/url" "path/filepath" "strconv" "strings" @@ -286,14 +286,15 @@ func adjustHeaderContentDisposition(w http.ResponseWriter, r *http.Request, file return } if filename != "" { - filename = url.QueryEscape(filename) - contentDisposition := "inline" + dispositionType := "inline" if r.FormValue("dl") != "" { if dl, _ := strconv.ParseBool(r.FormValue("dl")); dl { - contentDisposition = "attachment" + dispositionType = "attachment" } } - w.Header().Set("Content-Disposition", contentDisposition+`; filename="`+fileNameEscaper.Replace(filename)+`"`) + // Use mime.FormatMediaType for RFC 6266 compliant Content-Disposition, + // properly handling non-ASCII characters and special characters + w.Header().Set("Content-Disposition", mime.FormatMediaType(dispositionType, map[string]string{"filename": filename})) } } diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index a29ebd183..1fad742db 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -34,8 +34,6 @@ import ( const reqIsProxied = "proxied" -var fileNameEscaper = strings.NewReplacer(`\`, `\\`, `"`, `\"`) - func NotFound(w http.ResponseWriter) { stats.VolumeServerHandlerCounter.WithLabelValues(stats.ErrorGetNotFound).Inc() w.WriteHeader(http.StatusNotFound) |