Fix 439: Remove plugin signing file when plugin is unloaded and removed

intelsdi-x · Oct 27, 2015 · 921b4fc · 921b4fc
1 parent 8b57c7f
commit 921b4fc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/control/plugin_manager.go b/control/plugin_manager.go
@@ -443,8 +443,8 @@ func (p *pluginManager) UnloadPlugin(pl core.Plugin) (*loadedPlugin, perror.Puls
 			"plugin-version": plugin.Version(),
 			"plugin-path":    plugin.Path,
 		}).Debugf("Removing plugin")
-		if err := os.Remove(plugin.Path); err != nil {
-			runnerLog.WithFields(log.Fields{
+		if err := os.RemoveAll(filepath.Dir(plugin.Path)); err != nil {
+			pmLogger.WithFields(log.Fields{
 				"plugin-type":    plugin.TypeName(),
 				"plugin-name":    plugin.Name(),
 				"plugin-version": plugin.Version(),
@@ -459,6 +459,31 @@ func (p *pluginManager) UnloadPlugin(pl core.Plugin) (*loadedPlugin, perror.Puls
 			})
 			return nil, pe
 		}
+		if plugin.SignatureFile != "" {
+			pmLogger.WithFields(log.Fields{
+				"plugin-type":           plugin.TypeName(),
+				"plugin-name":           plugin.Name(),
+				"plugin-version":        plugin.Version(),
+				"plugin-signature-file": plugin.SignatureFile,
+			}).Debugf("Removing plugin signature file")
+
+			if err := os.RemoveAll(filepath.Dir(plugin.SignatureFile)); err != nil {
+				pmLogger.WithFields(log.Fields{
+					"plugin-type":           plugin.TypeName(),
+					"plugin-name":           plugin.Name(),
+					"plugin-version":        plugin.Version(),
+					"plugin-signature-file": plugin.SignatureFile,
+				}).Error(err)
+				pe := perror.New(err)
+				pe.SetFields(map[string]interface{}{
+					"plugin-type":           plugin.TypeName(),
+					"plugin-name":           plugin.Name(),
+					"plugin-version":        plugin.Version(),
+					"plugin-signature-file": plugin.SignatureFile,
+				})
+				return nil, pe
+			}
+		}
 	}
 
 	p.loadedPlugins.remove(plugin.Key())

diff --git a/mgmt/rest/plugin.go b/mgmt/rest/plugin.go
@@ -29,6 +29,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -122,7 +123,7 @@ func (s *Server) loadPlugin(w http.ResponseWriter, r *http.Request, _ httprouter
 			restLogger.Error(err)
 			for _, f := range files {
 				restLogger.Debugf("Removing file (%s) after failure to load plugin (%s)", f, files[0])
-				err := os.Remove(f)
+				err := os.RemoveAll(filepath.Dir(f))
 				if err != nil {
 					restLogger.Error(err)
 				}