MM-19606- Rework Prepackaged Plugins (#13449)

* MM-19609 - Add new prepackage configuration settings (#13062) * Add signatures to the prepackaged plugins (#13138) * MM-19612 - Support querying local plugin marketplace when upst… (#13250) * MM-19612 - Support querying local plugin marketplace when upstream unavailable or disabled * Update translations file * Fixed comment * Updated to check EnableRemoteMarketplace setting and LocalOnly to get marketplace plugins * Fixed unit tests * Tests cleanup code * Removed unused error message * Updated tests * MM-19614- Updated Marketplace Service error id (#13388) * [MM-19610] Consume prepackaged plugins (#13005) * consume prepackaged plugins into memory * missing i18n * remove spurious .gitignore changes * return on failure to install prepackged plugins * cleanup * s/plugins/availablePlugins * whitespace * don't return extractDir when not needed * s/plug/plugin * error on icon, cleanup * update armored version of testplugin signature * honour AutomaticPrepackagedPlugins * document getPrepackagedPlugin * MM-19613 - Include prepackaged plugins in marketplace results (#13433) * Added prepackaged plugins to marketplace results * PR Feedback * PR Feedback * Update error where definition * Removing unnecessary var declaration * Updated comments * MM-21263 - Use EnableRemoteMarketplace in marketplace install… (#13438) * MM-21263 - Use EnableRemoteMarketplace in marketplace install endpoint * Call updateConfig before calling NewServer in TestHelper * Added translations * PR feedback * Translations * Feedback * s/helpers.go/download.go * Converging env.PrepackagedPlugins * Initial PR feedback * Ordered imports properly * Updated DownloadURL to return slice of bytes * Fixed method typo * Fixed logging * Added read lock for prepackaged plugins list * PR Feedback * Added condition to only install prepackaged plugin if it was previously enabled * Linting * Updated to check plugin state in config * Closing filereader * Only add local label if remote marketplace is enabled * Updated local tag description * Fixed tests Co-authored-by: Ali Farooq <ali.farooq0@pm.me> Co-authored-by: Shota Gvinepadze <wineson@gmail.com> Co-authored-by: Jesse Hallam <jesse.hallam@gmail.com> Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
2020-01-15 13:38:55 -05:00
--- a/api4/plugin_test.go
+++ b/api4/plugin_test.go
@@ -18,8 +18,11 @@ import (
 	"time"

 	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost-server/v5/plugin"
 	"github.com/mattermost/mattermost-server/v5/testlib"
+	"github.com/mattermost/mattermost-server/v5/utils"
 	"github.com/mattermost/mattermost-server/v5/utils/fileutils"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -61,6 +64,10 @@ func TestPlugin(t *testing.T) {
 	CheckNoError(t, resp)
 	assert.Equal(t, "testplugin", manifest.Id)

+	ok, resp := th.SystemAdminClient.RemovePlugin(manifest.Id)
+	CheckNoError(t, resp)
+	require.True(t, ok)
+
 	t.Run("install plugin from URL with slow response time", func(t *testing.T) {
 		if testing.Short() {
 			t.Skip("skipping test to install plugin from a slow response server")
@@ -163,7 +170,7 @@ func TestPlugin(t *testing.T) {
 	assert.False(t, found)

 	// Successful activate
-	ok, resp := th.SystemAdminClient.EnablePlugin(manifest.Id)
+	ok, resp = th.SystemAdminClient.EnablePlugin(manifest.Id)
 	CheckNoError(t, resp)
 	assert.True(t, ok)

@@ -602,7 +609,7 @@ func TestGetInstalledMarketplacePlugins(t *testing.T) {
 				DownloadURL: "",
 				Labels: []model.MarketplaceLabel{{
 					Name:        "Local",
-					Description: "This plugin is not listed in the marketplace but was installed manually",
+					Description: "This plugin is not listed in the marketplace",
 				}},
 				Manifest: manifest,
 			},
@@ -673,7 +680,7 @@ func TestGetInstalledMarketplacePlugins(t *testing.T) {

 		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
 		CheckNoError(t, resp)
-		newPlugin.InstalledVersion = manifest.Version
+		newPlugin.InstalledVersion = ""
 		require.Equal(t, expectedPlugins, plugins)
 	})
 }
@@ -701,7 +708,7 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 	tarData, err := ioutil.ReadFile(filepath.Join(path, "testplugin.tar.gz"))
 	require.NoError(t, err)

-	tarDataV2, err := ioutil.ReadFile(filepath.Join(path, "testpluginv2.tar.gz"))
+	tarDataV2, err := ioutil.ReadFile(filepath.Join(path, "testplugin2.tar.gz"))
 	require.NoError(t, err)

 	t.Run("search installed plugin", func(t *testing.T) {
@@ -730,37 +737,37 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 		manifest, resp := th.SystemAdminClient.UploadPlugin(bytes.NewReader(tarData))
 		CheckNoError(t, resp)

-		newPluginV1 := &model.MarketplacePlugin{
+		plugin1 := &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
 				HomepageURL: "",
 				IconData:    "",
 				DownloadURL: "",
 				Labels: []model.MarketplaceLabel{{
 					Name:        "Local",
-					Description: "This plugin is not listed in the marketplace but was installed manually",
+					Description: "This plugin is not listed in the marketplace",
 				}},
 				Manifest: manifest,
 			},
 			InstalledVersion: manifest.Version,
 		}
-		expectedPlugins := append(samplePlugins, newPluginV1)
+		expectedPlugins := append(samplePlugins, plugin1)

 		manifest, resp = th.SystemAdminClient.UploadPlugin(bytes.NewReader(tarDataV2))
 		CheckNoError(t, resp)
-		newPluginV2 := &model.MarketplacePlugin{
+		plugin2 := &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
 				HomepageURL: "",
 				IconData:    "",
 				DownloadURL: "",
 				Labels: []model.MarketplaceLabel{{
 					Name:        "Local",
-					Description: "This plugin is not listed in the marketplace but was installed manually",
+					Description: "This plugin is not listed in the marketplace",
 				}},
 				Manifest: manifest,
 			},
 			InstalledVersion: manifest.Version,
 		}
-		expectedPlugins = append(expectedPlugins, newPluginV2)
+		expectedPlugins = append(expectedPlugins, plugin2)
 		sort.SliceStable(expectedPlugins, func(i, j int) bool {
 			return strings.ToLower(expectedPlugins[i].Manifest.Name) < strings.ToLower(expectedPlugins[j].Manifest.Name)
 		})
@@ -770,13 +777,13 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 		require.Equal(t, expectedPlugins, plugins)

 		// Search for plugins from the server
-		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{Filter: "testplugin_v2"})
+		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{Filter: "testplugin2"})
 		CheckNoError(t, resp)
-		require.Equal(t, []*model.MarketplacePlugin{newPluginV2}, plugins)
+		require.Equal(t, []*model.MarketplacePlugin{plugin2}, plugins)

-		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{Filter: "dsgsdg_v2"})
+		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{Filter: "a second plugin"})
 		CheckNoError(t, resp)
-		require.Equal(t, []*model.MarketplacePlugin{newPluginV2}, plugins)
+		require.Equal(t, []*model.MarketplacePlugin{plugin2}, plugins)

 		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{Filter: "User Satisfaction Surveys"})
 		CheckNoError(t, resp)
@@ -785,6 +792,270 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{Filter: "NOFILTER"})
 		CheckNoError(t, resp)
 		require.Nil(t, plugins)
+
+		// cleanup
+		ok, resp := th.SystemAdminClient.RemovePlugin(plugin1.Manifest.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+
+		ok, resp = th.SystemAdminClient.RemovePlugin(plugin2.Manifest.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+	})
+}
+
+func TestGetLocalPluginInMarketplace(t *testing.T) {
+	th := Setup().InitBasic()
+	defer th.TearDown()
+
+	samplePlugins := []*model.MarketplacePlugin{
+		{
+			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
+				HomepageURL: "https://example.com/mattermost/mattermost-plugin-nps",
+				IconData:    "https://example.com/icon.svg",
+				DownloadURL: "www.github.com/example",
+				Manifest: &model.Manifest{
+					Id:               "testplugin2",
+					Name:             "testplugin2",
+					Description:      "a second plugin",
+					Version:          "1.2.2",
+					MinServerVersion: "",
+				},
+			},
+			InstalledVersion: "",
+		},
+	}
+
+	testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
+		res.WriteHeader(http.StatusOK)
+		json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[0]})
+		require.NoError(t, err)
+		res.Write(json)
+	}))
+	defer testServer.Close()
+
+	th.App.UpdateConfig(func(cfg *model.Config) {
+		*cfg.PluginSettings.Enable = true
+		*cfg.PluginSettings.EnableMarketplace = true
+		*cfg.PluginSettings.MarketplaceUrl = testServer.URL
+	})
+
+	t.Run("Get plugins with EnableRemoteMarketplace enabled", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+		})
+
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		require.Len(t, plugins, len(samplePlugins))
+		require.Equal(t, samplePlugins, plugins)
+	})
+
+	t.Run("get remote and local plugins", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+			*cfg.PluginSettings.EnableUploads = true
+		})
+
+		// Upload one local plugin
+		path, _ := fileutils.FindDir("tests")
+		tarData, err := ioutil.ReadFile(filepath.Join(path, "testplugin.tar.gz"))
+		require.NoError(t, err)
+
+		manifest, resp := th.SystemAdminClient.UploadPlugin(bytes.NewReader(tarData))
+		CheckNoError(t, resp)
+
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		require.Len(t, plugins, 2)
+
+		ok, resp := th.SystemAdminClient.RemovePlugin(manifest.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+	})
+
+	t.Run("EnableRemoteMarketplace disabled", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
+			*cfg.PluginSettings.EnableUploads = true
+		})
+
+		// No marketplace plugins returned
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		require.Len(t, plugins, 0)
+
+		// Upload one local plugin
+		path, _ := fileutils.FindDir("tests")
+		tarData, err := ioutil.ReadFile(filepath.Join(path, "testplugin.tar.gz"))
+		require.NoError(t, err)
+
+		manifest, resp := th.SystemAdminClient.UploadPlugin(bytes.NewReader(tarData))
+		CheckNoError(t, resp)
+
+		newPlugin := &model.MarketplacePlugin{
+			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
+				Manifest: manifest,
+			},
+			InstalledVersion: manifest.Version,
+		}
+
+		plugins, resp = th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		// Only get the local plugins
+		require.Len(t, plugins, 1)
+		require.Equal(t, newPlugin, plugins[0])
+
+		ok, resp := th.SystemAdminClient.RemovePlugin(manifest.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+	})
+
+	t.Run("local_only true", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+			*cfg.PluginSettings.EnableUploads = true
+		})
+
+		// Upload one local plugin
+		path, _ := fileutils.FindDir("tests")
+		tarData, err := ioutil.ReadFile(filepath.Join(path, "testplugin.tar.gz"))
+		require.NoError(t, err)
+
+		manifest, resp := th.SystemAdminClient.UploadPlugin(bytes.NewReader(tarData))
+		CheckNoError(t, resp)
+
+		newPlugin := &model.MarketplacePlugin{
+			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
+				Manifest: manifest,
+				Labels: []model.MarketplaceLabel{{
+					Name:        "Local",
+					Description: "This plugin is not listed in the marketplace",
+				}},
+			},
+			InstalledVersion: manifest.Version,
+		}
+
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{LocalOnly: true})
+		CheckNoError(t, resp)
+
+		require.Len(t, plugins, 1)
+		require.Equal(t, newPlugin, plugins[0])
+
+		ok, resp := th.SystemAdminClient.RemovePlugin(manifest.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+	})
+}
+
+func TestGetPrepackagedPluginInMarketplace(t *testing.T) {
+	th := Setup().InitBasic()
+	defer th.TearDown()
+
+	marketplacePlugins := []*model.MarketplacePlugin{
+		{
+			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
+				HomepageURL: "https://example.com/mattermost/mattermost-plugin-nps",
+				IconData:    "https://example.com/icon.svg",
+				DownloadURL: "www.github.com/example",
+				Manifest: &model.Manifest{
+					Id:               "marketplace.test",
+					Name:             "marketplacetest",
+					Description:      "a marketplace plugin",
+					Version:          "0.1.2",
+					MinServerVersion: "",
+				},
+			},
+			InstalledVersion: "",
+		},
+	}
+
+	testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
+		res.WriteHeader(http.StatusOK)
+		json, err := json.Marshal([]*model.MarketplacePlugin{marketplacePlugins[0]})
+		require.NoError(t, err)
+		res.Write(json)
+	}))
+	defer testServer.Close()
+
+	th.App.UpdateConfig(func(cfg *model.Config) {
+		*cfg.PluginSettings.Enable = true
+		*cfg.PluginSettings.EnableMarketplace = true
+		*cfg.PluginSettings.MarketplaceUrl = testServer.URL
+	})
+
+	prepackagePlugin := &plugin.PrepackagedPlugin{
+		Manifest: &model.Manifest{
+			Version: "0.0.1",
+			Id:      "prepackaged.test",
+		},
+	}
+
+	env := th.App.GetPluginsEnvironment()
+	env.SetPrepackagedPlugins([]*plugin.PrepackagedPlugin{prepackagePlugin})
+
+	t.Run("get remote and prepackaged plugins", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+			*cfg.PluginSettings.EnableUploads = true
+		})
+
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		expectedPlugins := marketplacePlugins
+		expectedPlugins = append(expectedPlugins, &model.MarketplacePlugin{
+			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
+				Manifest: prepackagePlugin.Manifest,
+			},
+		})
+
+		require.ElementsMatch(t, expectedPlugins, plugins)
+		require.Len(t, plugins, 2)
+	})
+
+	t.Run("EnableRemoteMarketplace disabled", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
+			*cfg.PluginSettings.EnableUploads = true
+		})
+
+		// No marketplace plugins returned
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		// Only returns the prepackaged plugins
+		require.Len(t, plugins, 1)
+		require.Equal(t, prepackagePlugin.Manifest, plugins[0].Manifest)
+	})
+
+	t.Run("get prepackaged plugin if newer", func(t *testing.T) {
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+			*cfg.PluginSettings.EnableUploads = true
+		})
+
+		manifest := &model.Manifest{
+			Version: "1.2.3",
+			Id:      "marketplace.test",
+		}
+
+		newerPrepackagePlugin := &plugin.PrepackagedPlugin{
+			Manifest: manifest,
+		}
+
+		env := th.App.GetPluginsEnvironment()
+		env.SetPrepackagedPlugins([]*plugin.PrepackagedPlugin{newerPrepackagePlugin})
+
+		plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
+		CheckNoError(t, resp)
+
+		require.Len(t, plugins, 1)
+		require.Equal(t, newerPrepackagePlugin.Manifest, plugins[0].Manifest)
 	})
 }

@@ -797,15 +1068,16 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 		*cfg.PluginSettings.EnableUploads = true
 		*cfg.PluginSettings.EnableMarketplace = false
 	})
+
 	path, _ := fileutils.FindDir("tests")
-	signatureFilename := "testpluginv2.tar.gz.sig"
+	signatureFilename := "testplugin2.tar.gz.sig"
 	signatureFileReader, err := os.Open(filepath.Join(path, signatureFilename))
 	require.Nil(t, err)
 	sigFile, err := ioutil.ReadAll(signatureFileReader)
 	require.Nil(t, err)
 	pluginSignature := base64.StdEncoding.EncodeToString(sigFile)

-	tarData, err := ioutil.ReadFile(filepath.Join(path, "testpluginv2.tar.gz"))
+	tarData, err := ioutil.ReadFile(filepath.Join(path, "testplugin2.tar.gz"))
 	require.NoError(t, err)
 	pluginServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
 		res.WriteHeader(http.StatusOK)
@@ -820,9 +1092,9 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 				IconData:    "https://example.com/icon.svg",
 				DownloadURL: pluginServer.URL,
 				Manifest: &model.Manifest{
-					Id:               "testplugin_v2",
-					Name:             "testplugin_v2",
-					Description:      "dsgsdg_v2",
+					Id:               "testplugin2",
+					Name:             "testplugin2",
+					Description:      "a second plugin",
 					Version:          "1.2.2",
 					MinServerVersion: "",
 				},
@@ -835,9 +1107,9 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 				IconData:    "https://example.com/icon.svg",
 				DownloadURL: pluginServer.URL,
 				Manifest: &model.Manifest{
-					Id:               "testplugin_v2",
-					Name:             "testplugin_v2",
-					Description:      "dsgsdg_v2",
+					Id:               "testplugin2",
+					Name:             "testplugin2",
+					Description:      "a second plugin",
 					Version:          "1.2.3",
 					MinServerVersion: "",
 				},
@@ -846,7 +1118,9 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 			InstalledVersion: "",
 		},
 	}
+
 	request := &model.InstallMarketplacePluginRequest{Id: "", Version: ""}
+
 	t.Run("marketplace disabled", func(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.EnableMarketplace = false
@@ -856,6 +1130,7 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 		CheckNotImplementedStatus(t, resp)
 		require.Nil(t, plugin)
 	})
+
 	t.Run("RequirePluginSignature enabled", func(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
@@ -925,7 +1200,7 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 			*cfg.PluginSettings.MarketplaceUrl = testServer.URL
 			*cfg.PluginSettings.AllowInsecureDownloadUrl = true
 		})
-		pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin_v2", Version: "1.2.2"}
+		pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin2", Version: "1.2.2"}
 		plugin, resp := th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
 		CheckInternalErrorStatus(t, resp)
 		require.Nil(t, plugin)
@@ -945,6 +1220,7 @@ func TestInstallMarketplacePlugin(t *testing.T) {

 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.EnableMarketplace = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
 			*cfg.PluginSettings.MarketplaceUrl = testServer.URL
 		})

@@ -953,14 +1229,14 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 		appErr := th.App.AddPublicKey("pub_key", key)
 		require.Nil(t, appErr)

-		pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin_v2", Version: "1.2.3"}
+		pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin2", Version: "1.2.3"}
 		manifest, resp := th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
 		CheckNoError(t, resp)
 		require.NotNil(t, manifest)
-		require.Equal(t, "testplugin_v2", manifest.Id)
+		require.Equal(t, "testplugin2", manifest.Id)
 		require.Equal(t, "1.2.3", manifest.Version)

-		filePath := filepath.Join(*th.App.Config().PluginSettings.Directory, "testplugin_v2.tar.gz.sig")
+		filePath := filepath.Join("plugins", "testplugin2.tar.gz.sig")
 		savedSigFile, err := th.App.ReadFile(filePath)
 		require.Nil(t, err)
 		require.EqualValues(t, sigFile, savedSigFile)
@@ -975,6 +1251,221 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 		appErr = th.App.DeletePublicKey("pub_key")
 		require.Nil(t, appErr)
 	})
+
+	t.Run("install prepackaged and remote plugins through marketplace", func(t *testing.T) {
+		prepackagedPluginsDir := "prepackaged_plugins"
+
+		os.RemoveAll(prepackagedPluginsDir)
+		err := os.Mkdir(prepackagedPluginsDir, os.ModePerm)
+		require.NoError(t, err)
+		defer os.RemoveAll(prepackagedPluginsDir)
+
+		prepackagedPluginsDir, found := fileutils.FindDir(prepackagedPluginsDir)
+		require.True(t, found, "failed to find prepackaged plugins directory")
+
+		err = utils.CopyFile(filepath.Join(path, "testplugin.tar.gz"), filepath.Join(prepackagedPluginsDir, "testplugin.tar.gz"))
+		require.NoError(t, err)
+		err = utils.CopyFile(filepath.Join(path, "testplugin.tar.gz.asc"), filepath.Join(prepackagedPluginsDir, "testplugin.tar.gz.sig"))
+		require.NoError(t, err)
+
+		th := SetupConfig(func(cfg *model.Config) {
+			// Disable auto-installing prepackaged plugins
+			*cfg.PluginSettings.AutomaticPrepackagedPlugins = false
+		}).InitBasic()
+		defer th.TearDown()
+
+		pluginSignatureFile, err := os.Open(filepath.Join(path, "testplugin.tar.gz.asc"))
+		require.Nil(t, err)
+		pluginSignatureData, err := ioutil.ReadAll(pluginSignatureFile)
+		require.Nil(t, err)
+
+		key, err := os.Open(filepath.Join(path, "development-private-key.asc"))
+		require.NoError(t, err)
+		appErr := th.App.AddPublicKey("pub_key", key)
+		require.Nil(t, appErr)
+
+		testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
+			serverVersion := req.URL.Query().Get("server_version")
+			require.NotEmpty(t, serverVersion)
+			require.Equal(t, model.CurrentVersion, serverVersion)
+			res.WriteHeader(http.StatusOK)
+			json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[1]})
+			require.NoError(t, err)
+			res.Write(json)
+		}))
+		defer testServer.Close()
+
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableMarketplace = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
+			*cfg.PluginSettings.MarketplaceUrl = testServer.URL
+			*cfg.PluginSettings.AllowInsecureDownloadUrl = false
+		})
+
+		env := th.App.GetPluginsEnvironment()
+
+		pluginsResp, resp := th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.Len(t, pluginsResp.Inactive, 0)
+
+		// Should fail to install unknown prepackaged plugin
+		pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin", Version: "0.0.2"}
+		manifest, resp := th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
+		CheckInternalErrorStatus(t, resp)
+		require.Nil(t, manifest)
+
+		plugins := env.PrepackagedPlugins()
+		require.Len(t, plugins, 1)
+		require.Equal(t, "testplugin", plugins[0].Manifest.Id)
+		require.Equal(t, pluginSignatureData, plugins[0].Signature)
+
+		pluginsResp, resp = th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.Len(t, pluginsResp.Inactive, 0)
+
+		pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin", Version: "0.0.1"}
+		manifest1, resp := th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
+		CheckNoError(t, resp)
+		require.NotNil(t, manifest1)
+		require.Equal(t, "testplugin", manifest1.Id)
+		require.Equal(t, "0.0.1", manifest1.Version)
+
+		pluginsResp, resp = th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.Equal(t, pluginsResp.Inactive, []*model.PluginInfo{{
+			Manifest: *manifest1,
+		}})
+
+		// Try to install remote marketplace plugin
+		pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin2", Version: "1.2.3"}
+		manifest, resp = th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
+		CheckInternalErrorStatus(t, resp)
+		require.Nil(t, manifest)
+
+		// Enable remote marketplace
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableMarketplace = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+			*cfg.PluginSettings.MarketplaceUrl = testServer.URL
+			*cfg.PluginSettings.AllowInsecureDownloadUrl = true
+		})
+
+		pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin2", Version: "1.2.3"}
+		manifest2, resp := th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
+		CheckNoError(t, resp)
+		require.NotNil(t, manifest2)
+		require.Equal(t, "testplugin2", manifest2.Id)
+		require.Equal(t, "1.2.3", manifest2.Version)
+
+		pluginsResp, resp = th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.ElementsMatch(t, pluginsResp.Inactive, []*model.PluginInfo{
+			{
+				Manifest: *manifest1,
+			},
+			{
+				Manifest: *manifest2,
+			},
+		})
+
+		// Clean up
+		ok, resp := th.SystemAdminClient.RemovePlugin(manifest1.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+
+		ok, resp = th.SystemAdminClient.RemovePlugin(manifest2.Id)
+		CheckNoError(t, resp)
+		assert.True(t, ok)
+
+		appErr = th.App.DeletePublicKey("pub_key")
+		require.Nil(t, appErr)
+	})
+
+	t.Run("missing prepackaged and remote plugin signatures", func(t *testing.T) {
+		prepackagedPluginsDir := "prepackaged_plugins"
+
+		os.RemoveAll(prepackagedPluginsDir)
+		err := os.Mkdir(prepackagedPluginsDir, os.ModePerm)
+		require.NoError(t, err)
+		defer os.RemoveAll(prepackagedPluginsDir)
+
+		prepackagedPluginsDir, found := fileutils.FindDir(prepackagedPluginsDir)
+		require.True(t, found, "failed to find prepackaged plugins directory")
+
+		err = utils.CopyFile(filepath.Join(path, "testplugin.tar.gz"), filepath.Join(prepackagedPluginsDir, "testplugin.tar.gz"))
+		require.NoError(t, err)
+
+		th := SetupConfig(func(cfg *model.Config) {
+			// Disable auto-installing prepackged plugins
+			*cfg.PluginSettings.AutomaticPrepackagedPlugins = false
+		}).InitBasic()
+		defer th.TearDown()
+
+		key, err := os.Open(filepath.Join(path, "development-private-key.asc"))
+		require.NoError(t, err)
+		appErr := th.App.AddPublicKey("pub_key", key)
+		require.Nil(t, appErr)
+
+		testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
+			serverVersion := req.URL.Query().Get("server_version")
+			require.NotEmpty(t, serverVersion)
+			require.Equal(t, model.CurrentVersion, serverVersion)
+
+			mPlugins := []*model.MarketplacePlugin{samplePlugins[0]}
+			require.Empty(t, mPlugins[0].Signature)
+			res.WriteHeader(http.StatusOK)
+			json, err := json.Marshal(mPlugins)
+			require.NoError(t, err)
+			res.Write(json)
+		}))
+		defer testServer.Close()
+
+		th.App.UpdateConfig(func(cfg *model.Config) {
+			*cfg.PluginSettings.EnableMarketplace = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = true
+			*cfg.PluginSettings.MarketplaceUrl = testServer.URL
+			*cfg.PluginSettings.AllowInsecureDownloadUrl = true
+		})
+
+		env := th.App.GetPluginsEnvironment()
+		plugins := env.PrepackagedPlugins()
+		require.Len(t, plugins, 1)
+		require.Equal(t, "testplugin", plugins[0].Manifest.Id)
+		require.Empty(t, plugins[0].Signature)
+
+		pluginsResp, resp := th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.Len(t, pluginsResp.Inactive, 0)
+
+		pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin", Version: "0.0.1"}
+		manifest, resp := th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
+		CheckInternalErrorStatus(t, resp)
+		require.Nil(t, manifest)
+
+		pluginsResp, resp = th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.Len(t, pluginsResp.Inactive, 0)
+
+		pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin2", Version: "1.2.3"}
+		manifest, resp = th.SystemAdminClient.InstallMarketplacePlugin(pRequest)
+		CheckInternalErrorStatus(t, resp)
+		require.Nil(t, manifest)
+
+		pluginsResp, resp = th.SystemAdminClient.GetPlugins()
+		CheckNoError(t, resp)
+		require.Len(t, pluginsResp.Active, 0)
+		require.Len(t, pluginsResp.Inactive, 0)
+
+		// Clean up
+		appErr = th.App.DeletePublicKey("pub_key")
+		require.Nil(t, appErr)
+	})
 }

 func findClusterMessages(event string, msgs []*model.ClusterMessage) []*model.ClusterMessage {