Simplify RealIP middleware setup

server/middlewares.go

@@ -157,6 +157,15 @@ func clientUniqueIDMiddleware(next http.Handler) http.Handler {
 	})
 }
 
+// realIPMiddleware wraps the middleware.RealIP middleware function, bypassing it if the
+// ReverseProxyWhitelist configuration option is set.
+func realIPMiddleware(h http.Handler) http.Handler {
+	if conf.Server.ReverseProxyWhitelist == "" {
+		return middleware.RealIP(h)
+	}
+	return h
+}
+
 // serverAddressMiddleware is a middleware function that modifies the request object
 // to reflect the address of the server handling the request, as determined by the
 // presence of X-Forwarded-* headers or the scheme and host of the request URL.

server/server.go

@@ -164,18 +164,13 @@ func (s *Server) initRoutes() {
 		secureMiddleware(),
 		corsHandler(),
 		middleware.RequestID,
-	}
+		realIPMiddleware,
-	if conf.Server.ReverseProxyWhitelist == "" {
-		middlewares = append(middlewares, middleware.RealIP)
-	}
-
-	middlewares = append(middlewares,
 		middleware.Recoverer,
 		middleware.Heartbeat("/ping"),
 		robotsTXT(ui.BuildAssets()),
 		serverAddressMiddleware,
 		clientUniqueIDMiddleware,
-	)
+	}
 
 	// Mount the Native API /events endpoint with all middlewares, except the compress and request logger,
 	// adding the authentication middlewares