Merge pull request #4958 from niedbalski/fix-forwarded-proto

Add a forwarded protocol map for included x-forwarded-proto.
This commit is contained in:
Kubernetes Prow Robot 2020-03-11 02:35:36 -07:00 committed by GitHub
commit d5d1e9bfbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -323,6 +323,12 @@ http {
'' "$realip_remote_addr"; '' "$realip_remote_addr";
{{ end}} {{ end}}
} }
map $http_x_forwarded_proto $full_x_forwarded_proto {
default $http_x_forwarded_proto;
"" $scheme;
}
{{ end }} {{ end }}
# Create a variable that contains the literal $ character. # Create a variable that contains the literal $ character.
@ -1132,6 +1138,7 @@ stream {
{{ $proxySetHeader }} X-Real-IP $remote_addr; {{ $proxySetHeader }} X-Real-IP $remote_addr;
{{ if and $all.Cfg.UseForwardedHeaders $all.Cfg.ComputeFullForwardedFor }} {{ if and $all.Cfg.UseForwardedHeaders $all.Cfg.ComputeFullForwardedFor }}
{{ $proxySetHeader }} X-Forwarded-For $full_x_forwarded_for; {{ $proxySetHeader }} X-Forwarded-For $full_x_forwarded_for;
{{ $proxySetHeader }} X-Forwarded-Proto $full_x_forwarded_proto;
{{ else }} {{ else }}
{{ $proxySetHeader }} X-Forwarded-For $remote_addr; {{ $proxySetHeader }} X-Forwarded-For $remote_addr;
{{ end }} {{ end }}