Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev

internal/rpc/third/tool.go

@@ -37,8 +37,8 @@ func checkUploadName(ctx context.Context, name string) error {
 		return errs.ErrNoPermission.Wrap("opUserID is empty")
 	}
 	if !tokenverify.IsManagerUserID(opUserID) {
-		if !strings.HasPrefix(name, opUserID+"_") {
-			return errs.ErrNoPermission.Wrap(fmt.Sprintf("name must start with `%s_`", opUserID))
+		if !strings.HasPrefix(name, opUserID+"/") {
+			return errs.ErrNoPermission.Wrap(fmt.Sprintf("name must start with `%s/`", opUserID))
 		}
 	}
 	return nil

pkg/common/db/controller/s3.go

@@ -6,6 +6,7 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"path/filepath"
 	"time"
 )
 
@@ -61,8 +62,10 @@ func (s *s3Database) AccessURL(ctx context.Context, name string, expire time.Dur
 		return time.Time{}, "", err
 	}
 	opt := &s3.AccessURLOption{
-		ContentType:        obj.ContentType,
-		ContentDisposition: `attachment; filename=` + obj.Name,
+		ContentType: obj.ContentType,
+	}
+	if filename := filepath.Base(obj.Name); filename != "" {
+		opt.ContentDisposition = `attachment; filename=` + filename
 	}
 	expireTime := time.Now().Add(expire)
 	rawURL, err := s.s3.AccessURL(ctx, obj.Key, expire, opt)