Merge branch 'feature/add-support-for-reverse-proxy' into 'master'

Add support for reverse proxy

See merge request gitlab-org/gitlab-pages!99

1 files changed, 9 insertions, 2 deletions

diff --git a/app.go b/app.go
index 38738960..5527d1f7 100644
--- a/app.go
+++ b/app.go
@@ -24,8 +24,11 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/metrics"
 )
 
-const xForwardedProto = "X-Forwarded-Proto"
-const xForwardedProtoHTTPS = "https"
+const (
+	xForwardedProto      = "X-Forwarded-Proto"
+	xForwardedHost       = "X-Forwarded-Host"
+	xForwardedProtoHTTPS = "https"
+)
 
 var (
 	corsHandler = cors.New(cors.Options{AllowedMethods: []string{"GET"}})
@@ -158,6 +161,10 @@ func (a *theApp) ServeProxy(ww http.ResponseWriter, r *http.Request) {
 	forwardedProto := r.Header.Get(xForwardedProto)
 	https := forwardedProto == xForwardedProtoHTTPS
 
+	if forwardedHost := r.Header.Get(xForwardedHost); forwardedHost != "" {
+		r.Host = forwardedHost
+	}
+
 	a.serveContent(ww, r, https)
 }