just set MALICE_ELASTICSEARCH in all plugins

maliceio · Jul 27, 2018 · c32c363 · c32c363
1 parent e315590
commit c32c363
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/plugins/bindata.go b/plugins/bindata.go
diff --git a/plugins/plugins.go b/plugins/plugins.go
@@ -34,6 +34,8 @@ func (plugin Plugin) StartPlugin(docker *client.Docker, arg string, scanID strin
 	env := plugin.getPluginEnv()
 
 	env = append(env, "MALICE_SCANID="+scanID)
+	env = append(env, "MALICE_ELASTICSEARCH=elasticsearch")
+
 	log.WithFields(log.Fields{
 		"name": plugin.Name,
 		"env":  config.Conf.Environment.Run,
@@ -116,9 +118,6 @@ func (plugin *Plugin) getPluginEnv() []string {
 	for _, pluginEnv := range plugin.Env {
 		if os.Getenv(pluginEnv) != "" {
 			env = append(env, fmt.Sprintf("%s=%s", pluginEnv, os.Getenv(pluginEnv)))
-			if strings.EqualFold(pluginEnv, "MALICE_ELASTICSEARCH") {
-				env = append(env, fmt.Sprintf("%s=%s", pluginEnv, "elasticsearch"))
-			}
 		}
 	}
 	return env

diff --git a/plugins/plugins.toml b/plugins/plugins.toml
@@ -273,7 +273,7 @@ title = "Malice Plugin Configurations"
   build = false
   mime = "application/pdf"
   cmd = "scan"
-  env = ["MALICE_TIMEOUT", "MALICE_ELASTICSEARCH"]
+  env = ["MALICE_TIMEOUT"]
 
 [[plugin]]
   enabled = false