Don't dump request body to log when too large

Fixes an issue where a client can send a large body but specifiy
application/json as the content-type, and cause Docker to consume lots
of RAM while trying to buffer the body so it can be dumped to the debug
log.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

api/server/middleware.go

@@ -1,9 +1,9 @@
 package server
 
 import (
-	"bytes"
+	"bufio"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"runtime"
 	"strings"
@@ -14,6 +14,7 @@ import (
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/errors"
 	"github.com/docker/docker/pkg/authorization"
+	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/version"
 	"golang.org/x/net/context"
 )
@@ -27,25 +28,37 @@ func debugRequestMiddleware(handler httputils.APIFunc) httputils.APIFunc {
 	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 		logrus.Debugf("%s %s", r.Method, r.RequestURI)
 
-		if r.Method == "POST" {
+		if r.Method != "POST" {
-			if err := httputils.CheckForJSON(r); err == nil {
+			return handler(ctx, w, r, vars)
-				var buf bytes.Buffer
+		}
-				if _, err := buf.ReadFrom(r.Body); err == nil {
+		if err := httputils.CheckForJSON(r); err != nil {
-					r.Body.Close()
+			return handler(ctx, w, r, vars)
-					r.Body = ioutil.NopCloser(&buf)
+		}
-					var postForm map[string]interface{}
+		maxBodySize := 4096 // 4KB
-					if err := json.Unmarshal(buf.Bytes(), &postForm); err == nil {
+		if r.ContentLength > int64(maxBodySize) {
-						if _, exists := postForm["password"]; exists {
+			return handler(ctx, w, r, vars)
-							postForm["password"] = "*****"
+		}
-						}
+
-						formStr, errMarshal := json.Marshal(postForm)
+		body := r.Body
-						if errMarshal == nil {
+		bufReader := bufio.NewReaderSize(body, maxBodySize)
-							logrus.Debugf("form data: %s", string(formStr))
+		r.Body = ioutils.NewReadCloserWrapper(bufReader, func() error { return body.Close() })
-						} else {
+
-							logrus.Debugf("form data: %q", postForm)
+		b, err := bufReader.Peek(maxBodySize)
-						}
+		if err != io.EOF {
-					}
+			// either there was an error reading, or the buffer is full (in which case the request is too large)
-				}
+			return handler(ctx, w, r, vars)
+		}
+
+		var postForm map[string]interface{}
+		if err := json.Unmarshal(b, &postForm); err == nil {
+			if _, exists := postForm["password"]; exists {
+				postForm["password"] = "*****"
+			}
+			formStr, errMarshal := json.Marshal(postForm)
+			if errMarshal == nil {
+				logrus.Debugf("form data: %s", string(formStr))
+			} else {
+				logrus.Debugf("form data: %q", postForm)
 			}
 		}