usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-10-06 20:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: remove ACL when set URLPrefix (#2532)

Browse source
This commit is contained in:
Hou Xiaoxuan 2023-11-23 23:20:11 +08:00 • committed by GitHub
parent d317b03832
commit e016244aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugin/storage/s3/s3.go
View file

@ -64,13 +64,17 @@ func NewClient(ctx context.Context, config *Config) (*Client, error) {
func (client *Client) UploadFile(ctx context.Context, filename string, fileType string, src io.Reader) (string, error) { func (client *Client) UploadFile(ctx context.Context, filename string, fileType string, src io.Reader) (string, error) {
uploader := manager.NewUploader(client.Client) uploader := manager.NewUploader(client.Client)
uploadOutput, err := uploader.Upload(ctx, &awss3.PutObjectInput{ // set ACL according to if user set prefix
obj := awss3.PutObjectInput{
Bucket: aws.String(client.Config.Bucket), Bucket: aws.String(client.Config.Bucket),
Key: aws.String(filename), Key: aws.String(filename),
Body: src, Body: src,
ContentType: aws.String(fileType), ContentType: aws.String(fileType),
ACL: types.ObjectCannedACL(*aws.String("public-read")), }
}) if client.Config.URLPrefix == "" {
obj.ACL = types.ObjectCannedACL(*aws.String("public-read"))
}
uploadOutput, err := uploader.Upload(ctx, &obj)
if err != nil { if err != nil {
return "", err return "", err
} }