fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-12 21:01:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into jae/literefactor4

Browse Source
This commit is contained in:
Ethan Buchman
2018-07-02 14:57:30 -04:00
parent b51ed132f7 931b465a05
commit 5453aa6169
332 changed files with 16233 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rpc/lib/server/http_server.go
View File

@ -15,7 +15,7 @@ import (
"golang.org/x/net/netutil"
types "github.com/tendermint/tendermint/rpc/lib/types"
"github.com/tendermint/tmlibs/log"
"github.com/tendermint/tendermint/libs/log"
)
// Config is an RPC server configuration.
@ -23,6 +23,12 @@ type Config struct {
MaxOpenConnections int
}
const (
// maxBodyBytes controls the maximum number of bytes the
// server will read parsing the request body.
maxBodyBytes = int64(1000000) // 1MB
)
// StartHTTPServer starts an HTTP server on listenAddr with the given handler.
// It wraps handler with RecoverAndLogHandler.
func StartHTTPServer(
@ -53,7 +59,7 @@ func StartHTTPServer(
go func() {
err := http.Serve(
listener,
RecoverAndLogHandler(handler, logger),
RecoverAndLogHandler(maxBytesHandler{h: handler, n: maxBodyBytes}, logger),
)
logger.Info("RPC HTTP server stopped", "err", err)
}()
@ -99,7 +105,7 @@ func StartHTTPAndTLSServer(
go func() {
err := http.ServeTLS(
listener,
RecoverAndLogHandler(handler, logger),
RecoverAndLogHandler(maxBytesHandler{h: handler, n: maxBodyBytes}, logger),
certFile,
keyFile,
)
@ -202,3 +208,13 @@ func (w *ResponseWriterWrapper) WriteHeader(status int) {
func (w *ResponseWriterWrapper) Hijack() (net.Conn, *bufio.ReadWriter, error) {
return w.ResponseWriter.(http.Hijacker).Hijack()
}
type maxBytesHandler struct {
h http.Handler
n int64
}
func (h maxBytesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
r.Body = http.MaxBytesReader(w, r.Body, h.n)
h.h.ServeHTTP(w, r)
}