Merge remote-tracking branch 'origin/main' into dev

Author: LinkinStars

.github/workflows/sync-info.yml

@@ -40,6 +40,5 @@ jobs:
           title: "chore: Sync Plugin Info"
           body: "Sync Plugin Info"
           branch: "chore/sync-info"
-          base: "dev"
 
 

storage-aliyunoss/README.md

@@ -1,4 +1,4 @@
-# Aliyun OSS Storage (preview)
+# Aliyun OSS Storage
 > This plugin can be used to store attachments and avatars to Aliyun OSS.
 
 ## How to use
@@ -14,5 +14,4 @@
 - `Object Key Prefix` - Prefix of the object key like 'answer/data/' that ending with '/'
 - `Access Key Id` - AccessKeyID of the AliCloud OSS storage
 - `Access Key Secret` - AccessKeySecret of the AliCloud OSS storage
-- `Visit Url Prefix` - Prefix of access address for the uploaded file, ending with '/' such as https://example.com/xxx/
-- `Max File Size` - Max file size in MB, default is 10MB
+- `Visit Url Prefix` - Prefix of access address for the uploaded file, ending with '/' such as https://example.com/xxx/

storage-aliyunoss/aliyunoss.go

@@ -26,10 +26,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
+	"github.com/apache/answer/pkg/checker"
+
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/apache/answer-plugins/storage-aliyunoss/i18n"
 	"github.com/apache/answer-plugins/util"
@@ -39,11 +40,6 @@ import (
 //go:embed  info.yaml
 var Info embed.FS
 
-const (
-	// 10MB
-	defaultMaxFileSize int64 = 10 * 1024 * 1024
-)
-
 type Storage struct {
 	Config *StorageConfig
 }
@@ -55,7 +51,6 @@ type StorageConfig struct {
 	AccessKeyID     string `json:"access_key_id"`
 	AccessKeySecret string `json:"access_key_secret"`
 	VisitUrlPrefix  string `json:"visit_url_prefix"`
-	MaxFileSize     string `json:"max_file_size"`
 }
 
 func init() {
@@ -78,7 +73,7 @@ func (s *Storage) Info() plugin.Info {
 	}
 }
 
-func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource) (resp plugin.UploadFileResponse) {
+func (s *Storage) UploadFile(ctx *plugin.GinContext, condition plugin.UploadFileCondition) (resp plugin.UploadFileResponse) {
 	resp = plugin.UploadFileResponse{}
 	client, err := oss.New(s.Config.Endpoint, s.Config.AccessKeyID, s.Config.AccessKeySecret)
 	if err != nil {
@@ -101,13 +96,13 @@ func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource)
 		return resp
 	}
 
-	if !s.CheckFileType(file.Filename, source) {
+	if s.IsUnsupportedFileType(file.Filename, condition) {
 		resp.OriginalError = fmt.Errorf("file type not allowed")
 		resp.DisplayErrorMsg = plugin.MakeTranslator(i18n.ErrUnsupportedFileType)
 		return resp
 	}
 
-	if file.Size > s.maxFileSizeLimit() {
+	if s.ExceedFileSizeLimit(file.Size, condition) {
 		resp.OriginalError = fmt.Errorf("file size too large")
 		resp.DisplayErrorMsg = plugin.MakeTranslator(i18n.ErrOverFileSizeLimit)
 		return resp
@@ -121,7 +116,7 @@ func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource)
 	}
 	defer open.Close()
 
-	objectKey := s.createObjectKey(file.Filename, source)
+	objectKey := s.createObjectKey(file.Filename, condition.Source)
 	request := &oss.PutObjectRequest{
 		ObjectKey: objectKey,
 		Reader:    open,
@@ -145,6 +140,8 @@ func (s *Storage) createObjectKey(originalFilename string, source plugin.UploadS
 		return s.Config.ObjectKeyPrefix + "avatar/" + randomString + ext
 	case plugin.UserPost:
 		return s.Config.ObjectKeyPrefix + "post/" + randomString + ext
+	case plugin.UserPostAttachment:
+		return s.Config.ObjectKeyPrefix + "attachment/" + randomString + ext
 	case plugin.AdminBranding:
 		return s.Config.ObjectKeyPrefix + "branding/" + randomString + ext
 	default:
@@ -158,23 +155,27 @@ func (s *Storage) randomObjectKey() string {
 	return fmt.Sprintf("%d", time.Now().UnixNano()) + hex.EncodeToString(bytes)
 }
 
-func (s *Storage) CheckFileType(originalFilename string, source plugin.UploadSource) bool {
-	ext := strings.ToLower(filepath.Ext(originalFilename))
-	if _, ok := plugin.DefaultFileTypeCheckMapping[source][ext]; ok {
+func (s *Storage) IsUnsupportedFileType(originalFilename string, condition plugin.UploadFileCondition) bool {
+	if condition.Source == plugin.AdminBranding || condition.Source == plugin.UserAvatar {
+		ext := strings.ToLower(filepath.Ext(originalFilename))
+		if _, ok := plugin.DefaultFileTypeCheckMapping[condition.Source][ext]; ok {
+			return false
+		}
 		return true
 	}
-	return false
-}
 
-func (s *Storage) maxFileSizeLimit() int64 {
-	if len(s.Config.MaxFileSize) == 0 {
-		return defaultMaxFileSize
+	// check the post image and attachment file type check
+	if condition.Source == plugin.UserPost {
+		return checker.IsUnAuthorizedExtension(originalFilename, condition.AuthorizedImageExtensions)
 	}
-	limit, _ := strconv.Atoi(s.Config.MaxFileSize)
-	if limit <= 0 {
-		return defaultMaxFileSize
+	return checker.IsUnAuthorizedExtension(originalFilename, condition.AuthorizedAttachmentExtensions)
+}
+
+func (s *Storage) ExceedFileSizeLimit(fileSize int64, condition plugin.UploadFileCondition) bool {
+	if condition.Source == plugin.UserPostAttachment {
+		return fileSize > int64(condition.MaxAttachmentSize)*1024*1024
 	}
-	return int64(limit) * 1024 * 1024
+	return fileSize > int64(condition.MaxImageSize)*1024*1024
 }
 
 func (s *Storage) ConfigFields() []plugin.ConfigField {
@@ -245,17 +246,6 @@ func (s *Storage) ConfigFields() []plugin.ConfigField {
 			},
 			Value: s.Config.VisitUrlPrefix,
 		},
-		{
-			Name:        "max_file_size",
-			Type:        plugin.ConfigTypeInput,
-			Title:       plugin.MakeTranslator(i18n.ConfigMaxFileSizeTitle),
-			Description: plugin.MakeTranslator(i18n.ConfigMaxFileSizeDescription),
-			Required:    false,
-			UIOptions: plugin.ConfigFieldUIOptions{
-				InputType: plugin.InputTypeNumber,
-			},
-			Value: s.Config.MaxFileSize,
-		},
 	}
 }
 

storage-aliyunoss/i18n/en_US.yaml

@@ -54,11 +54,6 @@ plugin:
             other: Access URL prefix
           description:
             other: prefix of the final access address of the uploaded file, ending with '/' https://example.com/xxx/
-        max_file_size:
-          title:
-            other: Maximum file size(MB)
-          description:
-            other: Limit the maximum size of uploaded files, in MB, default is 10MB
       err:
         mis_storage_config:
           other: Wrong storage configuration causes upload failure.

storage-aliyunoss/i18n/translation.go

@@ -35,8 +35,6 @@ const (
 	ConfigAccessKeySecretDescription = "plugin.aliyunoss_storage.backend.config.access_key_secret.description"
 	ConfigVisitUrlPrefixTitle        = "plugin.aliyunoss_storage.backend.config.visit_url_prefix.title"
 	ConfigVisitUrlPrefixDescription  = "plugin.aliyunoss_storage.backend.config.visit_url_prefix.description"
-	ConfigMaxFileSizeTitle           = "plugin.aliyunoss_storage.backend.config.max_file_size.title"
-	ConfigMaxFileSizeDescription     = "plugin.aliyunoss_storage.backend.config.max_file_size.description"
 
 	ErrMisStorageConfig    = "plugin.aliyunoss_storage.backend.err.mis_storage_config"
 	ErrFileNotFound        = "plugin.aliyunoss_storage.backend.err.file_not_found"

storage-aliyunoss/i18n/zh_CN.yaml

@@ -54,11 +54,6 @@ plugin:
             other: 访问URL前缀
           description:
             other: 上传文件最终访问地址的前缀，以 '/' 结尾 https://example.com/xxx/
-        max_file_size:
-          title:
-            other: 最大文件大小(MB)
-          description:
-            other: 限制上传文件的最大大小，单位为MB，默认为 10MB
       err:
         mis_storage_config:
           other: 错误的存储配置导致上传失败

storage-aliyunoss/info.yaml

@@ -17,6 +17,6 @@
 
 slug_name: aliyunoss_storage
 type: storage
-version: 1.2.10
+version: 1.2.12
 author: answerdev
 link: https://github.com/apache/answer-plugins/tree/main/storage-aliyunoss

storage-s3/README.md

@@ -1,4 +1,4 @@
-# S3 Storage (preview)
+# S3 Storage
 > This plugin can be used to store attachments and avatars to AWS S3.
 
 ## How to use
@@ -15,5 +15,4 @@
 - `Access Key Id` - AccessKeyId of the S3
 - `Access Key Secret` - AccessKeySecret of the S3
 - `Access Token` - AccessToken of the S3
-- `Visit Url Prefix` - Prefix of access address for the uploaded file, ending with '/' such as https://example.com/xxx/
-- `Max File Size` - Max file size in MB, default is 10MB
+- `Visit Url Prefix` - Prefix of access address for the uploaded file, ending with '/' such as https://example.com/xxx/

storage-s3/i18n/en_US.yaml

@@ -59,11 +59,6 @@ plugin:
             other: Access URL prefix
           description:
             other: prefix of the final access address of the uploaded file, ending with '/' https://example.com/xxx/
-        max_file_size:
-          title:
-            other: Maximum file size(MB)
-          description:
-            other: Limit the maximum size of uploaded files, in MB, default is 10MB
         region:
           title:
             other: Region

storage-s3/i18n/translation.go

@@ -37,8 +37,6 @@ const (
 	ConfigAccessTokenDescription     = "plugin.s3_storage.backend.config.access_token.description"
 	ConfigVisitUrlPrefixTitle        = "plugin.s3_storage.backend.config.visit_url_prefix.title"
 	ConfigVisitUrlPrefixDescription  = "plugin.s3_storage.backend.config.visit_url_prefix.description"
-	ConfigMaxFileSizeTitle           = "plugin.s3_storage.backend.config.max_file_size.title"
-	ConfigMaxFileSizeDescription     = "plugin.s3_storage.backend.config.max_file_size.description"
 	ConfigRegionTitle                = "plugin.s3_storage.backend.config.region.title"
 	ConfigRegionDescription          = "plugin.s3_storage.backend.config.region.description"
 	ConfigDisableSSLTitle            = "plugin.s3_storage.backend.config.disable_ssl.title"

storage-s3/i18n/zh_CN.yaml

@@ -59,11 +59,6 @@ plugin:
             other: 访问URL前缀
           description:
             other: 上传文件最终访问地址的前缀，以 '/' 结尾 https://example.com/xxx/
-        max_file_size:
-          title:
-            other: 文件最大大小(MB)
-          description:
-            other: 限制上传文件的最大大小，单位MB，默认为10MB
         region:
           title:
             other: 区域(Region)

storage-s3/info.yaml

@@ -17,6 +17,6 @@
 
 slug_name: s3_storage
 type: storage
-version: 1.2.10
+version: 1.2.12
 author: answerdev
 link: https://github.com/apache/answer-plugins/tree/main/storage-s3

storage-s3/s3.go

@@ -26,23 +26,18 @@ import (
 	"encoding/json"
 	"fmt"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/apache/answer-plugins/storage-s3/i18n"
 	"github.com/apache/answer-plugins/util"
+	"github.com/apache/answer/pkg/checker"
 	"github.com/apache/answer/plugin"
 )
 
 //go:embed  info.yaml
 var Info embed.FS
 
-const (
-	// 10MB
-	defaultMaxFileSize int64 = 10 * 1024 * 1024
-)
-
 type Storage struct {
 	Config *StorageConfig
 	Client *Client
@@ -56,7 +51,6 @@ type StorageConfig struct {
 	AccessKeySecret string `json:"access_key_secret"`
 	AccessToken     string `json:"access_token"`
 	VisitUrlPrefix  string `json:"visit_url_prefix"`
-	MaxFileSize     string `json:"max_file_size"`
 	Region          string `json:"region"`
 	DisableSSL      bool   `json:"disable_ssl"`
 }
@@ -81,7 +75,7 @@ func (s *Storage) Info() plugin.Info {
 	}
 }
 
-func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource) (resp plugin.UploadFileResponse) {
+func (s *Storage) UploadFile(ctx *plugin.GinContext, condition plugin.UploadFileCondition) (resp plugin.UploadFileResponse) {
 	resp = plugin.UploadFileResponse{}
 
 	file, err := ctx.FormFile("file")
@@ -91,13 +85,13 @@ func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource)
 		return resp
 	}
 
-	if !s.checkFileType(file.Filename, source) {
+	if s.IsUnsupportedFileType(file.Filename, condition) {
 		resp.OriginalError = fmt.Errorf("file type not allowed")
 		resp.DisplayErrorMsg = plugin.MakeTranslator(i18n.ErrUnsupportedFileType)
 		return resp
 	}
 
-	if file.Size > s.maxFileSizeLimit() {
+	if s.ExceedFileSizeLimit(file.Size, condition) {
 		resp.OriginalError = fmt.Errorf("file size too large")
 		resp.DisplayErrorMsg = plugin.MakeTranslator(i18n.ErrOverFileSizeLimit)
 		return resp
@@ -111,7 +105,7 @@ func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource)
 	}
 	defer openFile.Close()
 
-	objectKey := s.createObjectKey(file.Filename, source)
+	objectKey := s.createObjectKey(file.Filename, condition.Source)
 	err = s.Client.PutObject(objectKey, strings.ToLower(filepath.Ext(file.Filename)), openFile)
 	if err != nil {
 		resp.OriginalError = fmt.Errorf("upload file failed: %v", err)
@@ -122,6 +116,29 @@ func (s *Storage) UploadFile(ctx *plugin.GinContext, source plugin.UploadSource)
 	return resp
 }
 
+func (s *Storage) IsUnsupportedFileType(originalFilename string, condition plugin.UploadFileCondition) bool {
+	if condition.Source == plugin.AdminBranding || condition.Source == plugin.UserAvatar {
+		ext := strings.ToLower(filepath.Ext(originalFilename))
+		if _, ok := plugin.DefaultFileTypeCheckMapping[condition.Source][ext]; ok {
+			return false
+		}
+		return true
+	}
+
+	// check the post image and attachment file type check
+	if condition.Source == plugin.UserPost {
+		return checker.IsUnAuthorizedExtension(originalFilename, condition.AuthorizedImageExtensions)
+	}
+	return checker.IsUnAuthorizedExtension(originalFilename, condition.AuthorizedAttachmentExtensions)
+}
+
+func (s *Storage) ExceedFileSizeLimit(fileSize int64, condition plugin.UploadFileCondition) bool {
+	if condition.Source == plugin.UserPostAttachment {
+		return fileSize > int64(condition.MaxAttachmentSize)*1024*1024
+	}
+	return fileSize > int64(condition.MaxImageSize)*1024*1024
+}
+
 func (s *Storage) createObjectKey(originalFilename string, source plugin.UploadSource) string {
 	ext := strings.ToLower(filepath.Ext(originalFilename))
 	randomString := s.randomObjectKey()
@@ -130,6 +147,8 @@ func (s *Storage) createObjectKey(originalFilename string, source plugin.UploadS
 		return s.Config.ObjectKeyPrefix + "avatar/" + randomString + ext
 	case plugin.UserPost:
 		return s.Config.ObjectKeyPrefix + "post/" + randomString + ext
+	case plugin.UserPostAttachment:
+		return s.Config.ObjectKeyPrefix + "attachment/" + randomString + ext
 	case plugin.AdminBranding:
 		return s.Config.ObjectKeyPrefix + "branding/" + randomString + ext
 	default:
@@ -151,17 +170,6 @@ func (s *Storage) checkFileType(originalFilename string, source plugin.UploadSou
 	return false
 }
 
-func (s *Storage) maxFileSizeLimit() int64 {
-	if len(s.Config.MaxFileSize) == 0 {
-		return defaultMaxFileSize
-	}
-	limit, _ := strconv.Atoi(s.Config.MaxFileSize)
-	if limit <= 0 {
-		return defaultMaxFileSize
-	}
-	return int64(limit) * 1024 * 1024
-}
-
 func (s *Storage) ConfigFields() []plugin.ConfigField {
 	return []plugin.ConfigField{
 		{
@@ -241,17 +249,6 @@ func (s *Storage) ConfigFields() []plugin.ConfigField {
 			},
 			Value: s.Config.VisitUrlPrefix,
 		},
-		{
-			Name:        "max_file_size",
-			Type:        plugin.ConfigTypeInput,
-			Title:       plugin.MakeTranslator(i18n.ConfigMaxFileSizeTitle),
-			Description: plugin.MakeTranslator(i18n.ConfigMaxFileSizeDescription),
-			Required:    false,
-			UIOptions: plugin.ConfigFieldUIOptions{
-				InputType: plugin.InputTypeNumber,
-			},
-			Value: s.Config.MaxFileSize,
-		},
 		{
 			Name:        "region",
 			Type:        plugin.ConfigTypeInput,