From c3af8785734803b6199a28249537ef3e47fe4caa Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 1 Dec 2017 15:20:08 -0500 Subject: Hash key for plugin store table and limit plugin ID length (#7915) * Hash plugin store keys and update column limits * Limit plugin ID length on install * Add note to manifest id and allow zero length keys --- app/plugin.go | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'app/plugin.go') diff --git a/app/plugin.go b/app/plugin.go index 29031b9d7..e8844d821 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -6,12 +6,15 @@ package app import ( "bytes" "context" + "crypto/sha256" + "encoding/base64" "io" "io/ioutil" "net/http" "os" "path/filepath" "strings" + "unicode/utf8" l4g "github.com/alecthomas/log4go" @@ -27,6 +30,10 @@ import ( "github.com/mattermost/mattermost-server/plugin/pluginenv" ) +const ( + PLUGIN_MAX_ID_LENGTH = 200 +) + var prepackagedPlugins map[string]func(string) ([]byte, error) = map[string]func(string) ([]byte, error){ "jira": jira.Asset, } @@ -147,6 +154,10 @@ func (a *App) installPlugin(pluginFile io.Reader, allowPrepackaged bool) (*model return nil, model.NewAppError("installPlugin", "app.plugin.prepackaged.app_error", nil, "", http.StatusBadRequest) } + if utf8.RuneCountInString(manifest.Id) > PLUGIN_MAX_ID_LENGTH { + return nil, model.NewAppError("installPlugin", "app.plugin.id_length.app_error", map[string]interface{}{"Max": PLUGIN_MAX_ID_LENGTH}, 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) @@ -473,10 +484,16 @@ func (a *App) ShutDownPlugins() { a.PluginEnv = nil } +func getKeyHash(key string) string { + hash := sha256.New() + hash.Write([]byte(key)) + return base64.StdEncoding.EncodeToString(hash.Sum(nil)) +} + func (a *App) SetPluginKey(pluginId string, key string, value []byte) *model.AppError { kv := &model.PluginKeyValue{ PluginId: pluginId, - Key: key, + Key: getKeyHash(key), Value: value, } @@ -490,7 +507,7 @@ func (a *App) SetPluginKey(pluginId string, key string, value []byte) *model.App } func (a *App) GetPluginKey(pluginId string, key string) ([]byte, *model.AppError) { - result := <-a.Srv.Store.Plugin().Get(pluginId, key) + result := <-a.Srv.Store.Plugin().Get(pluginId, getKeyHash(key)) if result.Err != nil { if result.Err.StatusCode == http.StatusNotFound { @@ -506,7 +523,7 @@ func (a *App) GetPluginKey(pluginId string, key string) ([]byte, *model.AppError } func (a *App) DeletePluginKey(pluginId string, key string) *model.AppError { - result := <-a.Srv.Store.Plugin().Delete(pluginId, key) + result := <-a.Srv.Store.Plugin().Delete(pluginId, getKeyHash(key)) if result.Err != nil { l4g.Error(result.Err.Error()) -- cgit v1.2.3-1-g7c22