IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix panic while proxying 4xx responses of requests to cortex/loki (#42570)

Browse Source 
Fixes a panic that would ocurr as we proxy 4xx responses. When this happens and the content type of the response is JSON we try to check if the response has a "message" key. Then, we assume that the key will contain a value of string but we don't take into account that this value can potentially be `null`.

This adds a type assertion check to to this assumption so that we can keep the original JSON body as the response if we're unable to extract an `message`.
This commit is contained in:
gotjosh
2021-12-01 13:53:29 +00:00
committed by GitHub
parent c847c0382d
commit 5b64c4f684
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/util.go
+4 -1
View File
@@ -116,7 +116,10 @@ func (p *AlertingProxy) withReq(
var m map[string]interface{} var m map[string]interface{}
if err := json.Unmarshal(resp.Body(), &m); err == nil { if err := json.Unmarshal(resp.Body(), &m); err == nil {
if message, ok := m["message"]; ok { if message, ok := m["message"]; ok {
errMessage = message.(string) errMessageStr, isString := message.(string)
if isString {
errMessage = errMessageStr
}
} }
} }
} else if strings.HasPrefix(resp.Header().Get("Content-Type"), "text/html") { } else if strings.HasPrefix(resp.Header().Get("Content-Type"), "text/html") {