Set read/write timeouts for HTTP servers (ssvlabs#991)

Co-authored-by: Lior Rutenberg <[email protected]>
fplk0 · Jun 7, 2023 · b7ccbe0 · b7ccbe0
1 parent 20150b5
commit b7ccbe0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 18 deletions.
diff --git a/exporter/api/server.go b/exporter/api/server.go
@@ -5,12 +5,13 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/bloxapp/ssv/logging"
-	"github.com/bloxapp/ssv/logging/fields"
-	"github.com/bloxapp/ssv/utils/tasks"
 	"github.com/gorilla/websocket"
 	"github.com/prysmaticlabs/prysm/async/event"
 	"go.uber.org/zap"
+
+	"github.com/bloxapp/ssv/logging"
+	"github.com/bloxapp/ssv/logging/fields"
+	"github.com/bloxapp/ssv/utils/tasks"
 )
 
 const (
@@ -70,9 +71,16 @@ func (ws *wsServer) Start(logger *zap.Logger, addr string) error {
 
 	logger.Info("starting", fields.Address(addr), zap.Strings("endPoints", []string{"/query", "/stream"}))
 
-	// TODO: enable lint (G114: Use of net/http serve function that has no support for setting timeouts (gosec))
-	// nolint: gosec
-	err := http.ListenAndServe(addr, ws.router)
+	const timeout = 3 * time.Second
+
+	httpServer := &http.Server{
+		Addr:         addr,
+		Handler:      ws.router,
+		ReadTimeout:  timeout,
+		WriteTimeout: timeout,
+	}
+
+	err := httpServer.ListenAndServe()
 	if err != nil {
 		logger.Warn("could not start", zap.Error(err))
 	}

diff --git a/monitoring/metrics/handler.go b/monitoring/metrics/handler.go
@@ -10,6 +10,7 @@ import (
 	http_pprof "net/http/pprof"
 	"runtime"
 	"strings"
+	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
@@ -85,11 +86,20 @@ func (mh *metricsHandler) Start(logger *zap.Logger, mux *http.ServeMux, addr str
 	mux.HandleFunc("/database/count-by-collection", mh.handleCountByCollection)
 	mux.HandleFunc("/health", mh.handleHealth)
 
-	// TODO: enable lint (G114: Use of net/http serve function that has no support for setting timeouts (gosec))
-	// nolint: gosec
-	if err := http.ListenAndServe(addr, mux); err != nil {
-		return fmt.Errorf("listen to %s: %w", addr, err)
-	}
+	go func() {
+		const timeout = 3 * time.Second
+
+		httpServer := &http.Server{
+			Addr:         addr,
+			Handler:      mux,
+			ReadTimeout:  timeout,
+			WriteTimeout: timeout,
+		}
+
+		if err := httpServer.ListenAndServe(); err != nil {
+			return fmt.Errorf("listen to %s: %w", addr, err)
+		}
+	}()
 
 	return nil
 }

diff --git a/utils/boot_node/node.go b/utils/boot_node/node.go
@@ -9,10 +9,7 @@ import (
 	"net"
 	"net/http"
 	"path/filepath"
-
-	"github.com/bloxapp/ssv/logging"
-	"github.com/bloxapp/ssv/logging/fields"
-	"github.com/bloxapp/ssv/networkconfig"
+	"time"
 
 	"github.com/ethereum/go-ethereum/p2p/discover"
 	"github.com/ethereum/go-ethereum/p2p/enode"
@@ -23,6 +20,9 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/bloxapp/ssv/beacon/goclient"
+	"github.com/bloxapp/ssv/logging"
+	"github.com/bloxapp/ssv/logging/fields"
+	"github.com/bloxapp/ssv/networkconfig"
 	"github.com/bloxapp/ssv/utils"
 )
 
@@ -121,9 +121,16 @@ func (n *bootNode) Start(ctx context.Context, logger *zap.Logger) error {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/p2p", handler.httpHandler(logger))
 
-	// TODO: enable lint (G114: Use of net/http serve function that has no support for setting timeouts (gosec))
-	// nolint: gosec
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", n.tcpPort), mux); err != nil {
+	const timeout = 3 * time.Second
+
+	httpServer := &http.Server{
+		Addr:         fmt.Sprintf(":%d", n.tcpPort),
+		Handler:      mux,
+		ReadTimeout:  timeout,
+		WriteTimeout: timeout,
+	}
+
+	if err := httpServer.ListenAndServe(); err != nil {
 		log.Fatalf("Failed to start server %v", err)
 	}