Add early https redirect

1 files changed, 14 insertions, 6 deletions

diff --git a/app.go b/app.go
index 4f187f9d..12228c53 100644
--- a/app.go
+++ b/app.go
@@ -117,12 +117,6 @@ func (a *theApp) checkAuthAndServeNotFound(domain *domain.Domain, w http.Respons
 }
 
 func (a *theApp) tryAuxiliaryHandlers(w http.ResponseWriter, r *http.Request, https bool, host string, domain *domain.Domain) bool {
-	// Add auto redirect
-	if !https && a.config.General.RedirectHTTP {
-		a.redirectToHTTPS(w, r, http.StatusTemporaryRedirect)
-		return true
-	}
-
 	if a.Handlers.HandleArtifactRequest(host, w, r) {
 		return true
 	}
@@ -188,6 +182,17 @@ func (a *theApp) auxiliaryMiddleware(handler http.Handler) http.Handler {
 	})
 }
 
+func (a *theApp) httpsRedirectMiddleware(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if a.config.General.RedirectHTTP && !request.IsHTTPS(r) {
+			a.redirectToHTTPS(w, r, http.StatusTemporaryRedirect)
+			return
+		}
+
+		handler.ServeHTTP(w, r)
+	})
+}
+
 // serveFileOrNotFoundHandler will serve static content or
 // return a 404 Not Found response
 func (a *theApp) serveFileOrNotFoundHandler() http.Handler {
@@ -255,6 +260,9 @@ func (a *theApp) buildHandlerPipeline() (http.Handler, error) {
 	// Custom response headers
 	handler = customheaders.NewMiddleware(handler, a.CustomHeaders)
 
+	// Add auto redirect
+	handler = a.httpsRedirectMiddleware(handler)
+
 	// Correlation ID injection middleware
 	var correlationOpts []correlation.InboundHandlerOption
 	if a.config.General.PropagateCorrelationID {