mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chinese Filename Bug Fix (#1366)

Browse Source
This commit is contained in:
adfost
2022-01-11 15:11:47 -08:00
committed by GitHub
parent 9997afeedc
commit 3a0a2b14d9
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts
View File

@@ -32,7 +32,6 @@ export const download = (
} }
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open("GET", path, true); req.open("GET", path, true);
req.addEventListener( req.addEventListener(
"progress", "progress",
@@ -52,9 +51,9 @@ export const download = (
const rspHeader = req.getResponseHeader("Content-Disposition"); const rspHeader = req.getResponseHeader("Content-Disposition");
let filename = "download"; let filename = "download";
if (rspHeader) { if (rspHeader) {
filename = rspHeader.split('"')[1]; let rspHeaderDecoded = decodeURIComponent(rspHeader);
filename = rspHeaderDecoded.split('"')[1];
} }
if (completeCallback) { if (completeCallback) {

11
restapi/user_objects.go
View File

@@ -24,6 +24,7 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"net/url"
"path" "path"
"path/filepath" "path/filepath"
"regexp" "regexp"
@@ -395,6 +396,7 @@ func getDownloadObjectResponse(session *models.Principal, params user_api.Downlo
filename = prefixElements[len(prefixElements)-1] filename = prefixElements[len(prefixElements)-1]
} }
} }
escapedName := url.PathEscape(filename)
// indicate object size & content type // indicate object size & content type
stat, err := resp.Stat() stat, err := resp.Stat()
@@ -411,11 +413,11 @@ func getDownloadObjectResponse(session *models.Principal, params user_api.Downlo
} }
if isPreview { if isPreview {
rw.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"%s\"", filename)) rw.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"%s\"", escapedName))
rw.Header().Set("X-Frame-Options", "SAMEORIGIN") rw.Header().Set("X-Frame-Options", "SAMEORIGIN")
rw.Header().Set("X-XSS-Protection", "1") rw.Header().Set("X-XSS-Protection", "1")
} else { } else {
rw.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) rw.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", escapedName))
} }
rw.Header().Set("Last-Modified", stat.LastModified.UTC().Format(http.TimeFormat)) rw.Header().Set("Last-Modified", stat.LastModified.UTC().Format(http.TimeFormat))
@@ -424,7 +426,7 @@ func getDownloadObjectResponse(session *models.Principal, params user_api.Downlo
if isPreview { if isPreview {
// In case content type was uploaded as octet-stream, we double verify content type // In case content type was uploaded as octet-stream, we double verify content type
if stat.ContentType == "application/octet-stream" { if stat.ContentType == "application/octet-stream" {
contentType = mimedb.TypeByExtension(filepath.Ext(filename)) contentType = mimedb.TypeByExtension(filepath.Ext(escapedName))
} }
} }
rw.Header().Set("Content-Type", contentType) rw.Header().Set("Content-Type", contentType)
@@ -523,8 +525,9 @@ func getDownloadFolderResponse(session *models.Principal, params user_api.Downlo
filename = prefixElements[len(prefixElements)-1] filename = prefixElements[len(prefixElements)-1]
} }
} }
escapedName := url.PathEscape(filename)
rw.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s.zip\"", filename)) rw.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s.zip\"", escapedName))
rw.Header().Set("Content-Type", "application/zip") rw.Header().Set("Content-Type", "application/zip")
// Copy the stream // Copy the stream