From 396a602f86a3134c2757795f43263d09515dae58 Mon Sep 17 00:00:00 2001 From: zuzuviewer <750938164@qq.com> Date: Wed, 9 Apr 2025 12:26:19 +0800 Subject: [PATCH] * Fix s3 auth failed with X-Forwarded-Host and X-Forwarded-Port (#6698) --- weed/s3api/auth_signature_v4.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weed/s3api/auth_signature_v4.go b/weed/s3api/auth_signature_v4.go index 5fce8197c..f3b2720ee 100644 --- a/weed/s3api/auth_signature_v4.go +++ b/weed/s3api/auth_signature_v4.go @@ -732,7 +732,7 @@ func extractHostHeader(r *http.Request) string { } } if !isDefaultPort(r.URL.Scheme, forwardedPort) { - extractedHost = net.JoinHostPort(forwardedHost, forwardedPort) + extractedHost = net.JoinHostPort(extractedHost, forwardedPort) } return extractedHost } else { @@ -743,12 +743,12 @@ func extractHostHeader(r *http.Request) string { } h, port, err := net.SplitHostPort(host) if err != nil { - return r.Host + return host } if isDefaultPort(r.URL.Scheme, port) { return h } - return r.Host + return host } }