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

Plugins: Remove unused config field from SignatureCalculator (#71297)

Browse Source 
remove unused cfg field
This commit is contained in:
Will Browne 2023-07-11 08:52:02 +02:00 committed by GitHub
parent e3787de470
commit 1274979f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/plugin_resource_test.go
View File

@ -71,7 +71,7 @@ func TestCallResource(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg), l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg),
reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(), reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(),
assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, statickey.New()), assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(statickey.New()),
angularInspector, &fakes.FakeOauthService{}) angularInspector, &fakes.FakeOauthService{})
srcs := sources.ProvideService(cfg, pCfg) srcs := sources.ProvideService(cfg, pCfg)
ps, err := store.ProvideService(reg, srcs, l) ps, err := store.ProvideService(reg, srcs, l)

2
pkg/plugins/manager/loader/loader_test.go
View File

@ -1495,7 +1495,7 @@ func newLoader(t *testing.T, cfg *config.Cfg, cbs ...func(loader *Loader)) *Load
l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(), l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakeRoleRegistry(), fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakeRoleRegistry(),
assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(cfg), assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder(cfg),
signature.ProvideService(cfg, statickey.New()), angularInspector, &fakes.FakeOauthService{}) signature.ProvideService(statickey.New()), angularInspector, &fakes.FakeOauthService{})
for _, cb := range cbs { for _, cb := range cbs {
cb(l) cb(l)

2
pkg/plugins/manager/manager_integration_test.go
View File

@ -122,7 +122,7 @@ func TestIntegrationPluginManager(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg), l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg),
reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(), reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(pCfg), fakes.NewFakeRoleRegistry(),
assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(pCfg, statickey.New()), assetpath.ProvideService(pluginscdn.ProvideService(pCfg)), signature.ProvideService(statickey.New()),
angularInspector, &fakes.FakeOauthService{}) angularInspector, &fakes.FakeOauthService{})
srcs := sources.ProvideService(cfg, pCfg) srcs := sources.ProvideService(cfg, pCfg)
ps, err := store.ProvideService(reg, srcs, l) ps, err := store.ProvideService(reg, srcs, l)

5
pkg/plugins/manager/signature/manifest.go
View File

@ -22,7 +22,6 @@ import (
"github.com/gobwas/glob" "github.com/gobwas/glob"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/config"
"github.com/grafana/grafana/pkg/plugins/log" "github.com/grafana/grafana/pkg/plugins/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )
@ -64,10 +63,10 @@ type Signature struct {
var _ plugins.SignatureCalculator = &Signature{} var _ plugins.SignatureCalculator = &Signature{}
func ProvideService(cfg *config.Cfg, kr plugins.KeyRetriever) *Signature { func ProvideService(kr plugins.KeyRetriever) *Signature {
return &Signature{ return &Signature{
log: log.New("plugin.signature"),
kr: kr, kr: kr,
log: log.New("plugin.signature"),
} }
} }

17
pkg/plugins/manager/signature/manifest_test.go
View File

@ -14,7 +14,6 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/config"
"github.com/grafana/grafana/pkg/plugins/manager/fakes" "github.com/grafana/grafana/pkg/plugins/manager/fakes"
"github.com/grafana/grafana/pkg/plugins/manager/signature/statickey" "github.com/grafana/grafana/pkg/plugins/manager/signature/statickey"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
@ -53,7 +52,7 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
-----END PGP SIGNATURE-----` -----END PGP SIGNATURE-----`
t.Run("valid manifest", func(t *testing.T) { t.Run("valid manifest", func(t *testing.T) {
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
manifest, err := s.readPluginManifest(context.Background(), []byte(txt)) manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
require.NoError(t, err) require.NoError(t, err)
@ -70,7 +69,7 @@ NR7DnB0CCQHO+4FlSPtXFTzNepoc+CytQyDAeOLMLmf2Tqhk2YShk+G/YlVX
t.Run("invalid manifest", func(t *testing.T) { t.Run("invalid manifest", func(t *testing.T) {
modified := strings.ReplaceAll(txt, "README.md", "xxxxxxxxxx") modified := strings.ReplaceAll(txt, "README.md", "xxxxxxxxxx")
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
_, err := s.readPluginManifest(context.Background(), []byte(modified)) _, err := s.readPluginManifest(context.Background(), []byte(modified))
require.Error(t, err) require.Error(t, err)
}) })
@ -108,7 +107,7 @@ khdr/tZ1PDgRxMqB/u+Vtbpl0xSxgblnrDOYMSI=
-----END PGP SIGNATURE-----` -----END PGP SIGNATURE-----`
t.Run("valid manifest", func(t *testing.T) { t.Run("valid manifest", func(t *testing.T) {
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
manifest, err := s.readPluginManifest(context.Background(), []byte(txt)) manifest, err := s.readPluginManifest(context.Background(), []byte(txt))
require.NoError(t, err) require.NoError(t, err)
@ -162,7 +161,7 @@ func TestCalculate(t *testing.T) {
setting.AppUrl = tc.appURL setting.AppUrl = tc.appURL
basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin") basePath := filepath.Join(parentDir, "testdata/non-pvt-with-root-url/plugin")
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{ sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
PluginClassFunc: func(ctx context.Context) plugins.Class { PluginClassFunc: func(ctx context.Context) plugins.Class {
return plugins.ClassExternal return plugins.ClassExternal
@ -190,7 +189,7 @@ func TestCalculate(t *testing.T) {
basePath := "../testdata/renderer-added-file/plugin" basePath := "../testdata/renderer-added-file/plugin"
runningWindows = true runningWindows = true
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{ sig, err := s.Calculate(context.Background(), &fakes.FakePluginSource{
PluginClassFunc: func(ctx context.Context) plugins.Class { PluginClassFunc: func(ctx context.Context) plugins.Class {
return plugins.ClassExternal return plugins.ClassExternal
@ -254,7 +253,7 @@ func TestCalculate(t *testing.T) {
toSlash = tc.platform.toSlashFunc() toSlash = tc.platform.toSlashFunc()
fromSlash = tc.platform.fromSlashFunc() fromSlash = tc.platform.fromSlashFunc()
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
pfs, err := tc.fsFactory() pfs, err := tc.fsFactory()
require.NoError(t, err) require.NoError(t, err)
pfs, err = newPathSeparatorOverrideFS(string(tc.platform.separator), pfs) pfs, err = newPathSeparatorOverrideFS(string(tc.platform.separator), pfs)
@ -722,7 +721,7 @@ func Test_validateManifest(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
s := ProvideService(&config.Cfg{}, statickey.New()) s := ProvideService(statickey.New())
err := s.validateManifest(context.Background(), *tc.manifest, nil) err := s.validateManifest(context.Background(), *tc.manifest, nil)
require.Errorf(t, err, tc.expectedErr) require.Errorf(t, err, tc.expectedErr)
}) })
@ -818,7 +817,7 @@ pHo=
} }
func Test_VerifyRevokedKey(t *testing.T) { func Test_VerifyRevokedKey(t *testing.T) {
s := ProvideService(&config.Cfg{}, &revokedKeyProvider{}) s := ProvideService(&revokedKeyProvider{})
m := createV2Manifest(t) m := createV2Manifest(t)
txt := `-----BEGIN PGP SIGNED MESSAGE----- txt := `-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512 Hash: SHA512