Setup http server timeout connections

Move stopBrowserMiddleware after logging middleware,
but before timeoutMiddleware.

Set Write and Read timeouts for http server.

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Replace logrus with zerolog. (#413, @miry)
 * Log HTTP requests to API server. (#413, #421, @miry)
 * Add TimeoutHandler for the HTTP API server. (#420, @miry)
+* Set Write and Read timeouts for HTTP API server connections. (@miry)
 
 # [2.4.0] - 2022-03-07
 

api.go

@@ -46,12 +46,12 @@ func (server *ApiServer) PopulateConfig(filename string) {
 	}
 }
 
-func StopBrowsersMiddleware(h http.Handler) http.Handler {
+func stopBrowsersMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if strings.HasPrefix(r.UserAgent(), "Mozilla/") {
 			http.Error(w, "User agent not allowed", 403)
 		} else {
-			h.ServeHTTP(w, r)
+			next.ServeHTTP(w, r)
 		}
 	})
 }
@@ -74,6 +74,7 @@ func (server *ApiServer) Listen(host string, port string) {
 			Dur("duration", duration).
 			Msg("")
 	}))
+	r.Use(stopBrowsersMiddleware)
 	r.Use(timeoutMiddleware)
 
 	r.HandleFunc("/reset", server.ResetState).Methods("POST")
@@ -95,16 +96,21 @@ func (server *ApiServer) Listen(host string, port string) {
 		r.Handle("/metrics", server.Metrics.handler())
 	}
 
-	http.Handle("/", StopBrowsersMiddleware(r))
-
 	server.Logger.
 		Info().
 		Str("host", host).
 		Str("port", port).
 		Str("version", Version).
 		Msgf("Starting HTTP server on endpoint %s:%s", host, port)
 
-	err := http.ListenAndServe(net.JoinHostPort(host, port), nil)
+	srv := &http.Server{
+		Handler:      r,
+		Addr:         net.JoinHostPort(host, port),
+		WriteTimeout: 10 * time.Second,
+		ReadTimeout:  10 * time.Second,
+	}
+
+	err := srv.ListenAndServe()
 	if err != nil {
 		server.Logger.Fatal().Err(err).Msg("ListenAndServe finished with error")
 	}