Merge pull request #721 from luraproject/max_header_bytes

set the max header bytes param configurable

config/config.go

@@ -89,6 +89,12 @@ type ServiceConfig struct {
 	// after reading the headers and the Handler can decide what
 	// is considered too slow for the body.
 	ReadHeaderTimeout time.Duration `mapstructure:"read_header_timeout"`
+	// MaxHeaderBytes controls the maximum number of bytes the
+	// server will read parsing the request header's keys and
+	// values, including the request line. It does not limit the
+	// size of the request body.
+	// If zero, DefaultMaxHeaderBytes (1MB) is used.
+	MaxHeaderBytes int `mapstructure:"max_header_bytes"`
 
 	// DisableKeepAlives, if true, prevents re-use of TCP connections
 	// between different HTTP requests.

config/config_test.go

@@ -211,7 +211,7 @@ func TestConfig_init(t *testing.T) {
 		t.Error(err.Error())
 	}
 
-	if hash != "GdZTJtCn9ZHj3iBR1ZxmZL65HjbTCU8HhbDG8YWudAo=" {
+	if hash != "dEnC/Sn/mHYtt5vj+DkI0Ib22D/1liL8zx/WHpT2ajY=" {
 		t.Errorf("unexpected hash: %s", hash)
 	}
 }

config/parser.go

@@ -146,6 +146,7 @@ type parseableServiceConfig struct {
 	WriteTimeout          string                     `json:"write_timeout"`
 	IdleTimeout           string                     `json:"idle_timeout"`
 	ReadHeaderTimeout     string                     `json:"read_header_timeout"`
+	MaxHeaderBytes        int                        `json:"max_header_bytes"`
 	DisableKeepAlives     bool                       `json:"disable_keep_alives"`
 	DisableCompression    bool                       `json:"disable_compression"`
 	DisableStrictREST     bool                       `json:"disable_rest"`
@@ -181,6 +182,7 @@ func (p *parseableServiceConfig) normalize() ServiceConfig {
 		WriteTimeout:          parseDuration(p.WriteTimeout),
 		IdleTimeout:           parseDuration(p.IdleTimeout),
 		ReadHeaderTimeout:     parseDuration(p.ReadHeaderTimeout),
+		MaxHeaderBytes:        p.MaxHeaderBytes,
 		DisableKeepAlives:     p.DisableKeepAlives,
 		DisableCompression:    p.DisableCompression,
 		DisableStrictREST:     p.DisableStrictREST,

config/parser_test.go

@@ -15,6 +15,7 @@ func TestNewParser_ok(t *testing.T) {
     "port": 8080,
     "cache_ttl": "3600s",
     "timeout": "3s",
+    "max_header_bytes": 10000,
     "tls": {
 		"public_key":  "cert.pem",
 		"private_key": "key.pem"
@@ -108,6 +109,9 @@ func TestNewParser_ok(t *testing.T) {
 	if err != nil {
 		t.Error("Unexpected error. Got", err.Error())
 	}
+	if serviceConfig.MaxHeaderBytes != 10000 {
+		t.Errorf("unexpected max_header_bytes value. have %d, want 10000", serviceConfig.MaxHeaderBytes)
+	}
 	testExtraConfig(serviceConfig.ExtraConfig, t)
 
 	if endpoints := len(serviceConfig.Endpoints); endpoints != 3 {

transport/http/server/server.go

@@ -154,6 +154,7 @@ func NewServerWithLogger(cfg config.ServiceConfig, handler http.Handler, logger
 		ReadHeaderTimeout: cfg.ReadHeaderTimeout,
 		IdleTimeout:       cfg.IdleTimeout,
 		TLSConfig:         ParseTLSConfigWithLogger(cfg.TLS, logger),
+		MaxHeaderBytes:    cfg.MaxHeaderBytes,
 	}
 }