github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: make feature more generic, also add support for setting -port and -proto values via nginx:set, refs #4339

Browse Source
This commit is contained in:
Bjorn Post
2021-01-19 21:40:47 +01:00
parent ca56fa1b8b
commit a6062d4ab4
6 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
tests/unit/nginx-vhosts_6.bats
View File

@@ -156,7 +156,7 @@ teardown() {
assert_output_contains "127.0.0.1:80;" 0
}
@test "(nginx-vhosts) nginx:set trust-x-forwarded-for" {
@test "(nginx-vhosts) nginx:set x-forwarded-for-value" {
run deploy_app
echo "output: $output"
echo "status: $status"
@@ -170,9 +170,9 @@ teardown() {
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "X-Forwarded-For $remote_addr;"
assert_output_contains "X-Forwarded-For \$remote_addr;"
run /bin/bash -c "dokku nginx:set $TEST_APP trust-x-forwarded-for true"
run /bin/bash -c "dokku nginx:set $TEST_APP x-forwarded-for-value '\$http_x_forwarded_for'"
echo "output: $output"
echo "status: $status"
assert_success
@@ -185,9 +185,11 @@ teardown() {
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "X-Forwarded-For $proxy_add_x_forwarded_for;"
assert_output_contains "X-Forwarded-For \$http_x_forwarded_for;"
}
run /bin/bash -c "dokku nginx:set $TEST_APP trust-x-forwarded-for false"
@test "(nginx-vhosts) nginx:set x-forwarded-port-value" {
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
@@ -200,7 +202,54 @@ teardown() {
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "X-Forwarded-For $remote_addr;"
assert_output_contains "X-Forwarded-Port \$server_port;"
run /bin/bash -c "dokku nginx:set $TEST_APP x-forwarded-port-value '\$http_x_forwarded_port'"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:build-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "X-Forwarded-Port \$http_x_forwarded_port;"
}
@test "(nginx-vhosts) nginx:set x-forwarded-proto-value" {
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:build-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "X-Forwarded-Proto \$scheme;"
run /bin/bash -c "dokku nginx:set $TEST_APP x-forwarded-proto-value '\$http_x_forwarded_proto'"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:build-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "X-Forwarded-Proto \$http_x_forwarded_proto;"
}
@test "(nginx-vhosts) nginx:validate-config" {