Commit 95647a9b authored by Andrei Mihu's avatar Andrei Mihu
Browse files

New config parameter for max request message size.

parent 6dd5a716

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- New runtime functions to retrieve tournaments by ID.

- Allow tournament duration to exceed reset window, and cap the duration if it does.

- Ban group users, preventing them from rejoining or requesting to rejoin.

- New config parameter for max request message size, separate from socket message size limit.



### Changed

- Do not use absolute path for `tini` executable in default container entry point.

server/api.go

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, j 


	serverOpts := []grpc.ServerOption{

		grpc.StatsHandler(&ocgrpc.ServerHandler{IsPublicEndpoint: true}),

		grpc.MaxRecvMsgSize(int(config.GetSocket().MaxMessageSizeBytes)),

		grpc.MaxRecvMsgSize(int(config.GetSocket().MaxRequestSizeBytes)),

		grpc.UnaryInterceptor(func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {

			ctx, err := securityInterceptorFunc(logger, config, ctx, req, info)

			if err != nil {
@@ -168,7 +168,7 @@ func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, j 
	dialOpts := []grpc.DialOption{

		//TODO (mo, zyro): Do we need to pass the statsHandler here as well?

		grpc.WithDefaultCallOptions(

			grpc.MaxCallSendMsgSize(int(config.GetSocket().MaxMessageSizeBytes)),

			grpc.MaxCallSendMsgSize(int(config.GetSocket().MaxRequestSizeBytes)),

			grpc.MaxCallRecvMsgSize(1024*1024*128),

		),

		grpc.WithStatsHandler(&ocgrpc.ClientHandler{}),
@@ -209,7 +209,7 @@ func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, j 
	// Enable decompression on requests received by the gateway.

	handlerWithDecompressRequest := decompressHandler(logger, handlerWithStats)

	handlerWithCompressResponse := handlers.CompressHandler(handlerWithDecompressRequest)

	maxMessageSizeBytes := config.GetSocket().MaxMessageSizeBytes

	maxMessageSizeBytes := config.GetSocket().MaxRequestSizeBytes

	handlerWithMaxBody := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

		// Check max body size before decompressing incoming request body.

		r.Body = http.MaxBytesReader(w, r.Body, maxMessageSizeBytes)

server/config.go

+8 −1
Original line number Diff line number Diff line
@@ -282,6 +282,11 @@ func CheckConfig(logger *zap.Logger, config Config) map[string]string { 
		config.GetSocket().TLSCert = []tls.Certificate{cert}

	}



	// Set backwards-compatible defaults if overrides are not used.

	if config.GetSocket().MaxRequestSizeBytes <= 0 {

		config.GetSocket().MaxRequestSizeBytes = config.GetSocket().MaxMessageSizeBytes

	}



	return configWarnings

}
@@ -526,7 +531,8 @@ type SocketConfig struct { 
	Port                 int               `yaml:"port" json:"port" usage:"The port for accepting connections from the client for the given interface(s), address(es), and protocol(s). Default 7350."`

	Address              string            `yaml:"address" json:"address" usage:"The IP address of the interface to listen for client traffic on. Default listen on all available addresses/interfaces."`

	Protocol             string            `yaml:"protocol" json:"protocol" usage:"The network protocol to listen for traffic on. Possible values are 'tcp' for both IPv4 and IPv6, 'tcp4' for IPv4 only, or 'tcp6' for IPv6 only. Default 'tcp'."`

	MaxMessageSizeBytes  int64             `yaml:"max_message_size_bytes" json:"max_message_size_bytes" usage:"Maximum amount of data in bytes allowed to be read from the client socket per message. Used for real-time, gRPC and HTTP connections."`

	MaxMessageSizeBytes  int64             `yaml:"max_message_size_bytes" json:"max_message_size_bytes" usage:"Maximum amount of data in bytes allowed to be read from the client socket per message. Used for real-time connections."`

	MaxRequestSizeBytes  int64             `yaml:"max_request_size_bytes" json:"max_request_size_bytes" usage:"Maximum amount of data in bytes allowed to be read from clients per request. Used for gRPC and HTTP connections."`

	ReadTimeoutMs        int               `yaml:"read_timeout_ms" json:"read_timeout_ms" usage:"Maximum duration in milliseconds for reading the entire request. Used for HTTP connections."`

	WriteTimeoutMs       int               `yaml:"write_timeout_ms" json:"write_timeout_ms" usage:"Maximum duration in milliseconds before timing out writes of the response. Used for HTTP connections."`

	IdleTimeoutMs        int               `yaml:"idle_timeout_ms" json:"idle_timeout_ms" usage:"Maximum amount of time in milliseconds to wait for the next request when keep-alives are enabled. Used for HTTP connections."`
@@ -550,6 +556,7 @@ func NewSocketConfig() *SocketConfig { 
		Address:              "",

		Protocol:             "tcp",

		MaxMessageSizeBytes:  4096,

		MaxRequestSizeBytes:  0,

		ReadTimeoutMs:        10 * 1000,

		WriteTimeoutMs:       10 * 1000,

		IdleTimeoutMs:        60 * 1000,