hanzoai/oxy
2
0
Fork 0
mirror of https://github.com/hanzoai/oxy.git synced 2026-09-30 23:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from fracklen/trust-forward-host

Browse Source 
If forwarded headers are trusted - don't mangle X-Forwarded-Host
This commit is contained in:
Alexander Klizhentas
2015-07-01 13:24:02 -07:00
parent 16f684286b 496d5a0520
commit 946eb4e5ba
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
forward/fwd_test.go
+2
View File
@@ -115,6 +115,7 @@ func (s *FwdSuite) TestForwardedHeaders(c *C) {
XForwardedProto: []string{"httpx"},
XForwardedFor: []string{"192.168.1.1"},
XForwardedServer: []string{"foobar"},
XForwardedHost: []string{"upstream-foobar"},
}
re, _, err := testutils.Get(proxy.URL, testutils.Headers(headers))
@@ -122,6 +123,7 @@ func (s *FwdSuite) TestForwardedHeaders(c *C) {
c.Assert(re.StatusCode, Equals, http.StatusOK)
c.Assert(outHeaders.Get(XForwardedProto), Equals, "httpx")
c.Assert(strings.Contains(outHeaders.Get(XForwardedFor), "192.168.1.1"), Equals, true)
c.Assert(strings.Contains(outHeaders.Get(XForwardedHost), "upstream-foobar"), Equals, true)
c.Assert(outHeaders.Get(XForwardedServer), Equals, "hello")
}
forward/rewrite.go
+4 -1
View File
@@ -32,9 +32,12 @@ func (rw *HeaderRewriter) Rewrite(req *http.Request) {
req.Header.Set(XForwardedProto, "http")
}
if req.Host != "" {
if xfh := req.Header.Get(XForwardedHost); xfh != "" && rw.TrustForwardHeader {
req.Header.Set(XForwardedHost, xfh)
} else if req.Host != "" {
req.Header.Set(XForwardedHost, req.Host)
}
if rw.Hostname != "" {
req.Header.Set(XForwardedServer, rw.Hostname)
}