Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sso-proxy: add preserve host configuration option #55

Merged
merged 7 commits into from
Dec 1, 2018
Merged

sso-proxy: add preserve host configuration option #55

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bc72ab
Add preserve host configuration option
sporkmonger Sep 18, 2018
efe1190
Add config test for preserve_host option
Nov 28, 2018
98c64ce
Roll everything up into a pair of table driven tests
Nov 28, 2018
be27614
Avoid TLS failure due to expired cert on example.com
Nov 28, 2018
21a072e
Don't limit to a single X-Forwarded-Host after all
Nov 28, 2018
5b76cd6
Don't limit to a single X-Forwarded-Host after all
Nov 29, 2018
9f81a78
Merge branch 'master' into preserve-host-config
jphines Dec 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions internal/proxy/oauthproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,13 @@ func NewReverseProxy(to *url.URL, config *UpstreamConfig) *httputil.ReverseProxy
proxy.Transport = newUpstreamTransport(config.TLSSkipVerify)
director := proxy.Director
proxy.Director = func(req *http.Request) {
req.Header.Add("X-Forwarded-Host", req.Host)
if req.Header.Get("X-Forwarded-Host") == "" {
req.Header.Set("X-Forwarded-Host", req.Host)
}
director(req)
req.Host = to.Host
if !config.PreserveHost {
req.Host = to.Host
}
}
return proxy
}
Expand All @@ -212,9 +216,13 @@ func NewRewriteReverseProxy(route *RewriteRoute, config *UpstreamConfig) *httput
}
director := httputil.NewSingleHostReverseProxy(target).Director

req.Header.Add("X-Forwarded-Host", req.Host)
if req.Header.Get("X-Forwarded-Host") == "" {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is one more instance where a new X-Forwarded-Host is not added if there is already one in the request.

req.Header.Set("X-Forwarded-Host", req.Host)
}
director(req)
req.Host = target.Host
if !config.PreserveHost {
req.Host = target.Host
}
}
return proxy
}
Expand Down
Loading