IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Backend plugins: Fix incorrect JSON Unmarshal (#24243)

Browse Source
This commit is contained in:
Marcus Efraimsson 2020-05-05 11:54:50 +02:00 committed by GitHub
parent 898df2b778
commit 224aa4dde8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/plugins.go
View File

@ -29,21 +29,22 @@ func (hs *HTTPServer) getPluginContext(pluginID string, user *models.SignedInUse
return pc, ErrPluginNotFound return pc, ErrPluginNotFound
} }
var jsonData json.RawMessage jsonData := json.RawMessage{}
var decryptedSecureJSONData map[string]string decryptedSecureJSONData := map[string]string{}
var updated time.Time var updated time.Time
ps, err := hs.getCachedPluginSettings(pluginID, user) ps, err := hs.getCachedPluginSettings(pluginID, user)
if err != nil { if err != nil {
// models.ErrPluginSettingNotFound is expected if there's no row found for plugin setting in database (if non-app plugin).
// If it's not this expected error something is wrong with cache or database and we return the error to the client.
if err != models.ErrPluginSettingNotFound { if err != models.ErrPluginSettingNotFound {
return pc, errutil.Wrap("Failed to get plugin settings", err) return pc, errutil.Wrap("Failed to get plugin settings", err)
} }
} else {
jsonData, err = json.Marshal(ps.JsonData) jsonData, err = json.Marshal(ps.JsonData)
if err != nil { if err != nil {
return pc, errutil.Wrap("Failed to unmarshal plugin json data", err) return pc, errutil.Wrap("Failed to unmarshal plugin json data", err)
} }
decryptedSecureJSONData = make(map[string]string)
} else {
decryptedSecureJSONData = ps.DecryptedValues() decryptedSecureJSONData = ps.DecryptedValues()
updated = ps.Updated updated = ps.Updated
} }