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

do not ignore $http_host and $http_x_forwarded_host (#2030)

Browse source
This commit is contained in:
Elvin Efendi 2018-02-06 13:59:59 -05:00 committed by Manuel Alejandro de Brito Fontes
parent 20675cccd0
commit a30bf2154e
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,6 +226,17 @@ http {
} }
{{ end }} {{ end }}
# Obtain best http host
map $http_host $this_host {
default $http_host;
'' $host;
}
map $http_x_forwarded_host $best_http_host {
default $http_x_forwarded_host;
'' $this_host;
}
{{ if $cfg.ComputeFullForwardedFor }} {{ if $cfg.ComputeFullForwardedFor }}
# We can't use $proxy_add_x_forwarded_for because the realip module # We can't use $proxy_add_x_forwarded_for because the realip module
# replaces the remote_addr too soon # replaces the remote_addr too soon
@ -714,7 +725,7 @@ stream {
return 497; return 497;
{{ else }} {{ else }}
return {{ $all.Cfg.HTTPRedirectCode }} https://$host$request_uri; return {{ $all.Cfg.HTTPRedirectCode }} https://$best_http_host$request_uri;
{{ end }} {{ end }}
} }
{{ end }} {{ end }}
@ -784,7 +795,7 @@ stream {
{{ if not (empty $location.UpstreamVhost) }} {{ if not (empty $location.UpstreamVhost) }}
proxy_set_header Host "{{ $location.UpstreamVhost }}"; proxy_set_header Host "{{ $location.UpstreamVhost }}";
{{ else }} {{ else }}
proxy_set_header Host $host; proxy_set_header Host $best_http_host;
{{ end }} {{ end }}
# Pass the extracted client certificate to the backend # Pass the extracted client certificate to the backend
@ -816,7 +827,7 @@ stream {
{{ else }} {{ else }}
proxy_set_header X-Forwarded-For $the_real_ip; proxy_set_header X-Forwarded-For $the_real_ip;
{{ end }} {{ end }}
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $best_http_host;
proxy_set_header X-Forwarded-Port $pass_port; proxy_set_header X-Forwarded-Port $pass_port;
proxy_set_header X-Forwarded-Proto $pass_access_scheme; proxy_set_header X-Forwarded-Proto $pass_access_scheme;
proxy_set_header X-Original-URI $request_uri; proxy_set_header X-Original-URI $request_uri;