blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-10 23:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

s3 public read

Browse Source
This commit is contained in:
withchao 2023-09-15 15:30:06 +08:00
parent a71b143b1c
commit 52796bf79d
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/common/db/s3/cos/cos.go
View File

@ -324,17 +324,5 @@ func (c *Cos) getPresignedURL(ctx context.Context, name string, expire time.Dura
if !config.Config.Object.Cos.PublicRead {
return c.client.Object.GetPresignedURL(ctx, http.MethodGet, name, c.credential.SecretID, c.credential.SecretKey, expire, opt)
}
u := c.client.Object.GetObjectURL(name)
//if opt.Query != nil && len(*opt.Query) > 0 {
// query := u.Query()
// if len(query) == 0 {
// query = *opt.Query
// } else {
// for key := range *opt.Query {
// query[key] = (*opt.Query)[key]
// }
// }
// u.RawQuery = query.Encode()
//}
return u, nil
return c.client.Object.GetObjectURL(name), nil
}

6
pkg/common/db/s3/oss/internal.go
View File

@ -22,11 +22,11 @@ import (
"github.com/aliyun/aliyun-oss-go-sdk/oss"
)
//go:linkname ossSignHeader github.com/aliyun/aliyun-oss-go-sdk/oss.Conn.signHeader
func ossSignHeader(c *oss.Conn, req *http.Request, canonicalizedResource string)
//go:linkname signHeader github.com/aliyun/aliyun-oss-go-sdk/oss.Conn.signHeader
func signHeader(c oss.Conn, req *http.Request, canonicalizedResource string)
//go:linkname getURLParams github.com/aliyun/aliyun-oss-go-sdk/oss.Conn.getURLParams
func getURLParams(c *oss.Conn, params map[string]interface{}) string
func getURLParams(c oss.Conn, params map[string]interface{}) string
//go:linkname getURL github.com/aliyun/aliyun-oss-go-sdk/oss.urlMaker.getURL
func getURL(um urlMaker, bucket, object, params string) *url.URL

9
pkg/common/db/s3/oss/oss.go
View File

@ -166,7 +166,7 @@ func (o *OSS) AuthSign(ctx context.Context, uploadID string, name string, expire
request.Header.Set(oss.HTTPHeaderHost, request.Host)
request.Header.Set(oss.HTTPHeaderDate, now)
request.Header.Set(oss.HttpHeaderOssDate, now)
ossSignHeader(o.bucket.Client.Conn, request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID))
signHeader(*o.bucket.Client.Conn, request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID))
delete(request.Header, oss.HTTPHeaderDate)
result.Parts[i] = s3.SignPart{
PartNumber: partNumber,
@ -317,9 +317,12 @@ func (o *OSS) AccessURL(ctx context.Context, name string, expire time.Duration,
if !config.Config.Object.Oss.PublicRead {
return o.bucket.SignURL(name, http.MethodGet, int64(expire/time.Second), opts...)
}
params, err := oss.GetRawParams(opts)
rawParams, err := oss.GetRawParams(opts)
if err != nil {
return "", err
}
return getURL(o.um, o.bucket.BucketName, name, getURLParams(o.bucket.Client.Conn, params)).String(), nil
l := len(rawParams)
_ = l
params := getURLParams(*o.bucket.Client.Conn, rawParams)
return getURL(o.um, o.bucket.BucketName, name, params).String(), nil
}