jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strict unmarshal for plugin files (#3046)

mine
Bernd Schorgers 2025-01-03 19:33:48 +01:00 committed by GitHub
parent 420a53317e
commit 356a09dcfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/config/plugin.go
View File

@ -62,7 +62,7 @@ func (p Plugins) Load(path string) error {
errs = errors.Join(errs, err) errs = errors.Join(errs, err)
} }
for _, dataDir := range xdg.DataDirs { for _, dataDir := range append(xdg.DataDirs, xdg.DataHome, xdg.ConfigHome) {
if err := p.loadPluginDir(filepath.Join(dataDir, k9sPluginsDir)); err != nil { if err := p.loadPluginDir(filepath.Join(dataDir, k9sPluginsDir)); err != nil {
errs = errors.Join(errs, err) errs = errors.Join(errs, err)
} }
@ -88,9 +88,9 @@ func (p Plugins) loadPluginDir(dir string) error {
errs = errors.Join(errs, err) errs = errors.Join(errs, err)
} }
var plugin Plugin var plugin Plugin
if err = yaml.Unmarshal(fileContent, &plugin); err != nil { if err = yaml.UnmarshalStrict(fileContent, &plugin); err != nil {
var plugins Plugins var plugins Plugins
if err = yaml.Unmarshal(fileContent, &plugins); err != nil { if err = yaml.UnmarshalStrict(fileContent, &plugins); err != nil {
return fmt.Errorf("cannot parse %s into either a single plugin nor plugins: %w", fileName, err) return fmt.Errorf("cannot parse %s into either a single plugin nor plugins: %w", fileName, err)
} }
for name, plugin := range plugins.Plugins { for name, plugin := range plugins.Plugins {