YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: the same-storage check in the new pre-sign feature (#2860)

Browse Source 
* fix: error check for the same oss-storage

* fix: conflict error2 variable in code refactor in s3.go

* chore: rename endpointUrl to endpointURL
This commit is contained in:
Elliot Chen
2024-01-30 19:07:16 +08:00
committed by GitHub
parent 1bad0543d0
commit bee6f278ba
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugin/storage/s3/s3.go
View File

@ -77,7 +77,7 @@ func (client *Client) UploadFile(ctx context.Context, filename string, fileType
ContentType: aws.String(fileType), ContentType: aws.String(fileType),
} }
// Set ACL according to if url prefix is set. // Set ACL according to if url prefix is set.
if client.Config.URLPrefix == "" { if client.Config.URLPrefix == "" && !client.Config.PreSign {
putInput.ACL = types.ObjectCannedACL(*aws.String("public-read")) putInput.ACL = types.ObjectCannedACL(*aws.String("public-read"))
} }
uploadOutput, err := uploader.Upload(ctx, &putInput) uploadOutput, err := uploader.Upload(ctx, &putInput)
@ -113,7 +113,15 @@ func (client *Client) PreSignLink(ctx context.Context, sourceLink string) (strin
} }
// if link doesn't belong to storage, then return as-is. // if link doesn't belong to storage, then return as-is.
// the empty hostname is corner-case for AWS native endpoint. // the empty hostname is corner-case for AWS native endpoint.
if client.Config.EndPoint != "" && !strings.Contains(client.Config.EndPoint, u.Hostname()) { endpointURL, err := url.Parse(client.Config.EndPoint)
if err != nil {
return "", errors.Wrapf(err, "parse Endpoint URL")
}
endpointHost := endpointURL.Hostname()
if client.Config.Bucket != "" && !strings.Contains(endpointHost, client.Config.Bucket) {
endpointHost = fmt.Sprintf("%s.%s", client.Config.Bucket, endpointHost)
}
if client.Config.EndPoint != "" && !strings.Contains(endpointHost, u.Hostname()) {
return sourceLink, nil return sourceLink, nil
} }