Merge ~troyanov/maas:proxy-headers-backport-3.3 into maas:3.3

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 0c05a9b8d75d7f9cfe2edbce08230d9c99ea4b65
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:proxy-headers-backport-3.3
Merge into: maas:3.3
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/templates/http/regiond.nginx.conf.template (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Anton Troyanov Approve
Review via email: mp+439080@code.launchpad.net

Commit message

fix(region): use $http_host to read Host header

$http_name
arbitrary request header field;

the last part of a variable name is the field name converted to lower case
with dashes replaced by underscores

Resolves LP:2009186

(cherry picked from commit eff39899eab1331f712aa8c4f9f2004f9aded683)

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) wrote :

Self approve backport to 3.3

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b proxy-headers-backport-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/2155/consoleText

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b proxy-headers-backport-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/2155/consoleText
COMMIT: 0c05a9b8d75d7f9cfe2edbce08230d9c99ea4b65

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b proxy-headers-backport-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/2159/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/templates/http/regiond.nginx.conf.template b/src/maasserver/templates/http/regiond.nginx.conf.template
2index 650e1b4..13b1cbe 100644
3--- a/src/maasserver/templates/http/regiond.nginx.conf.template
4+++ b/src/maasserver/templates/http/regiond.nginx.conf.template
5@@ -11,7 +11,7 @@ proxy_set_header Host $host;
6 proxy_set_header X-Real-IP $remote_addr;
7 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
8 proxy_set_header X-Forwarded-Proto $scheme;
9-proxy_set_header X-Forwarded-Host $host:$server_port;
10+proxy_set_header X-Forwarded-Host $http_host;
11
12 server {
13 {{if tls_enabled}}

Subscribers

People subscribed via source and target branches