Skip to content

fix: encode filename when using url prefix for resources #2829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boojack merged 3 commits into from
Jan 24, 2024
Merged

fix: encode filename when using url prefix for resources #2829

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
395c7d5
fix: encode filename when using url prefix for resources
mudkipme Jan 23, 2024
dd79984
fix: only encode the last parts of filename
mudkipme Jan 23, 2024
3264a62
fix: encode all parts in filepath
mudkipme Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion plugin/storage/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"io"
"net/url"
"strings"

"github.com/aws/aws-sdk-go-v2/aws"
Expand Down Expand Up @@ -83,7 +84,9 @@ func (client *Client) UploadFile(ctx context.Context, filename string, fileType
link := uploadOutput.Location
// If url prefix is set, use it as the file link.
if client.Config.URLPrefix != "" {
link = fmt.Sprintf("%s/%s%s", client.Config.URLPrefix, filename, client.Config.URLSuffix)
parts := strings.Split(filename, "/")
parts[len(parts)-1] = url.PathEscape(parts[len(parts)-1])
link = fmt.Sprintf("%s/%s%s", client.Config.URLPrefix, strings.Join(parts, "/"), client.Config.URLSuffix)
}
if link == "" {
return "", errors.New("failed to get file link")
Expand Down