multipleof4/ntfy
1
0
Fork 0
mirror of https://github.com/multipleof4/ntfy.git synced 2026-10-16 16:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix S3 scheme backwards compat

Browse Source
This commit is contained in:
binwiederhier
2026-06-22 21:43:29 -04:00
parent fb75a65885
commit ab1e170a20
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
s3/util.go
+6 -5
View File
@@ -74,12 +74,13 @@ func ParseURL(s3URL string) (*Config, error) {
var endpoint string
var pathStyle bool
if endpointParam != "" {
// Custom endpoint: strip scheme prefix to extract host[:port]
uep, err := url.Parse(endpointParam)
if err != nil {
return nil, fmt.Errorf("s3: invalid endpoint URL: %w", err)
// Custom endpoint: derive the scheme from the prefix and strip it to extract host[:port].
// Default to https for backward compatibility, including bare "host:port" endpoints (no
// scheme) -- url.Parse would otherwise misread the host before the port colon as the scheme.
scheme = "https"
if strings.HasPrefix(endpointParam, "http://") {
scheme = "http"
}
scheme = uep.Scheme
ep := strings.TrimRight(endpointParam, "/")
ep = strings.TrimPrefix(ep, "https://")
ep = strings.TrimPrefix(ep, "http://")