diff options
| author | George Goldberg <george@gberg.me> | 2018-03-26 12:56:57 +0100 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-03-26 13:56:57 +0200 |
| commit | ca5198c7b64f76027bf7b7cc4592c62b42fee623 (patch) | |
| tree | a6affcee7dbcca7f7996d1dedf4d1aef2ba78b7c /api4/role.go | |
| parent | 5fa1b3581955761bd39c310bc88b1489d963a9fc (diff) | |
| download | chat-ca5198c7b64f76027bf7b7cc4592c62b42fee623.tar.gz chat-ca5198c7b64f76027bf7b7cc4592c62b42fee623.tar.bz2 chat-ca5198c7b64f76027bf7b7cc4592c62b42fee623.zip | |
Ignore blank role names in getRolesByName call. (#8507)
Diffstat (limited to 'api4/role.go')
| -rw-r--r-- | api4/role.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/api4/role.go b/api4/role.go index e7654011d..c4203137b 100644 --- a/api4/role.go +++ b/api4/role.go @@ -5,6 +5,7 @@ package api4 import ( "net/http" + "strings" "github.com/mattermost/mattermost-server/model" ) @@ -52,14 +53,21 @@ func getRolesByNames(c *Context, w http.ResponseWriter, r *http.Request) { return } + var cleanedRoleNames []string for _, rolename := range rolenames { + if strings.TrimSpace(rolename) == "" { + continue + } + if !model.IsValidRoleName(rolename) { c.SetInvalidParam("rolename") return } + + cleanedRoleNames = append(cleanedRoleNames, rolename) } - if roles, err := c.App.GetRolesByNames(rolenames); err != nil { + if roles, err := c.App.GetRolesByNames(cleanedRoleNames); err != nil { c.Err = err return } else { |