gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2023-08-26 12:53:07 -07:00
parent f1bf4127c5 5b18e80d42
commit 70bbf5081a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/monitor.go
View File

@@ -2342,6 +2342,7 @@ func ResponseHandler(w http.ResponseWriter, r *http.Request, data []byte) {
} else { } else {
// Otherwise JSON // Otherwise JSON
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Write(data) w.Write(data)
} }
} }

9
server/monitor_test.go
View File

@@ -157,7 +157,14 @@ func readBodyEx(t *testing.T, url string, status int, content string) []byte {
} }
ct := resp.Header.Get("Content-Type") ct := resp.Header.Get("Content-Type")
if ct != content { if ct != content {
stackFatalf(t, "Expected %s content-type, got %s\n", content, ct) stackFatalf(t, "Expected %q content-type, got %q\n", content, ct)
}
// Check the CORS header for "application/json" requests only.
if ct == appJSONContent {
acao := resp.Header.Get("Access-Control-Allow-Origin")
if acao != "*" {
stackFatalf(t, "Expected with %q Content-Type an Access-Control-Allow-Origin header with value %q, got %q\n", appJSONContent, "*", acao)
}
} }
body, err := io.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {