From e2c6bbb6b146f76cacdd8b159323bdd0a160ae5a Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Tue, 1 Aug 2023 15:46:01 +0300
Subject: [PATCH] rpcsrv: properly set content-type and CORS for all headers

Not only for successful ones. Close #3075.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
---
 pkg/services/rpcsrv/server.go      |  8 ++++----
 pkg/services/rpcsrv/server_test.go | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkg/services/rpcsrv/server.go b/pkg/services/rpcsrv/server.go
index 0ba5f8769..3602cad85 100644
--- a/pkg/services/rpcsrv/server.go
+++ b/pkg/services/rpcsrv/server.go
@@ -2861,16 +2861,16 @@ func (s *Server) writeHTTPServerResponse(r *params.Request, w http.ResponseWrite
 	resp.RunForErrors(func(jsonErr *neorpc.Error) {
 		s.logRequestError(r, jsonErr)
 	})
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	if s.config.EnableCORSWorkaround {
+		setCORSOriginHeaders(w.Header())
+	}
 	if r.In != nil {
 		resp := resp.(abstract)
 		if resp.Error != nil {
 			w.WriteHeader(getHTTPCodeForError(resp.Error))
 		}
 	}
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	if s.config.EnableCORSWorkaround {
-		setCORSOriginHeaders(w.Header())
-	}
 
 	encoder := json.NewEncoder(w)
 	err := encoder.Encode(resp)
diff --git a/pkg/services/rpcsrv/server_test.go b/pkg/services/rpcsrv/server_test.go
index 98d8324ef..352a454c0 100644
--- a/pkg/services/rpcsrv/server_test.go
+++ b/pkg/services/rpcsrv/server_test.go
@@ -3350,3 +3350,21 @@ func TestFailedPreconditionShutdown(t *testing.T) {
 
 	require.Eventually(t, stopped.Load, 5*time.Second, 100*time.Millisecond, "Shutdown should return")
 }
+
+func TestErrorResponseContentType(t *testing.T) {
+	chain, rpcSrv, httpSrv := initClearServerWithServices(t, true, false, false)
+	defer chain.Close()
+	defer rpcSrv.Shutdown()
+
+	const (
+		expectedContentType = "application/json; charset=utf-8"
+		req                 = `{"jsonrpc":"2.0", "method":"unknown","params":[]}`
+	)
+
+	cl := http.Client{Timeout: time.Second}
+	resp, err := cl.Post(httpSrv.URL, "application/json", strings.NewReader(req))
+	require.NoErrorf(t, err, "could not make a POST request")
+	resp.Body.Close()
+	contentType := resp.Header.Get("Content-Type")
+	require.Equal(t, expectedContentType, contentType)
+}