Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 处理单文件上传时需转义文件名 #3518

Merged
merged 1 commit into from
Sep 11, 2024
Merged

fix: 处理单文件上传时需转义文件名 #3518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions bcs-services/bcs-bscp/cmd/api-server/service/config_import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"io"
"io/fs"
"net/http"
"net/url"
"os"
"path"
"path/filepath"
Expand Down Expand Up @@ -80,6 +81,13 @@ func (c *configImport) TemplateConfigFileImport(w http.ResponseWriter, r *http.R

fileName := chi.URLParam(r, "filename")

// 对获取到的URL参数进行解码
fileName, err := url.PathUnescape(fileName)
if err != nil {
_ = render.Render(w, r, rest.BadRequest(errors.New(i18n.T(kt, "invalid file name"))))
return
}

// Validation size
totleContentLength, singleContentLength := getUploadConfig(kt.BizID)

Expand All @@ -90,7 +98,7 @@ func (c *configImport) TemplateConfigFileImport(w http.ResponseWriter, r *http.R
maxSize = singleContentLength
}

if err := checkUploadSize(kt, r, maxSize); err != nil {
if err = checkUploadSize(kt, r, maxSize); err != nil {
_ = render.Render(w, r, rest.BadRequest(err))
return
}
Expand Down Expand Up @@ -118,7 +126,7 @@ func (c *configImport) TemplateConfigFileImport(w http.ResponseWriter, r *http.R

// 创建目录
dirPath := path.Join(os.TempDir(), constant.UploadTemporaryDirectory)
if err := createTemporaryDirectory(dirPath); err != nil {
if err = createTemporaryDirectory(dirPath); err != nil {
_ = render.Render(w, r, rest.BadRequest(errors.New(i18n.T(kt, "create directory failed, err: %v", err))))
return
}
Expand Down Expand Up @@ -276,6 +284,13 @@ func (c *configImport) ConfigFileImport(w http.ResponseWriter, r *http.Request)

fileName := chi.URLParam(r, "filename")

// 对获取到的URL参数进行解码
fileName, err := url.PathUnescape(fileName)
if err != nil {
_ = render.Render(w, r, rest.BadRequest(errors.New(i18n.T(kt, "invalid file name"))))
return
}

// Validation size
totleContentLength, singleContentLength := getUploadConfig(kt.BizID)
var maxSize int64
Expand All @@ -284,7 +299,7 @@ func (c *configImport) ConfigFileImport(w http.ResponseWriter, r *http.Request)
} else {
maxSize = singleContentLength
}
if err := checkUploadSize(kt, r, maxSize); err != nil {
if err = checkUploadSize(kt, r, maxSize); err != nil {
_ = render.Render(w, r, rest.BadRequest(err))
return
}
Expand All @@ -309,7 +324,7 @@ func (c *configImport) ConfigFileImport(w http.ResponseWriter, r *http.Request)

// 创建目录
dirPath := path.Join(os.TempDir(), constant.UploadTemporaryDirectory)
if err := createTemporaryDirectory(dirPath); err != nil {
if err = createTemporaryDirectory(dirPath); err != nil {
_ = render.Render(w, r,
rest.BadRequest(errors.New(i18n.T(kt, "create directory failed, err: %v", err))))
return
Expand Down
Loading
Loading