beenull/listmonk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: check public URL before presigned URL generation (#1148)

Browse source 
Fixes #1141
This commit is contained in:
Rohan Verma 2023-01-16 15:49:21 +05:30 committed by GitHub
parent 66c81c8191
commit 72d22d40ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,8 +81,9 @@ func (c *Client) Put(name string, cType string, file io.ReadSeeker) (string, err
// Get accepts the filename of the object stored and retrieves from S3.
func (c *Client) Get(name string) string {
// Generate a private S3 pre-signed URL if it's a private bucket.
if c.opts.BucketType == "private" {
// Generate a private S3 pre-signed URL if it's a private bucket, and there
// is no public URL provided.
if c.opts.BucketType == "private" && c.opts.PublicURL == "" {
u := c.s3.GeneratePresignedURL(simples3.PresignedInput{
Bucket: c.opts.Bucket,
ObjectKey: c.makeBucketPath(name),
@ -93,7 +94,8 @@ func (c *Client) Get(name string) string {
return u
}
// Generate a public S3 URL if it's a public bucket.
// Generate a public S3 URL if it's a public bucket or a public URL is
// provided.
return c.makeFileURL(name)
}