Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge c6459aabab into 51aeee9a2c

Browse source
This commit is contained in:
Chase 2016-11-27 22:14:37 +00:00 committed by GitHub
commit d7574c3f53
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nginx.tmpl
View file

@ -19,11 +19,18 @@
# If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the # If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
# scheme used to connect to this server # scheme used to connect to this server
map $http_x_forwarded_proto $proxy_x_forwarded_proto { map $http_x_forwarded_proto $default_forwarded_proto {
default $http_x_forwarded_proto; default $http_x_forwarded_proto;
'' $scheme; '' $scheme;
} }
# If we received a HTTP-CloudFront-Forwarded-Proto, pass it through; otherwise,
# pass along the original value.
map $http_cloudfront_forwarded_proto $proxy_x_forwarded_proto {
default $http_cloudfront_forwarded_proto;
'' $default_forwarded_proto;
}
# If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any # If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any
# Connection header that may have been passed to this server # Connection header that may have been passed to this server
map $http_upgrade $proxy_connection { map $http_upgrade $proxy_connection {

8
test/default-host.bats
View file

@ -26,6 +26,14 @@ function setup {
# THEN querying the proxy with any other Host header → 200 # THEN querying the proxy with any other Host header → 200
run curl_container $SUT_CONTAINER / --head --header "Host: something.I.just.made.up" run curl_container $SUT_CONTAINER / --head --header "Host: something.I.just.made.up"
assert_output -l 0 $'HTTP/1.1 200 OK\r' assert_output -l 0 $'HTTP/1.1 200 OK\r'
# THEN querying the proxy with X-Forwarded-Proto → 200
run curl_container $SUT_CONTAINER / --head --header "X-Forwarded-Proto: https"
assert_output -l 0 $'HTTP/1.1 200 OK\r'
# THEN querying the proxy with HTTP-CloudFront-Forwarded-Proto → 200
run curl_container $SUT_CONTAINER / --head --header "HTTP-CloudFront-Forwarded-Proto: https"
assert_output -l 0 $'HTTP/1.1 200 OK\r'
} }
@test "[$TEST_FILE] stop all bats containers" { @test "[$TEST_FILE] stop all bats containers" {