Add debbugging and fixes which may cause body to be read improperly

Author: buger

gateway/coprocess.go

@@ -72,6 +72,11 @@ type CoProcessor struct {
 
 // BuildObject constructs a CoProcessObject from a given http.Request.
 func (c *CoProcessor) BuildObject(req *http.Request, res *http.Response, spec *APISpec) (*coprocess.Object, error) {
+	logger := log.WithFields(logrus.Fields{
+		"prefix": "coprocess",
+		"func":   "BuildObject",
+	})
+
 	headers := ProtoMap(req.Header)
 
 	host := req.Host
@@ -103,15 +108,39 @@ func (c *CoProcessor) BuildObject(req *http.Request, res *http.Response, spec *A
 	}
 
 	if req.Body != nil {
-		defer req.Body.Close()
 		var err error
-		miniRequestObject.RawBody, err = ioutil.ReadAll(req.Body)
+		contentLength := req.ContentLength
+		logger.Debugf("Request body processing - Content-Length header: %d", contentLength)
+		
+		// Check if body is empty (might have been read already)
+		emptyBody := false
+		if req.GetBody == nil {
+			logger.Debug("Request GetBody is nil, body might have been read already")
+			emptyBody = true
+		}
+		
+		body, _ := copyBody(req.Body, false)
+		bodyBytes, err := ioutil.ReadAll(body)
+		bytesRead := len(bodyBytes)
+		
 		if err != nil {
-			return nil, err
-		}
+			logger.WithError(err).Errorf("Failed to read request body - Content-Length: %d, Bytes read: %d, Empty body: %v",
+				contentLength, bytesRead, emptyBody)
+			return nil, fmt.Errorf("failed to read request body: %w (Content-Length: %d, Bytes read: %d)",
+				err, contentLength, bytesRead)
+		}
+		
+		logger.Debugf("Successfully read request body - Content-Length: %d, Bytes read: %d",
+			contentLength, bytesRead)
+		
+		body.Close()
+
+		miniRequestObject.RawBody = bodyBytes
 		if utf8.Valid(miniRequestObject.RawBody) && !c.Middleware.RawBodyOnly {
 			miniRequestObject.Body = string(miniRequestObject.RawBody)
 		}
+	} else {
+		logger.Debug("Request body is nil")
 	}
 
 	object := &coprocess.Object{
@@ -175,10 +204,22 @@ func (c *CoProcessor) BuildObject(req *http.Request, res *http.Response, spec *A
 			resObj.MultivalueHeaders = append(resObj.MultivalueHeaders, &currentHeader)
 		}
 		resObj.StatusCode = int32(res.StatusCode)
+		contentLength := res.ContentLength
+		logger.Debugf("Response body processing - Content-Length header: %d", contentLength)
+		
 		rawBody, err := ioutil.ReadAll(res.Body)
+		bytesRead := len(rawBody)
+		
 		if err != nil {
-			return nil, err
-		}
+			logger.WithError(err).Errorf("Failed to read response body - Content-Length: %d, Bytes read: %d",
+				contentLength, bytesRead)
+			return nil, fmt.Errorf("failed to read response body: %w (Content-Length: %d, Bytes read: %d)",
+				err, contentLength, bytesRead)
+		}
+		
+		logger.Debugf("Successfully read response body - Content-Length: %d, Bytes read: %d",
+			contentLength, bytesRead)
+		
 		resObj.RawBody = rawBody
 		res.Body = ioutil.NopCloser(bytes.NewReader(rawBody))
 		if utf8.Valid(rawBody) && !c.Middleware.RawBodyOnly {

gateway/coprocess_id_extractor.go

@@ -68,11 +68,12 @@ func (e *BaseExtractor) ExtractForm(r *http.Request, paramName string) (formValu
 
 // ExtractBody is used when BodySource is specified.
 func (e *BaseExtractor) ExtractBody(r *http.Request) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, _ := copyBody(r.Body, false)
+	bodyBytes, err := ioutil.ReadAll(body)
 	if err != nil {
 		return "", err
 	}
-	return string(body), err
+	return string(bodyBytes), err
 }
 
 // Error is a helper for logging the extractor errors. It always returns HTTP 400 (so we don't expose any details).

gateway/handler_success.go

@@ -129,7 +129,8 @@ func recordGraphDetails(rec *analytics.AnalyticsRecord, r *http.Request, resp *h
 	if r.Body == nil {
 		return
 	}
-	body, err := io.ReadAll(r.Body)
+	reqBody, _ := copyBody(r.Body, false)
+	body, err := io.ReadAll(reqBody)
 	defer func() {
 		_ = r.Body.Close()
 		r.Body = io.NopCloser(bytes.NewBuffer(body))

gateway/mw_transform.go

@@ -52,30 +52,30 @@ func (t *TransformMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Requ
 }
 
 func transformBody(r *http.Request, tmeta *TransformSpec, t *TransformMiddleware) error {
-	body, _ := ioutil.ReadAll(r.Body)
-	defer r.Body.Close()
+	body, _ := copyBody(r.Body, false)
+	bodyBytes, _ := ioutil.ReadAll(body)
 
 	// Put into an interface:
 	bodyData := make(map[string]interface{})
 
 	switch tmeta.TemplateData.Input {
 	case apidef.RequestXML:
-		if len(body) == 0 {
-			body = []byte("<_/>")
+		if len(bodyBytes) == 0 {
+			bodyBytes = []byte("<_/>")
 		}
 		mxj.XmlCharsetReader = WrappedCharsetReader
 		var err error
-		bodyData, err = mxj.NewMapXml(body) // unmarshal
+		bodyData, err = mxj.NewMapXml(bodyBytes) // unmarshal
 		if err != nil {
 			return fmt.Errorf("error unmarshalling XML: %w", err)
 		}
 	case apidef.RequestJSON:
-		if len(body) == 0 {
-			body = []byte("{}")
+		if len(bodyBytes) == 0 {
+			bodyBytes = []byte("{}")
 		}
 
 		var tempBody interface{}
-		if err := json.Unmarshal(body, &tempBody); err != nil {
+		if err := json.Unmarshal(bodyBytes, &tempBody); err != nil {
 			return err
 		}