Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

Merge remote-tracking branch 'origin/dev' into feat/1.2.0/question

LinkinStarsa920e5c2c10c
diff --cc internal/service/uploader/upload.go
index 88ca9d5f,01abec43..f21b459a
--- a/internal/service/uploader/upload.go
+++ b/internal/service/uploader/upload.go
@@@ -91,8 -95,9 +91,9 @@@ func (us *uploaderService) UploadAvatar
if err != nil {
return "", errors.BadRequest(reason.RequestFormatError).WithError(err)
}
- fileExt := strings.ToLower(path.Ext(file.Filename))
+ file.Close()
+ fileExt := strings.ToLower(path.Ext(fileHeader.Filename))
- if _, ok := FormatExts[fileExt]; !ok {
+ if _, ok := plugin.DefaultFileTypeCheckMapping[plugin.UserAvatar][fileExt]; !ok {
return "", errors.BadRequest(reason.RequestFormatError).WithError(err)
}
@@@ -169,8 -175,9 +170,9 @@@ func (us *uploaderService) UploadPostFi
if err != nil {
return "", errors.BadRequest(reason.RequestFormatError).WithError(err)
}
- fileExt := strings.ToLower(path.Ext(file.Filename))
+ defer file.Close()
+ fileExt := strings.ToLower(path.Ext(fileHeader.Filename))
- if _, ok := FormatExts[fileExt]; !ok {
+ if _, ok := plugin.DefaultFileTypeCheckMapping[plugin.UserPost][fileExt]; !ok {
return "", errors.BadRequest(reason.RequestFormatError).WithError(err)
}
@@@ -195,8 -202,10 +197,9 @@@ func (us *uploaderService) UploadBrandi
if err != nil {
return "", errors.BadRequest(reason.RequestFormatError).WithError(err)
}
- fileExt := strings.ToLower(path.Ext(file.Filename))
+ file.Close()
+ fileExt := strings.ToLower(path.Ext(fileHeader.Filename))
- _, ok := FormatExts[fileExt]
- if !ok && fileExt != ".ico" {
+ if _, ok := plugin.DefaultFileTypeCheckMapping[plugin.AdminBranding][fileExt]; !ok {
return "", errors.BadRequest(reason.RequestFormatError).WithError(err)
}