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

delete redundant NGINX config about X-Forwarded-Proto

Browse source
This commit is contained in:
Elvin Efendi 2020-09-15 13:22:26 -04:00
parent 4dd206b31a
commit 8e83d4e84a
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,14 +391,6 @@ http {
{{ end }} {{ end }}
{{ if $cfg.UseForwardedHeaders }}
map $http_x_forwarded_proto $full_x_forwarded_proto {
default $http_x_forwarded_proto;
"" $scheme;
}
{{ end }}
# Create a variable that contains the literal $ character. # Create a variable that contains the literal $ character.
# This works because the geo module will not resolve variables. # This works because the geo module will not resolve variables.
geo $literal_dollar { geo $literal_dollar {
@ -1216,13 +1208,9 @@ stream {
{{ else }} {{ else }}
{{ $proxySetHeader }} X-Forwarded-For $remote_addr; {{ $proxySetHeader }} X-Forwarded-For $remote_addr;
{{ end }} {{ end }}
{{ if $all.Cfg.UseForwardedHeaders }}
{{ $proxySetHeader }} X-Forwarded-Proto $full_x_forwarded_proto;
{{ else }}
{{ $proxySetHeader }} X-Forwarded-Proto $pass_access_scheme;
{{ end }}
{{ $proxySetHeader }} X-Forwarded-Host $best_http_host; {{ $proxySetHeader }} X-Forwarded-Host $best_http_host;
{{ $proxySetHeader }} X-Forwarded-Port $pass_port; {{ $proxySetHeader }} X-Forwarded-Port $pass_port;
{{ $proxySetHeader }} X-Forwarded-Proto $pass_access_scheme;
{{ if $all.Cfg.ProxyAddOriginalURIHeader }} {{ if $all.Cfg.ProxyAddOriginalURIHeader }}
{{ $proxySetHeader }} X-Original-URI $request_uri; {{ $proxySetHeader }} X-Original-URI $request_uri;
{{ end }} {{ end }}

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

@ -48,7 +48,7 @@ var _ = framework.DescribeSetting("use-forwarded-headers", func() {
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return strings.Contains(server, "server_name forwarded-headers") && return strings.Contains(server, "server_name forwarded-headers") &&
strings.Contains(server, "proxy_set_header X-Forwarded-Proto $full_x_forwarded_proto;") strings.Contains(server, "proxy_set_header X-Forwarded-Proto $pass_access_scheme;")
}) })
ginkgo.By("ensuring single values are parsed correctly") ginkgo.By("ensuring single values are parsed correctly")