Merge 43e2d1d0739ebed8a4865672c8c91c0408ec67ee into 498109addb6f2541082b88cb6ae115939321873c

propagate X-Forwarded-Proto header
fix logic
2025-06-14 16:34:27 +00:00 · 2025-01-30 11:46:45 +01:00 · 2024-06-22 19:15:43 +02:00 · 2024-06-22 18:08:58 +02:00 · 2024-06-22 15:01:39 +02:00 · 2024-06-22 14:56:52 +02:00
2 changed files with 11 additions and 2 deletions
--- a/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
@ -2,6 +2,9 @@ set $test "";
 if ($scheme = "http") {
 	set $test "H";
 }
+if ($http_x_forwarded_proto = "https") {
+	set $test "";
+}
 if ($request_uri = /.well-known/acme-challenge/test-challenge) {
 	set $test "${test}T";
 }
--- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
@ -1,7 +1,13 @@
 add_header       X-Served-By $host;
 proxy_set_header Host $host;
-proxy_set_header X-Forwarded-Scheme $scheme;
-proxy_set_header X-Forwarded-Proto  $scheme;
+
+set $origin_scheme $scheme;
+if ($http_x_forwarded_proto != "") {
+	set $origin_scheme $http_x_forwarded_proto;
+}
+proxy_set_header X-Forwarded-Scheme $origin_scheme;
+proxy_set_header X-Forwarded-Proto  $origin_scheme;
+
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
 proxy_set_header X-Real-IP          $remote_addr;
 proxy_pass       $forward_scheme://$server:$port$request_uri;
Author	SHA1	Message	Date
Pau Capó	cec5bb7aec	Merge 43e2d1d0739ebed8a4865672c8c91c0408ec67ee into 498109addb6f2541082b88cb6ae115939321873c	2025-01-30 11:46:45 +01:00
Pau Capó	43e2d1d073	propagate X-Forwarded-Proto header	2024-06-22 19:15:43 +02:00
Pau Capó	81b7661849	fix logic	2024-06-22 18:08:58 +02:00
Pau Capó	54d6196d36	use tabs instead of spaces	2024-06-22 15:01:39 +02:00
Pau Capó	1a12f7f3a8	force-ssl behind another proxy using http_x_forwarded_proto	2024-06-22 14:56:52 +02:00