TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-22 09:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3076 from nspcc-dev/fix-content-type

Browse source 
rpcsrv: properly set content-type and CORS for all headers
This commit is contained in:
Roman Khimov 2023-08-01 16:17:38 +03:00 committed by GitHub
commit eeab9c1b2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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) {
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)

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")
}
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)
}