From b95420ef8e9ad87d6af5873ef9bc306c93ab31e6 Mon Sep 17 00:00:00 2001
From: withchao <48119764+withchao@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:23:39 +0800
Subject: [PATCH] fix: s3 browser preview (#580)

---
 config/config.yaml              |  2 +-
 pkg/common/db/controller/s3.go  |  4 +---
 pkg/common/db/s3/cos/cos.go     | 26 ++++++++++++++++----------
 pkg/common/db/s3/minio/minio.go | 20 ++++++++++----------
 pkg/common/db/s3/oss/oss.go     | 18 +++++++++---------
 pkg/common/db/s3/s3.go          |  4 ++--
 6 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index 45f3b7179..1c01031dc 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -74,7 +74,7 @@ api:
 
 object:
   enable: "minio"                           #使用minio
-  apiURL: "http://127.0.0.1:10002/object/"
+  apiURL: "http://127.0.0.1:10002/object/"  #地址需要app能访问到
   minio:
     bucket: "openim"                      #不建议修改
     endpoint: "http://127.0.0.1:10005"      #minio对外服务的ip和端口，app要能访问此ip和端口
diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go
index cdd1ac4c2..220e8e070 100644
--- a/pkg/common/db/controller/s3.go
+++ b/pkg/common/db/controller/s3.go
@@ -77,9 +77,7 @@ func (s *s3Database) AccessURL(ctx context.Context, name string, expire time.Dur
 	}
 	opt := &s3.AccessURLOption{
 		ContentType: obj.ContentType,
-	}
-	if filename := filepath.Base(obj.Name); filename != "" {
-		opt.ContentDisposition = `attachment; filename=` + filename
+		Filename:    filepath.Base(obj.Name),
 	}
 	expireTime := time.Now().Add(expire)
 	rawURL, err := s.s3.AccessURL(ctx, obj.Key, expire, opt)
diff --git a/pkg/common/db/s3/cos/cos.go b/pkg/common/db/s3/cos/cos.go
index 799766bbe..cfdaaa5e4 100644
--- a/pkg/common/db/s3/cos/cos.go
+++ b/pkg/common/db/s3/cos/cos.go
@@ -248,21 +248,27 @@ func (c *Cos) ListUploadedParts(ctx context.Context, uploadID string, name strin
 }
 
 func (c *Cos) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	//reqParams := make(url.Values)
-	//if opt != nil {
-	//	if opt.ContentType != "" {
-	//		reqParams.Set("Content-Type", opt.ContentType)
-	//	}
-	//	if opt.ContentDisposition != "" {
-	//		reqParams.Set("Content-Disposition", opt.ContentDisposition)
-	//	}
-	//}
+	var option *cos.PresignedURLOptions
+	if opt != nil {
+		query := make(url.Values)
+		if opt.ContentType != "" {
+			query.Set("response-content-type", opt.ContentType)
+		}
+		if opt.Filename != "" {
+			query.Set("response-content-disposition", `attachment; filename="`+opt.Filename+`"`)
+		}
+		if len(query) > 0 {
+			option = &cos.PresignedURLOptions{
+				Query: &query,
+			}
+		}
+	}
 	if expire <= 0 {
 		expire = time.Hour * 24 * 365 * 99 // 99 years
 	} else if expire < time.Second {
 		expire = time.Second
 	}
-	rawURL, err := c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, nil)
+	rawURL, err := c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, option)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go
index 2f0a59a2e..baf9b64e6 100644
--- a/pkg/common/db/s3/minio/minio.go
+++ b/pkg/common/db/s3/minio/minio.go
@@ -253,21 +253,21 @@ func (m *Minio) ListUploadedParts(ctx context.Context, uploadID string, name str
 }
 
 func (m *Minio) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	//reqParams := make(url.Values)
-	//if opt != nil {
-	//	if opt.ContentType != "" {
-	//		reqParams.Set("Content-Type", opt.ContentType)
-	//	}
-	//	if opt.ContentDisposition != "" {
-	//		reqParams.Set("Content-Disposition", opt.ContentDisposition)
-	//	}
-	//}
+	reqParams := make(url.Values)
+	if opt != nil {
+		if opt.ContentType != "" {
+			reqParams.Set("response-content-type", opt.ContentType)
+		}
+		if opt.Filename != "" {
+			reqParams.Set("response-content-disposition", `attachment; filename="`+opt.Filename+`"`)
+		}
+	}
 	if expire <= 0 {
 		expire = time.Hour * 24 * 365 * 99 // 99 years
 	} else if expire < time.Second {
 		expire = time.Second
 	}
-	u, err := m.core.Client.PresignedGetObject(ctx, m.bucket, name, expire, nil)
+	u, err := m.core.Client.PresignedGetObject(ctx, m.bucket, name, expire, reqParams)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/common/db/s3/oss/oss.go b/pkg/common/db/s3/oss/oss.go
index 572b665e6..f689836c6 100644
--- a/pkg/common/db/s3/oss/oss.go
+++ b/pkg/common/db/s3/oss/oss.go
@@ -261,15 +261,15 @@ func (o *OSS) ListUploadedParts(ctx context.Context, uploadID string, name strin
 }
 
 func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration, opt *s3.AccessURLOption) (string, error) {
-	//var opts []oss.Option
-	//if opt != nil {
-	//	if opt.ContentType != "" {
-	//		opts = append(opts, oss.ContentType(opt.ContentType))
-	//	}
-	//	if opt.ContentDisposition != "" {
-	//		opts = append(opts, oss.ContentDisposition(opt.ContentDisposition))
-	//	}
-	//}
+	var opts []oss.Option
+	if opt != nil {
+		if opt.ContentType != "" {
+			opts = append(opts, oss.ResponseContentType(opt.ContentType))
+		}
+		if opt.Filename != "" {
+			opts = append(opts, oss.ResponseContentDisposition(`attachment; filename="`+opt.Filename+`"`))
+		}
+	}
 	if expire <= 0 {
 		expire = time.Hour * 24 * 365 * 99 // 99 years
 	} else if expire < time.Second {
diff --git a/pkg/common/db/s3/s3.go b/pkg/common/db/s3/s3.go
index 55adc313c..fadb09a0b 100644
--- a/pkg/common/db/s3/s3.go
+++ b/pkg/common/db/s3/s3.go
@@ -117,8 +117,8 @@ type ListUploadedPartsResult struct {
 }
 
 type AccessURLOption struct {
-	ContentType        string `json:"contentType"`
-	ContentDisposition string `json:"contentDisposition"`
+	ContentType string `json:"contentType"`
+	Filename    string `json:"filename"`
 }
 
 type Interface interface {