DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly parse x-forwarded-host

Browse source
This commit is contained in:
Elvin Efendi 2019-03-31 13:33:59 -04:00
parent 79431812b6
commit 87e962682f
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rootfs/etc/nginx/lua/lua_ingress.lua
View file

@ -68,6 +68,16 @@ local function redirect_host()
return host_port[1]; return host_port[1];
end end
local function parse_x_forwarded_host()
local hosts, err = ngx_re_split(ngx.var.http_x_forwarded_host, ",")
if err then
ngx.log(ngx.ERR, string_format("could not parse variable: %s", err))
return ""
end
return hosts[1]
end
function _M.init_worker() function _M.init_worker()
randomseed() randomseed()
end end
@ -96,10 +106,7 @@ function _M.rewrite(location_config)
-- Obtain best http host -- Obtain best http host
if ngx.var.http_x_forwarded_host then if ngx.var.http_x_forwarded_host then
-- TODO(elvinefendi) https://github.com/kubernetes/ingress-nginx/issues/3790 can ngx.var.best_http_host = parse_x_forwarded_host()
-- be fixed here by splitting the value of ngx.var.http_x_forwarded_host by ','
-- and taking the first portion
ngx.var.best_http_host = ngx.var.http_x_forwarded_host
end end
end end

17
test/e2e/settings/forwarded_headers.go
View file

@ -54,6 +54,7 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() {
return strings.Contains(server, "server_name forwarded-headers") return strings.Contains(server, "server_name forwarded-headers")
}) })
By("ensuring single values are parsed correctly")
resp, body, errs := gorequest.New(). resp, body, errs := gorequest.New().
Get(f.GetURL(framework.HTTP)). Get(f.GetURL(framework.HTTP)).
Set("Host", host). Set("Host", host).
@ -70,6 +71,22 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() {
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-proto=myproto"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-proto=myproto")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=1234"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=1234")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-for=1.2.3.4"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-for=1.2.3.4")))
By("ensuring that first entry in X-Forwarded-Host is used as the best host")
resp, body, errs = gorequest.New().
Get(f.GetURL(framework.HTTP)).
Set("Host", host).
Set("X-Forwarded-Port", "1234").
Set("X-Forwarded-Proto", "myproto").
Set("X-Forwarded-For", "1.2.3.4").
Set("X-Forwarded-Host", "myhost.com, another.host,example.net").
End()
Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=myhost.com")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-host=myhost.com")))
}) })
It("should not trust X-Forwarded headers when setting is false", func() { It("should not trust X-Forwarded headers when setting is false", func() {
host := "forwarded-headers" host := "forwarded-headers"