diff options
| -rw-r--r-- | app/plugins.go | 23 | ||||
| -rw-r--r-- | i18n/en.json | 10 |
2 files changed, 26 insertions, 7 deletions
diff --git a/app/plugins.go b/app/plugins.go index 43b7a7451..8f81086df 100644 --- a/app/plugins.go +++ b/app/plugins.go @@ -330,23 +330,23 @@ func (a *App) ActivatePlugins() { // InstallPlugin unpacks and installs a plugin but does not activate it. func (a *App) InstallPlugin(pluginFile io.Reader) (*model.Manifest, *model.AppError) { if a.PluginEnv == nil || !*a.Config().PluginSettings.Enable { - return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) + return nil, model.NewAppError("InstallPlugin", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) } tmpDir, err := ioutil.TempDir("", "plugintmp") if err != nil { - return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.filesystem.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, model.NewAppError("InstallPlugin", "app.plugin.filesystem.app_error", nil, err.Error(), http.StatusInternalServerError) } defer os.RemoveAll(tmpDir) if err := utils.ExtractTarGz(pluginFile, tmpDir); err != nil { - return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.extract.app_error", nil, err.Error(), http.StatusBadRequest) + return nil, model.NewAppError("InstallPlugin", "app.plugin.extract.app_error", nil, err.Error(), http.StatusBadRequest) } tmpPluginDir := tmpDir dir, err := ioutil.ReadDir(tmpDir) if err != nil { - return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.filesystem.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, model.NewAppError("InstallPlugin", "app.plugin.filesystem.app_error", nil, err.Error(), http.StatusInternalServerError) } if len(dir) == 1 && dir[0].IsDir() { @@ -355,12 +355,23 @@ func (a *App) InstallPlugin(pluginFile io.Reader) (*model.Manifest, *model.AppEr manifest, _, err := model.FindManifest(tmpPluginDir) if err != nil { - return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.manifest.app_error", nil, err.Error(), http.StatusBadRequest) + return nil, model.NewAppError("InstallPlugin", "app.plugin.manifest.app_error", nil, err.Error(), http.StatusBadRequest) + } + + bundles, err := a.PluginEnv.Plugins() + if err != nil { + return nil, model.NewAppError("InstallPlugin", "app.plugin.install.app_error", nil, err.Error(), http.StatusInternalServerError) + } + + for _, bundle := range bundles { + if bundle.Manifest.Id == manifest.Id { + return nil, model.NewAppError("InstallPlugin", "app.plugin.install_id.app_error", nil, "", http.StatusBadRequest) + } } err = utils.CopyDir(tmpPluginDir, filepath.Join(a.PluginEnv.SearchPath(), manifest.Id)) if err != nil { - return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.mvdir.app_error", nil, err.Error(), http.StatusInternalServerError) + return nil, model.NewAppError("InstallPlugin", "app.plugin.mvdir.app_error", nil, err.Error(), http.StatusInternalServerError) } // Should add manifest validation and error handling here diff --git a/i18n/en.json b/i18n/en.json index 35af78dad..c46fd9879 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3559,6 +3559,14 @@ "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated." }, { + "id": "app.plugin.install.app_error", + "translation": "Unable to install plugin." + }, + { + "id": "app.plugin.install_id.app_error", + "translation": "Unable to install plugin. A plugin with the same ID is already installed." + }, + { "id": "app.plugin.config.app_error", "translation": "Error saving plugin state in config" }, @@ -3592,7 +3600,7 @@ }, { "id": "app.plugin.mvdir.app_error", - "translation": "Unable to move plugin from temporary directory to final destination" + "translation": "Unable to move plugin from temporary directory to final destination. Another plugin may be using the same directory name." }, { "id": "app.plugin.not_installed.app_error", |