lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 15:17:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix url scheme using for forwarded request with changed proto (#6884)

Browse Source
This commit is contained in:
Alexey
2025-06-16 22:50:09 +03:00
committed by GitHub
parent 78069605a6
commit 29d1701c34
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/s3api/auth_signature_v4.go
View File

@@ -719,9 +719,11 @@ func extractHostHeader(r *http.Request) string {
forwardedHost := r.Header.Get("X-Forwarded-Host") forwardedHost := r.Header.Get("X-Forwarded-Host")
forwardedPort := r.Header.Get("X-Forwarded-Port") forwardedPort := r.Header.Get("X-Forwarded-Port")
forwardedProto := r.Header.Get("X-Forwarded-Proto")
// If X-Forwarded-Host is set, use that as the host. // If X-Forwarded-Host is set, use that as the host.
// If X-Forwarded-Port is set, use that too to form the host. // If X-Forwarded-Port is set, use that too to form the host.
// If X-Forwarded-Proto is set, check if is it default to omit the port.
if forwardedHost != "" { if forwardedHost != "" {
extractedHost := forwardedHost extractedHost := forwardedHost
host, port, err := net.SplitHostPort(extractedHost) host, port, err := net.SplitHostPort(extractedHost)
@@ -731,7 +733,11 @@ func extractHostHeader(r *http.Request) string {
forwardedPort = port forwardedPort = port
} }
} }
if !isDefaultPort(r.URL.Scheme, forwardedPort) { scheme := r.URL.Scheme
if forwardedProto != "" {
scheme = forwardedProto
}
if !isDefaultPort(scheme, forwardedPort) {
extractedHost = net.JoinHostPort(extractedHost, forwardedPort) extractedHost = net.JoinHostPort(extractedHost, forwardedPort)
} }
return extractedHost return extractedHost