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

Merge pull request #4956 from djboris9/proxy-protocol-port

Browse source 
Fix proxy protocol support for X-Forwarded-Port
This commit is contained in:
Kubernetes Prow Robot 2020-01-26 12:27:02 -08:00 committed by GitHub
commit 2f8cbeb8fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,6 @@ end
-- phases or redirection -- phases or redirection
function _M.rewrite(location_config) function _M.rewrite(location_config)
ngx.var.pass_access_scheme = ngx.var.scheme ngx.var.pass_access_scheme = ngx.var.scheme
ngx.var.pass_server_port = ngx.var.server_port
ngx.var.best_http_host = ngx.var.http_host or ngx.var.host ngx.var.best_http_host = ngx.var.http_host or ngx.var.host
if config.use_forwarded_headers then if config.use_forwarded_headers then

6
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -1021,7 +1021,13 @@ stream {
set $proxy_upstream_name {{ buildUpstreamName $location | quote }}; set $proxy_upstream_name {{ buildUpstreamName $location | quote }};
set $proxy_host $proxy_upstream_name; set $proxy_host $proxy_upstream_name;
set $pass_access_scheme $scheme; set $pass_access_scheme $scheme;
{{ if $all.Cfg.UseProxyProtocol }}
set $pass_server_port $proxy_protocol_server_port;
{{ else }}
set $pass_server_port $server_port; set $pass_server_port $server_port;
{{ end }}
set $best_http_host $http_host; set $best_http_host $http_host;
set $pass_port $pass_server_port; set $pass_port $pass_server_port;

2
test/e2e/settings/proxy_protocol.go
View file

@ -68,7 +68,7 @@ var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
Expect(err).NotTo(HaveOccurred(), "unexpected error reading connection data") Expect(err).NotTo(HaveOccurred(), "unexpected error reading connection data")
body := string(data) body := string(data)
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", "proxy-protocol"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", "proxy-protocol")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=80"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=1234")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-for=192.168.0.1"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-for=192.168.0.1")))
}) })
}) })