dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

rpcsrv: properly set content-type and CORS for all headers

Browse source 
Not only for successful ones. Close #3075.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
This commit is contained in:
Anna Shaleva 2023-08-01 15:46:01 +03:00
parent 8d5a41de6e
commit e2c6bbb6b1
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/services/rpcsrv/server.go
View file

@ -2861,16 +2861,16 @@ func (s *Server) writeHTTPServerResponse(r *params.Request, w http.ResponseWrite
resp.RunForErrors(func(jsonErr *neorpc.Error) { resp.RunForErrors(func(jsonErr *neorpc.Error) {
s.logRequestError(r, jsonErr) 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 { if r.In != nil {
resp := resp.(abstract) resp := resp.(abstract)
if resp.Error != nil { if resp.Error != nil {
w.WriteHeader(getHTTPCodeForError(resp.Error)) 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) encoder := json.NewEncoder(w)
err := encoder.Encode(resp) err := encoder.Encode(resp)

18
pkg/services/rpcsrv/server_test.go
View file

@ -3350,3 +3350,21 @@ func TestFailedPreconditionShutdown(t *testing.T) {
require.Eventually(t, stopped.Load, 5*time.Second, 100*time.Millisecond, "Shutdown should return") 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)
}