Skip to content

Commit 2738168

Browse files
committed
fix: #86ew03681 Update X-Forwarded-Proto handling in Nginx configuration
- Changed the value of the `X-Forwarded-Proto` header to use `$proxy_x_forwarded_proto` instead of `$scheme` in multiple server blocks across `default.conf` and `default.local.conf`. - Added a mapping in `nginx.conf` to correctly handle `X-Forwarded-Proto` from proxies like Cloudflare, ensuring proper protocol forwarding.
1 parent 5295540 commit 2738168

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

nginx/default.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ server {
4242
proxy_set_header Host $host;
4343
proxy_set_header X-Real-IP $remote_addr;
4444
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
45-
proxy_set_header X-Forwarded-Proto $scheme;
45+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
4646
proxy_set_header X-Forwarded-Host $host;
4747
proxy_set_header X-Forwarded-Port $server_port;
4848

@@ -64,7 +64,7 @@ server {
6464
proxy_set_header Host $host;
6565
proxy_set_header X-Real-IP $remote_addr;
6666
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
67-
proxy_set_header X-Forwarded-Proto $scheme;
67+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
6868
proxy_set_header X-Forwarded-Host $host;
6969
proxy_set_header X-Forwarded-Prefix /api;
7070
proxy_set_header Upgrade $http_upgrade;
@@ -101,7 +101,7 @@ server {
101101
proxy_set_header Host $host;
102102
proxy_set_header X-Real-IP $remote_addr;
103103
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
104-
proxy_set_header X-Forwarded-Proto $scheme;
104+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
105105
proxy_set_header X-Forwarded-Host $host;
106106
proxy_set_header X-Forwarded-Port $server_port;
107107
proxy_set_header Upgrade $http_upgrade;

nginx/default.local.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ server {
1313
proxy_set_header Host $host;
1414
proxy_set_header X-Real-IP $remote_addr;
1515
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
16-
proxy_set_header X-Forwarded-Proto $scheme;
16+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
1717
proxy_set_header X-Forwarded-Host $host;
1818
proxy_set_header X-Forwarded-Port $server_port;
1919

@@ -35,7 +35,7 @@ server {
3535
proxy_set_header Host $host;
3636
proxy_set_header X-Real-IP $remote_addr;
3737
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
38-
proxy_set_header X-Forwarded-Proto $scheme;
38+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
3939
proxy_set_header X-Forwarded-Host $host;
4040
proxy_set_header X-Forwarded-Prefix /api;
4141
proxy_set_header Upgrade $http_upgrade;
@@ -77,7 +77,7 @@ server {
7777
proxy_set_header Host $host;
7878
proxy_set_header X-Real-IP $remote_addr;
7979
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
80-
proxy_set_header X-Forwarded-Proto $scheme;
80+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
8181
proxy_set_header X-Forwarded-Host $host;
8282
proxy_set_header X-Forwarded-Port $server_port;
8383
proxy_set_header Upgrade $http_upgrade;

nginx/nginx.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ http {
3333
gzip_comp_level 6;
3434
gzip_types text/plain text/css text/xml text/javascript application/json application/javascript application/xml+rss application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml;
3535

36+
# Map to correctly handle X-Forwarded-Proto from Cloudflare or other proxies
37+
map $http_x_forwarded_proto $proxy_x_forwarded_proto {
38+
default $http_x_forwarded_proto;
39+
'' $scheme;
40+
}
41+
3642
include /etc/nginx/conf.d/*.conf;
3743
}
3844

0 commit comments

Comments
 (0)