Merge pull request #144 from LiilyZhang/zhangl/staticScan

Issue142 - Configure ReadHeaderTimeout in http.Server
open-horizon · Feb 17, 2023 · f282c4a · f282c4a
2 parents e76c2d0 + b31b396
commit f282c4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/common/config.go b/common/config.go
@@ -216,6 +216,10 @@ type Config struct {
 	// default is 1
 	HTTPCSSObjDownloadConcurrencyMultiplier int `env:"HTTPCSSObjDownloadConcurrencyMultiplier"`
 
+	// HTTPServerReadHeaderTimeout is to specifyt the http server ReadHeaderTimout in second
+	// default is 60
+	HTTPServerReadHeaderTimeout int `env:"HTTPServerReadHeaderTimeout"`
+
 	// LogLevel specifies the logging level in string format
 	LogLevel string `env:"LOG_LEVEL"`
 
@@ -760,6 +764,7 @@ func SetDefaultConfig(config *Config) {
 	config.HTTPESSClientTimeout = 120
 	config.HTTPESSObjClientTimeout = 600
 	config.HTTPCSSObjDownloadConcurrencyMultiplier = 1
+	config.HTTPServerReadHeaderTimeout = 60
 	config.MessagingGroupCacheExpiration = 60
 	config.ShutdownQuiesceTime = 60
 	config.ESSConsumedObjectsKept = 1000

diff --git a/core/base/http.go b/core/base/http.go
@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"time"
 
 	"github.com/open-horizon/edge-sync-service/common"
 	"github.com/open-horizon/edge-utilities/logger"
@@ -21,8 +22,8 @@ var secureHTTPServer http.Server
 var unsecureHTTPServer http.Server
 
 func startHTTPServer(ipAddress string, registerHandlers bool, swaggerFile string) common.SyncServiceError {
-	secureHTTPServer = http.Server{}
-	unsecureHTTPServer = http.Server{}
+	secureHTTPServer = http.Server{ReadHeaderTimeout: time.Second * time.Duration(common.Configuration.HTTPServerReadHeaderTimeout)}
+	unsecureHTTPServer = http.Server{ReadHeaderTimeout: time.Second * time.Duration(common.Configuration.HTTPServerReadHeaderTimeout)}
 
 	secureHTTPServer.Addr =
 		fmt.Sprintf("%s:%d", common.Configuration.ListeningAddress,