Set http.WriteTimeout as 4x the user-specific timeout (to handle bulk requests)

Author: wolveix

cmd/dss/main.go

@@ -26,7 +26,7 @@ var (
 		Use:     "dss",
 		Short:   "Scan a domain's DNS records.",
 		Long:    "Scan a domain's DNS records.\nhttps://github.com/GlobalCyberAlliance/domain-security-scanner",
-		Version: "3.0.11",
+		Version: "3.0.12",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			var logWriter io.Writer
 

cmd/dss/serve.go

@@ -64,7 +64,7 @@ var (
 				log.Fatal().Err(err).Msg("could not create domain scanner")
 			}
 
-			server := http.NewServer(log, cmd.Version)
+			server := http.NewServer(log, timeout, cmd.Version)
 			if advise {
 				server.Advisor = advisor.NewAdvisor(timeout, cache, checkTLS)
 			}

go.mod

@@ -3,7 +3,7 @@ module github.com/GlobalCyberAlliance/domain-security-scanner
 go 1.22.0
 
 require (
-	github.com/danielgtaylor/huma/v2 v2.13.1
+	github.com/danielgtaylor/huma/v2 v2.14.0
 	github.com/emersion/go-imap v1.2.1
 	github.com/go-chi/chi/v5 v5.0.12
 	github.com/go-chi/cors v1.2.1

go.sum

@@ -2,8 +2,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/danielgtaylor/huma/v2 v2.13.1 h1:6smKeXGMddUY6PhBPeWHf/Z/aS4YLq0mq3tK0iWUuPc=
-github.com/danielgtaylor/huma/v2 v2.13.1/go.mod h1:bIRg+KyQETiMJmtfOHy2AOBTyx3zXBgppIAgIOMllAg=
+github.com/danielgtaylor/huma/v2 v2.14.0 h1:lRuhQQPZhePvJ4B/m4kfIUYfD8ZPy5BKq/oktLFmB50=
+github.com/danielgtaylor/huma/v2 v2.14.0/go.mod h1:OdHC/JliXtOrnvHLQTU5qV7WvYRQXwWY1tkl5rLXmuE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/http/server.go

@@ -24,6 +24,7 @@ type Server struct {
 	apiPath string
 	logger  zerolog.Logger
 	router  huma.API
+	timeout time.Duration
 
 	Addr     string
 	CheckTLS bool
@@ -34,10 +35,11 @@ type Server struct {
 }
 
 // NewServer returns a new instance of Server.
-func NewServer(logger zerolog.Logger, version string) *Server {
+func NewServer(logger zerolog.Logger, timeout time.Duration, version string) *Server {
 	server := Server{
 		apiPath: "/api/v1",
 		logger:  logger,
+		timeout: timeout,
 	}
 
 	config := huma.DefaultConfig("Domain Security Scanner", version)
@@ -103,9 +105,14 @@ func (s *Server) Serve(port int) {
 	}
 
 	portString := cast.ToString(port)
+	httpServer := &http.Server{
+		Addr:         "0.0.0.0:" + portString,
+		Handler:      s.router.Adapter(),
+		WriteTimeout: 4 * s.timeout, // timeout is used by the scanner per request, so multiply it by 4 to allow for bulk requests
+	}
 
 	s.logger.Info().Msg("Starting api server on port " + portString)
-	s.logger.Fatal().Err(http.ListenAndServe("0.0.0.0:"+portString, s.router.Adapter())).Msg("an error occurred while hosting the api server")
+	s.logger.Fatal().Err(httpServer.ListenAndServe()).Msg("an error occurred while hosting the api server")
 }
 
 func (s *Server) registerVersionRoute(version string) {