Fix for issue #954

control/control.go

@@ -343,6 +343,7 @@ func (p *pluginControl) returnPluginDetails(rp *core.RequestedPlugin) (*pluginDe
 	details.Path = rp.Path()
 	details.CheckSum = rp.CheckSum()
 	details.Signature = rp.Signature()
+	details.IsAutoLoaded = rp.AutoLoaded()
 
 	if filepath.Ext(rp.Path()) == ".aci" {
 		f, err := os.Open(rp.Path())

control/plugin_manager.go

@@ -156,14 +156,15 @@ func (l *loadedPlugins) findLatest(typeName, name string) (*loadedPlugin, error)
 
 // the struct representing a plugin that is loaded into snap
 type pluginDetails struct {
-	CheckSum  [sha256.Size]byte
-	Exec      string
-	ExecPath  string
-	IsPackage bool
-	Manifest  *schema.ImageManifest
-	Path      string
-	Signed    bool
-	Signature []byte
+	CheckSum     [sha256.Size]byte
+	Exec         string
+	ExecPath     string
+	IsPackage    bool
+	IsAutoLoaded bool
+	Manifest     *schema.ImageManifest
+	Path         string
+	Signed       bool
+	Signature    []byte
 }
 
 type loadedPlugin struct {
@@ -484,8 +485,11 @@ func (p *pluginManager) UnloadPlugin(pl core.Plugin) (*loadedPlugin, serror.Snap
 		return nil, se
 	}
 
-	// If the plugin was loaded from os.TempDir() clean up
-	if strings.Contains(plugin.Details.Path, os.TempDir()) {
+	// If the plugin has been uploaded via REST API
+	// aka, was not auto loaded from auto_discover_path
+	// nor loaded from tests
+	// then do clean up
+	if !plugin.Details.IsAutoLoaded {
 		pmLogger.WithFields(log.Fields{
 			"plugin-type":    plugin.TypeName(),
 			"plugin-name":    plugin.Name(),

control/plugin_manager_test.go

@@ -82,9 +82,10 @@ func loadPlugin(p *pluginManager, path string) (*loadedPlugin, serror.SnapError)
 	var e serror.SnapError
 	var lp *loadedPlugin
 	details := &pluginDetails{
-		Path:     path,
-		ExecPath: filepath.Dir(path),
-		Exec:     filepath.Base(path),
+		Path:         path,
+		ExecPath:     filepath.Dir(path),
+		Exec:         filepath.Base(path),
+		IsAutoLoaded: true,
 	}
 	for i := 0; i < 3; i++ {
 		lp, e = p.LoadPlugin(details, nil)

core/plugin.go

@@ -94,15 +94,17 @@ type SubscribedPlugin interface {
 }
 
 type RequestedPlugin struct {
-	path      string
-	checkSum  [sha256.Size]byte
-	signature []byte
+	path       string
+	checkSum   [sha256.Size]byte
+	signature  []byte
+	autoLoaded bool
 }
 
 func NewRequestedPlugin(path string) (*RequestedPlugin, error) {
 	rp := &RequestedPlugin{
-		path:      path,
-		signature: nil,
+		path:       path,
+		signature:  nil,
+		autoLoaded: true,
 	}
 	err := rp.generateCheckSum()
 	if err != nil {
@@ -123,6 +125,10 @@ func (p *RequestedPlugin) Signature() []byte {
 	return p.signature
 }
 
+func (p *RequestedPlugin) AutoLoaded() bool {
+	return p.autoLoaded
+}
+
 func (p *RequestedPlugin) SetPath(path string) {
 	p.path = path
 }
@@ -131,6 +137,10 @@ func (p *RequestedPlugin) SetSignature(data []byte) {
 	p.signature = data
 }
 
+func (p *RequestedPlugin) SetAutoLoaded(isAutoLoaded bool) {
+	p.autoLoaded = isAutoLoaded
+}
+
 func (p *RequestedPlugin) generateCheckSum() error {
 	var b []byte
 	var err error

mgmt/rest/plugin.go

@@ -153,6 +153,7 @@ func (s *Server) loadPlugin(w http.ResponseWriter, r *http.Request, _ httprouter
 			respond(500, rbody.FromError(err), w)
 			return
 		}
+		rp.SetAutoLoaded(false)
 		// Sanity check, verify the checkSum on the file sent is the same
 		// as after it is written to disk.
 		if rp.CheckSum() != checkSum {