rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-19 18:16:15 +00:00
Code Issues Releases Wiki Activity

Fix x-api-host when setting ports

Browse Source
This commit is contained in:
Darren Shepherd
2020-02-21 13:17:12 -07:00
parent bf773d0210
commit b16f3160d5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
urlbuilder/url.go
View File

@@ -46,9 +46,11 @@ func ParseRequestURL(r *http.Request) string {
func GetHost(r *http.Request, scheme string) string { func GetHost(r *http.Request, scheme string) string {
host := r.Header.Get(ForwardedAPIHostHeader) host := r.Header.Get(ForwardedAPIHostHeader)
if host == "" { if host != "" {
host = strings.Split(r.Header.Get(ForwardedHostHeader), ",")[0] return host
} }
host = strings.Split(r.Header.Get(ForwardedHostHeader), ",")[0]
if host == "" { if host == "" {
host = r.Host host = r.Host
} }
@@ -68,7 +70,7 @@ func GetHost(r *http.Request, scheme string) string {
hostname, _, err := net.SplitHostPort(host) hostname, _, err := net.SplitHostPort(host)
if err != nil { if err != nil {
return host hostname = host
} }
return strings.Join([]string{hostname, port}, ":") return strings.Join([]string{hostname, port}, ":")