kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #27758 from anusha-ragunathan/fix-overflow

Browse source 
Fix stack overflow in ErrInAdequateCapacity.
This commit is contained in:
Victor Vieux 2016-10-28 13:10:54 -07:00 committed by GitHub
commit c73dd3fe7b
3 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugin/store/store.go
View file

@ -73,17 +73,6 @@ func (ps *Store) SetAll(plugins map[string]*v2.Plugin) {
ps.plugins = plugins
}
func (ps *Store) getByCap(name string, capability string) (*v2.Plugin, error) {
ps.RLock()
defer ps.RUnlock()
p, err := ps.GetByName(name)
if err != nil {
return nil, err
}
return p.FilterByCap(capability)
}
func (ps *Store) getAllByCap(capability string) []plugingetter.CompatPlugin {
ps.RLock()
defer ps.RUnlock()

34
plugin/store/store_test.go Normal file
View file

@ -0,0 +1,34 @@
package store
import (
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/plugin/v2"
)
func TestFilterByCapNeg(t *testing.T) {
p := v2.NewPlugin("test", "1234567890", "/run/docker", "latest")
iType := types.PluginInterfaceType{"volumedriver", "docker", "1.0"}
i := types.PluginManifestInterface{"plugins.sock", []types.PluginInterfaceType{iType}}
p.PluginObj.Manifest.Interface = i
_, err := p.FilterByCap("foobar")
if err == nil {
t.Fatalf("expected inadequate error, got %v", err)
}
}
func TestFilterByCapPos(t *testing.T) {
p := v2.NewPlugin("test", "1234567890", "/run/docker", "latest")
iType := types.PluginInterfaceType{"volumedriver", "docker", "1.0"}
i := types.PluginManifestInterface{"plugins.sock", []types.PluginInterfaceType{iType}}
p.PluginObj.Manifest.Interface = i
_, err := p.FilterByCap("volumedriver")
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
}

10
plugin/v2/plugin.go
View file

@ -29,10 +29,12 @@ type Plugin struct {
const defaultPluginRuntimeDestination = "/run/docker/plugins"
// ErrInadequateCapability indicates that the plugin did not have the requested capability.
type ErrInadequateCapability string
type ErrInadequateCapability struct {
cap string
}
func (cap ErrInadequateCapability) Error() string {
return fmt.Sprintf("plugin does not provide %q capability", cap)
func (e ErrInadequateCapability) Error() string {
return fmt.Sprintf("plugin does not provide %q capability", e.cap)
}
func newPluginObj(name, id, tag string) types.Plugin {
@ -75,7 +77,7 @@ func (p *Plugin) FilterByCap(capability string) (*Plugin, error) {
return p, nil
}
}
return nil, ErrInadequateCapability(capability)
return nil, ErrInadequateCapability{capability}
}
// RemoveFromDisk deletes the plugin's runtime files from disk.