Modify request body field (#1735)

Added new byte `raw_body` `byte` field to coprocess object which filled all the time. And `body` field now filled only if its valid utf (previously just paniced)

coprocess.go

@@ -5,6 +5,7 @@ package main
 import (
 	"encoding/json"
 	"strings"
+	"unicode/utf8"
 
 	"github.com/Sirupsen/logrus"
 
@@ -67,15 +68,6 @@ type CoProcessor struct {
 
 // ObjectFromRequest constructs a CoProcessObject from a given http.Request.
 func (c *CoProcessor) ObjectFromRequest(r *http.Request) *coprocess.Object {
-	var body string
-	if r.Body == nil {
-		body = ""
-	} else {
-		defer r.Body.Close()
-		originalBody, _ := ioutil.ReadAll(r.Body)
-		body = string(originalBody)
-	}
-
 	headers := ProtoMap(r.Header)
 
 	host := r.Host
@@ -90,7 +82,6 @@ func (c *CoProcessor) ObjectFromRequest(r *http.Request) *coprocess.Object {
 		Headers:        headers,
 		SetHeaders:     map[string]string{},
 		DeleteHeaders:  []string{},
-		Body:           body,
 		Url:            r.URL.Path,
 		Params:         ProtoMap(r.URL.Query()),
 		AddParams:      map[string]string{},
@@ -104,6 +95,14 @@ func (c *CoProcessor) ObjectFromRequest(r *http.Request) *coprocess.Object {
 		Scheme:     r.URL.Scheme,
 	}
 
+	if r.Body != nil {
+		defer r.Body.Close()
+		miniRequestObject.RawBody, _ = ioutil.ReadAll(r.Body)
+		if utf8.Valid(miniRequestObject.RawBody) {
+			miniRequestObject.Body = string(miniRequestObject.RawBody)
+		}
+	}
+
 	object := &coprocess.Object{
 		Request:  miniRequestObject,
 		HookName: c.Middleware.HookName,

coprocess/proto/coprocess_mini_request_object.proto

@@ -19,4 +19,5 @@ message MiniRequestObject {
   string method = 11;
   string request_uri = 12;
   string scheme = 13;
+  bytes raw_body = 14;
 }