Merge pull request #4 from Intellection/forward_headers_to_upstream

Forward X-Forwarded-* headers to upstream correctly

Author: itskingori

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.19.5-2
+
+* Forward `X-Forwarded-*` headers to upstream correctly.
+
 ## 1.19.5-1
 
 * Change health check port from `18080` to `18081`.

config/http.conf

@@ -9,15 +9,36 @@ http {
   client_max_body_size  400m;
   client_body_timeout   300s;
 
+  # If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
+  # scheme used to connect to this server
+  map $http_x_forwarded_proto $proxy_x_forwarded_proto {
+    default $http_x_forwarded_proto;
+    ''      $scheme;
+  }
+
+  # If we receive X-Forwarded-Proto, use it to determine the value of
+  # X-Forwarded-Ssl
+  map $http_x_forwarded_proto $proxy_x_forwarded_ssl {
+    default off;
+    https   on;
+  }
+
+  # If we receive X-Forwarded-Port, pass it through; otherwise, pass along the
+  # server port the client connected to
+  map $http_x_forwarded_port $proxy_x_forwarded_port {
+    default $http_x_forwarded_port;
+    ''      $server_port;
+  }
+
   proxy_http_version  1.1;
   proxy_set_header    Connection          "";
   proxy_set_header    Host                $host;
 
   proxy_set_header    X-Real-IP           $remote_addr;
   proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-  proxy_set_header    X-Forwarded-Proto   $scheme;
-  proxy_set_header    X-Forwarded-Ssl     on;
-  proxy_set_header    X-Forwarded-Port    $server_port;
+  proxy_set_header    X-Forwarded-Proto   $proxy_x_forwarded_proto;
+  proxy_set_header    X-Forwarded-Ssl     $proxy_x_forwarded_ssl;
+  proxy_set_header    X-Forwarded-Port    $proxy_x_forwarded_port;
   proxy_set_header    X-Forwarded-Host    $host;
 
   proxy_read_timeout  600s;