From 11baebd6c989b2dbba5d6e0ff684e71b8d1e7a58 Mon Sep 17 00:00:00 2001
From: Greg <g2linton@gmail.com>
Date: Mon, 1 Oct 2018 17:14:54 -0600
Subject: [PATCH] Unify http_listener error response with influxdb (#4766)

---
 plugins/inputs/http_listener/http_listener.go | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index 6415ebc9f..cd82e40c0 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -5,6 +5,7 @@ import (
 	"compress/gzip"
 	"crypto/subtle"
 	"crypto/tls"
+	"fmt"
 	"io"
 	"log"
 	"net"
@@ -255,8 +256,8 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 		body, err = gzip.NewReader(req.Body)
 		defer body.Close()
 		if err != nil {
-			log.Println("E! " + err.Error())
-			badRequest(res)
+			log.Println("D! " + err.Error())
+			badRequest(res, err.Error())
 			return
 		}
 	}
@@ -270,16 +271,16 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 	for {
 		n, err := io.ReadFull(body, buf[bufStart:])
 		if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
-			log.Println("E! " + err.Error())
+			log.Println("D! " + err.Error())
 			// problem reading the request body
-			badRequest(res)
+			badRequest(res, err.Error())
 			return
 		}
 		h.BytesRecv.Incr(int64(n))
 
 		if err == io.EOF {
 			if return400 {
-				badRequest(res)
+				badRequest(res, "")
 			} else {
 				res.WriteHeader(http.StatusNoContent)
 			}
@@ -304,12 +305,17 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 
 		if err == io.ErrUnexpectedEOF {
 			// finished reading the request body
-			if err := h.parse(buf[:n+bufStart], now, precision); err != nil {
-				log.Println("E! " + err.Error())
+			err = h.parse(buf[:n+bufStart], now, precision)
+			if err != nil {
+				log.Println("D! "+err.Error(), bufStart+n)
 				return400 = true
 			}
 			if return400 {
-				badRequest(res)
+				if err != nil {
+					badRequest(res, err.Error())
+				} else {
+					badRequest(res, "")
+				}
 			} else {
 				res.WriteHeader(http.StatusNoContent)
 			}
@@ -322,7 +328,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 		i := bytes.LastIndexByte(buf, '\n')
 		if i == -1 {
 			// drop any line longer than the max buffer size
-			log.Printf("E! http_listener received a single line longer than the maximum of %d bytes",
+			log.Printf("D! http_listener received a single line longer than the maximum of %d bytes",
 				len(buf))
 			hangingBytes = true
 			return400 = true
@@ -330,7 +336,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
 			continue
 		}
 		if err := h.parse(buf[:i+1], now, precision); err != nil {
-			log.Println("E! " + err.Error())
+			log.Println("D! " + err.Error())
 			return400 = true
 		}
 		// rotate the bit remaining after the last newline to the front of the buffer
@@ -350,28 +356,33 @@ func (h *HTTPListener) parse(b []byte, t time.Time, precision string) error {
 	h.handler.SetTimeFunc(func() time.Time { return t })
 	metrics, err := h.parser.Parse(b)
 	if err != nil {
-		return err
+		return fmt.Errorf("unable to parse: %s", err.Error())
 	}
 
 	for _, m := range metrics {
 		h.acc.AddFields(m.Name(), m.Fields(), m.Tags(), m.Time())
 	}
 
-	return err
+	return nil
 }
 
 func tooLarge(res http.ResponseWriter) {
 	res.Header().Set("Content-Type", "application/json")
 	res.Header().Set("X-Influxdb-Version", "1.0")
+	res.Header().Set("X-Influxdb-Error", "http: request body too large")
 	res.WriteHeader(http.StatusRequestEntityTooLarge)
 	res.Write([]byte(`{"error":"http: request body too large"}`))
 }
 
-func badRequest(res http.ResponseWriter) {
+func badRequest(res http.ResponseWriter, errString string) {
 	res.Header().Set("Content-Type", "application/json")
 	res.Header().Set("X-Influxdb-Version", "1.0")
+	if errString == "" {
+		errString = "http: bad request"
+	}
+	res.Header().Set("X-Influxdb-Error", errString)
 	res.WriteHeader(http.StatusBadRequest)
-	res.Write([]byte(`{"error":"http: bad request"}`))
+	res.Write([]byte(fmt.Sprintf(`{"error":%q}`, errString)))
 }
 
 func (h *HTTPListener) AuthenticateIfSet(handler http.HandlerFunc, res http.ResponseWriter, req *http.Request) {