Merge branch 'fix/xforward-duplicate' into 'master'

fix: remove duplicate xForwardedHost handler

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

1 files changed, 1 insertions, 16 deletions

diff --git a/app.go b/app.go
index 19bcedcd..da40c5f1 100644
--- a/app.go
+++ b/app.go
@@ -44,10 +44,6 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/metrics"
 )
 
-const (
-	xForwardedHost = "X-Forwarded-Host"
-)
-
 var (
 	corsHandler = cors.New(cors.Options{AllowedMethods: []string{http.MethodGet, http.MethodHead}})
 )
@@ -215,17 +211,6 @@ func (a *theApp) httpInitialMiddleware(handler http.Handler) http.Handler {
 	})
 }
 
-// proxyInitialMiddleware sets up proxy requests
-func (a *theApp) proxyInitialMiddleware(handler http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if forwardedHost := r.Header.Get(xForwardedHost); forwardedHost != "" {
-			r.Host = forwardedHost
-		}
-
-		handler.ServeHTTP(w, r)
-	})
-}
-
 // setRequestScheme will update r.URL.Scheme if empty based on r.TLS
 func setRequestScheme(r *http.Request) *http.Request {
 	if r.URL.Scheme == request.SchemeHTTPS || r.TLS != nil {
@@ -309,7 +294,7 @@ func (a *theApp) Run() {
 		log.WithError(err).Fatal("Unable to configure pipeline")
 	}
 
-	proxyHandler := a.proxyInitialMiddleware(ghandlers.ProxyHeaders(commonHandlerPipeline))
+	proxyHandler := ghandlers.ProxyHeaders(commonHandlerPipeline)
 
 	httpHandler := a.httpInitialMiddleware(commonHandlerPipeline)