Merge pull request #2404 from nspcc-dev/fix-log-entries-with-user-input

Fix log entries with user input

pkg/rpc/server/prometheus.go

@@ -16,16 +16,23 @@ func incCounter(name string) {
 	}
 }
 
+func regCounter(call string) {
+	ctr := prometheus.NewCounter(
+		prometheus.CounterOpts{
+			Help:      fmt.Sprintf("Number of calls to %s rpc endpoint", call),
+			Name:      fmt.Sprintf("%s_called", call),
+			Namespace: "neogo",
+		},
+	)
+	prometheus.MustRegister(ctr)
+	rpcCounter[call] = ctr
+}
+
 func init() {
 	for call := range rpcHandlers {
-		ctr := prometheus.NewCounter(
-			prometheus.CounterOpts{
-				Help:      fmt.Sprintf("Number of calls to %s rpc endpoint", call),
-				Name:      fmt.Sprintf("%s_called", call),
-				Namespace: "neogo",
-			},
-		)
-		prometheus.MustRegister(ctr)
-		rpcCounter[call] = ctr
+		regCounter(call)
+	}
+	for call := range rpcWsHandlers {
+		regCounter(call)
 	}
 }

pkg/rpc/server/server.go

@@ -14,6 +14,7 @@ import (
 	"net"
 	"net/http"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -325,10 +326,12 @@ func (s *Server) handleHTTPRequest(w http.ResponseWriter, httpRequest *http.Requ
 
 func (s *Server) handleRequest(req *request.Request, sub *subscriber) response.AbstractResult {
 	if req.In != nil {
+		req.In.Method = escapeForLog(req.In.Method) // No valid method name will be changed by it.
 		return s.handleIn(req.In, sub)
 	}
 	resp := make(response.AbstractBatch, len(req.Batch))
 	for i, in := range req.Batch {
+		in.Method = escapeForLog(in.Method) // No valid method name will be changed by it.
 		resp[i] = s.handleIn(&in, sub)
 	}
 	return resp
@@ -349,7 +352,7 @@ func (s *Server) handleIn(req *request.In, sub *subscriber) response.Abstract {
 
 	incCounter(req.Method)
 
-	resErr = response.NewMethodNotFoundError(fmt.Sprintf("Method '%s' not supported", req.Method), nil)
+	resErr = response.NewMethodNotFoundError(fmt.Sprintf("Method %q not supported", req.Method), nil)
 	handler, ok := rpcHandlers[req.Method]
 	if ok {
 		res, resErr = handler(s, reqParams)
@@ -2190,3 +2193,12 @@ func validateAddress(addr interface{}) bool {
 	}
 	return false
 }
+
+func escapeForLog(in string) string {
+	return strings.Map(func(c rune) rune {
+		if !strconv.IsGraphic(c) {
+			return -1
+		}
+		return c
+	}, in)
+}

pkg/rpc/server/server_test.go

@@ -2569,6 +2569,11 @@ func checkNep17TransfersAux(t *testing.T, e *executor, acc interface{}, sent, rc
 	require.Equal(t, arr, res.Received)
 }
 
+func TestEscapeForLog(t *testing.T) {
+	in := "\n\tbad"
+	require.Equal(t, "bad", escapeForLog(in))
+}
+
 func BenchmarkHandleIn(b *testing.B) {
 	chain, orc, cfg, logger := getUnitTestChain(b, false, false)