opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 15:02:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Fix manifest verification (#24573)

Browse Source
This commit is contained in:
Arve Knudsen
2020-05-12 15:48:24 +02:00
committed by GitHub
parent 20f0ee2f22
commit 892f9f789c
12 changed files with 116 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/plugins/plugins.go
View File

@ -140,7 +140,7 @@ func (pm *PluginManager) Init() error {
if p.IsCorePlugin {
p.Signature = PluginSignatureInternal
} else {
p.Signature = GetPluginSignatureState(p)
p.Signature = getPluginSignatureState(pm.log, p)
metrics.SetPluginBuildInformation(p.Id, p.Type, p.Info.Version)
}
}
@ -282,9 +282,9 @@ func (scanner *PluginScanner) loadPlugin(pluginJsonFilePath string) error {
pluginCommon.PluginDir = filepath.Dir(pluginJsonFilePath)
// For the time being, we choose to only require back-end plugins to be signed
// NOTE: the state is calculated again for when setting metadata on the object
// NOTE: the state is calculated again when setting metadata on the object
if pluginCommon.Backend && scanner.requireSigned {
sig := GetPluginSignatureState(&pluginCommon)
sig := getPluginSignatureState(scanner.log, &pluginCommon)
if sig != PluginSignatureValid {
scanner.log.Debug("Invalid Plugin Signature", "pluginID", pluginCommon.Id, "pluginDir", pluginCommon.PluginDir, "state", sig)
if sig == PluginSignatureUnsigned {