mirror of
https://github.com/rclone/rclone.git
synced 2026-04-02 14:53:21 -04:00
639bd88959
URLPathEscapeAll was only passing [A-Za-z0-9/] through unencoded, causing it to percent-encode RFC 3986 unreserved characters (-, ., _, ~). Per RFC 3986 §2.3, unreserved characters MUST NOT be percent-encoded, and a URI that unnecessarily encodes them is not equivalent to one that does not. Servers that perform strict path matching without normalising percent-encoded characters will reject the over-encoded form with a 404. Before: /files/my-report.pdf → /files/my%2Dreport%2Epdf After: /files/my-report.pdf → /files/my-report.pdf Reserved characters (spaces, semicolons, colons, etc.) continue to be encoded as before.
52 lines
1.3 KiB
Go
52 lines
1.3 KiB
Go
package rest
|
|
|
|
import (
|
|
"fmt"
|
|
"net/url"
|
|
"strings"
|
|
)
|
|
|
|
// URLJoin joins a URL and a path returning a new URL
|
|
//
|
|
// path should be URL escaped
|
|
func URLJoin(base *url.URL, path string) (*url.URL, error) {
|
|
rel, err := url.Parse(path)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing %q as URL: %w", path, err)
|
|
}
|
|
return base.ResolveReference(rel), nil
|
|
}
|
|
|
|
// URLPathEscape escapes URL path the in string using URL escaping rules
|
|
//
|
|
// This mimics url.PathEscape which only available from go 1.8
|
|
func URLPathEscape(in string) string {
|
|
var u url.URL
|
|
u.Path = in
|
|
return u.String()
|
|
}
|
|
|
|
// URLPathEscapeAll escapes URL path the in string using URL escaping rules
|
|
//
|
|
// It escapes every character except the RFC 3986 unreserved characters
|
|
// [A-Za-z0-9-._~] and the path separator /. Unreserved characters MUST NOT
|
|
// be percent-encoded per RFC 3986 §2.3.
|
|
func URLPathEscapeAll(in string) string {
|
|
var b strings.Builder
|
|
b.Grow(len(in) * 3) // worst case: every byte escaped
|
|
const hex = "0123456789ABCDEF"
|
|
for i := range len(in) {
|
|
c := in[i]
|
|
if (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
|
|
(c >= '0' && c <= '9') || c == '/' ||
|
|
c == '-' || c == '.' || c == '_' || c == '~' {
|
|
b.WriteByte(c)
|
|
} else {
|
|
b.WriteByte('%')
|
|
b.WriteByte(hex[c>>4])
|
|
b.WriteByte(hex[c&0x0F])
|
|
}
|
|
}
|
|
return b.String()
|
|
}
|