@marcel91200 / caddy Mirror · read-only / commits / 9e576c76
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 14, 05:15 UTC

Add request_body middleware and some limits to HTTP servers

Matthew Holt committed May 23, 2019 at 13:16 UTC 9e576c76e74ff3d5b8d5a384fecf2a2ca191b402
4 files changed +40 -1
modules/caddyhttp/caddyhttp.go
+3
@@ -110,6 +110,9 @@ func (app *App) Start() error {
110 s := &http.Server{
111 ReadTimeout: time.Duration(srv.ReadTimeout),
112 ReadHeaderTimeout: time.Duration(srv.ReadHeaderTimeout),
113 + WriteTimeout: time.Duration(srv.WriteTimeout),
114 + IdleTimeout: time.Duration(srv.IdleTimeout),
115 + MaxHeaderBytes: srv.MaxHeaderBytes,
116 Handler: srv,
117 }
118
modules/caddyhttp/requestbody/requestbody.go new
+33
@@ -0,0 +1,33 @@
1 +package requestbody
2 +
3 +import (
4 + "net/http"
5 +
6 + "bitbucket.org/lightcodelabs/caddy2"
7 + "bitbucket.org/lightcodelabs/caddy2/modules/caddyhttp"
8 +)
9 +
10 +func init() {
11 + caddy2.RegisterModule(caddy2.Module{
12 + Name: "http.middleware.request_body",
13 + New: func() interface{} { return new(RequestBody) },
14 + })
15 +}
16 +
17 +// RequestBody is a middleware for manipulating the request body.
18 +type RequestBody struct {
19 + MaxSize int64 `json:"max_size,omitempty"`
20 +}
21 +
22 +func (rb RequestBody) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
23 + if r.Body == nil {
24 + return next.ServeHTTP(w, r)
25 + }
26 + if rb.MaxSize > 0 {
27 + r.Body = http.MaxBytesReader(w, r.Body, rb.MaxSize)
28 + }
29 + return next.ServeHTTP(w, r)
30 +}
31 +
32 +// Interface guard
33 +var _ caddyhttp.MiddlewareHandler = (*RequestBody)(nil)
modules/caddyhttp/rewrite/rewrite.go
+1 -1
@@ -1,4 +1,4 @@
1 -package headers
1 +package rewrite
2
3 import (
4 "net/http"
modules/caddyhttp/server.go
+3
@@ -17,6 +17,9 @@ type Server struct {
17 Listen []string `json:"listen,omitempty"`
18 ReadTimeout caddy2.Duration `json:"read_timeout,omitempty"`
19 ReadHeaderTimeout caddy2.Duration `json:"read_header_timeout,omitempty"`
20 + WriteTimeout caddy2.Duration `json:"write_timeout,omitempty"`
21 + IdleTimeout caddy2.Duration `json:"idle_timeout,omitempty"`
22 + MaxHeaderBytes int `json:"max_header_bytes,omitempty"`
23 Routes RouteList `json:"routes,omitempty"`
24 Errors *httpErrorConfig `json:"errors,omitempty"`
25 TLSConnPolicies caddytls.ConnectionPolicies `json:"tls_connection_policies,omitempty"`