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.
feat(user): support upload webp image
LinkinStarsb2d5781633dc
diff --git a/internal/service/uploader/upload.go b/internal/service/uploader/upload.goindex 3dc2fa0f..88ca9d5f 100644--- a/internal/service/uploader/upload.go+++ b/internal/service/uploader/upload.go@@ -39,14 +39,11 @@ var (postSubPath,brandingSubPath,}- FormatExts = map[string]imaging.Format{+ supportedThumbFileExtMapping = map[string]imaging.Format{".jpg": imaging.JPEG,".jpeg": imaging.JPEG,".png": imaging.PNG,".gif": imaging.GIF,- //".tif": imaging.TIFF,- //".tiff": imaging.TIFF,- //".bmp": imaging.BMP,})@@ -95,7 +92,7 @@ func (us *uploaderService) UploadAvatarFile(ctx *gin.Context) (url string, err ereturn "", errors.BadRequest(reason.RequestFormatError).WithError(err)}fileExt := strings.ToLower(path.Ext(file.Filename))- if _, ok := FormatExts[fileExt]; !ok {+ if _, ok := plugin.DefaultFileTypeCheckMapping[plugin.UserAvatar][fileExt]; !ok {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)}@@ -105,6 +102,11 @@ func (us *uploaderService) UploadAvatarFile(ctx *gin.Context) (url string, err e}func (us *uploaderService) AvatarThumbFile(ctx *gin.Context, fileName string, size int) (url string, err error) {+ fileSuffix := path.Ext(fileName)+ if _, ok := supportedThumbFileExtMapping[fileSuffix]; !ok {+ // if file type is not supported, return original file+ return path.Join(us.serviceConfig.UploadPath, avatarSubPath, fileName), nil+ }if size > 1024 {size = 1024}@@ -115,7 +117,7 @@ func (us *uploaderService) AvatarThumbFile(ctx *gin.Context, fileName string, siif err == nil {return thumbFilePath, nil}- filePath := fmt.Sprintf("%s/avatar/%s", us.serviceConfig.UploadPath, fileName)+ filePath := fmt.Sprintf("%s/%s/%s", us.serviceConfig.UploadPath, avatarSubPath, fileName)avatarFile, err = os.ReadFile(filePath)if err != nil {return "", errors.InternalServer(reason.UnknownError).WithError(err).WithStack()@@ -126,14 +128,9 @@ func (us *uploaderService) AvatarThumbFile(ctx *gin.Context, fileName string, sireturn "", errors.InternalServer(reason.UnknownError).WithError(err).WithStack()}- fileSuffix := path.Ext(fileName)- if _, ok := FormatExts[fileSuffix]; !ok {- return "", fmt.Errorf("unsupported image format: %s", fileSuffix)- }-var buf bytes.BuffernewImage := imaging.Fill(img, size, size, imaging.Center, imaging.Linear)- if err = imaging.Encode(&buf, newImage, FormatExts[fileSuffix]); err != nil {+ if err = imaging.Encode(&buf, newImage, supportedThumbFileExtMapping[fileSuffix]); err != nil {return "", errors.InternalServer(reason.UnknownError).WithError(err).WithStack()}@@ -173,7 +170,7 @@ func (us *uploaderService) UploadPostFile(ctx *gin.Context) (return "", errors.BadRequest(reason.RequestFormatError).WithError(err)}fileExt := strings.ToLower(path.Ext(file.Filename))- if _, ok := FormatExts[fileExt]; !ok {+ if _, ok := plugin.DefaultFileTypeCheckMapping[plugin.UserPost][fileExt]; !ok {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)}@@ -199,8 +196,7 @@ func (us *uploaderService) UploadBrandingFile(ctx *gin.Context) (return "", errors.BadRequest(reason.RequestFormatError).WithError(err)}fileExt := strings.ToLower(path.Ext(file.Filename))- _, ok := FormatExts[fileExt]- if !ok && fileExt != ".ico" {+ if _, ok := plugin.DefaultFileTypeCheckMapping[plugin.AdminBranding][fileExt]; !ok {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)}@@ -226,14 +222,14 @@ func (us *uploaderService) uploadFile(ctx *gin.Context, file *multipart.FileHead}defer src.Close()- if err := removeExif(filePath); err != nil {- log.Error(err)- }-if !checker.IsSupportedImageFile(src, filepath.Ext(fileSubPath)) {return "", errors.BadRequest(reason.UploadFileUnsupportedFileFormat)}+ if err := removeExif(filePath); err != nil {+ log.Error(err)+ }+url = fmt.Sprintf("%s/uploads/%s", siteGeneral.SiteUrl, fileSubPath)return url, nil}@@ -256,8 +252,8 @@ func (us *uploaderService) tryToUploadByPlugin(ctx *gin.Context, source plugin.U// removeExif remove exif// only support jpg/jpeg/pngfunc removeExif(path string) error {- ext := strings.ToUpper(strings.TrimPrefix(filepath.Ext(path), "."))- if ext != "JPEG" && ext != "JPG" && ext != "PNG" {+ ext := strings.ToLower(strings.TrimPrefix(filepath.Ext(path), "."))+ if ext != "jpeg" && ext != "jpg" && ext != "png" {return nil}img, err := os.ReadFile(path)diff --git a/pkg/checker/file_type.go b/pkg/checker/file_type.goindex 24845ab5..d30c369f 100644--- a/pkg/checker/file_type.go+++ b/pkg/checker/file_type.go@@ -1,6 +1,7 @@package checkerimport (+ "golang.org/x/image/webp""image"_ "image/gif" // use init to support decode jpeg,jpg,png,gif_ "image/jpeg"@@ -9,16 +10,19 @@ import ("strings")-// IsSupportedImageFile currently answers support image type is `image/jpeg,image/jpg,image/png, image/gif`+// IsSupportedImageFile currently answers support image type is+// `image/jpeg, image/jpg, image/png, image/gif, image/webp`func IsSupportedImageFile(file io.Reader, ext string) bool {- ext = strings.TrimPrefix(ext, ".")+ ext = strings.ToLower(strings.TrimPrefix(ext, "."))var err error- switch strings.ToUpper(ext) {- case "JPG", "JPEG", "PNG", "GIF": // only allow for `image/jpeg,image/jpg,image/png, image/gif`+ switch ext {+ case "jpg", "jpeg", "png", "gif": // only allow for `image/jpeg,image/jpg,image/png, image/gif`_, _, err = image.Decode(file)- case "ICO":+ case "ico":// TODO: There is currently no good Golang library to parse whether the image is in ico format.return true+ case "webp":+ _, err = webp.Decode(file)default:return false}diff --git a/plugin/storage.go b/plugin/storage.goindex 0d046623..3edbe53b 100644--- a/plugin/storage.go+++ b/plugin/storage.go@@ -14,12 +14,14 @@ var (".jpg": true,".jpeg": true,".png": true,+ ".webp": true,},UserPost: {".jpg": true,".jpeg": true,".png": true,".gif": true,+ ".webp": true,},AdminBranding: {".jpg": true,