knadh/listmonk
1
1
Fork 0
mirror of https://github.com/knadh/listmonk.git synced 2025-10-06 05:16:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add explicit public-read ACL to public S3 uploads. Closes #496.

Browse source
This commit is contained in:
Kailash Nadh 2021-10-02 17:12:31 +05:30
parent 05585b701b
commit 7aa850824c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
internal/media/providers/s3/s3.go
View file

@ -61,7 +61,7 @@ func NewS3Store(opt Opt) (media.Store, error) {
// Put takes in the filename, the content type and file object itself and uploads to S3. // Put takes in the filename, the content type and file object itself and uploads to S3.
func (c *Client) Put(name string, cType string, file io.ReadSeeker) (string, error) { func (c *Client) Put(name string, cType string, file io.ReadSeeker) (string, error) {
// Upload input parameters // Upload input parameters
upParams := simples3.UploadInput{ p := simples3.UploadInput{
Bucket: c.opts.Bucket, Bucket: c.opts.Bucket,
ContentType: cType, ContentType: cType,
FileName: name, FileName: name,
@ -70,8 +70,13 @@ func (c *Client) Put(name string, cType string, file io.ReadSeeker) (string, err
// Paths inside the bucket should not start with /. // Paths inside the bucket should not start with /.
ObjectKey: c.makeBucketPath(name), ObjectKey: c.makeBucketPath(name),
} }
// Perform an upload.
if _, err := c.s3.FileUpload(upParams); err != nil { if c.opts.BucketType == "public" {
p.ACL = "public-read"
}
// Upload.
if _, err := c.s3.FileUpload(p); err != nil {
return "", err return "", err
} }
return name, nil return name, nil