Merge pull request #2374 from mattermost/PLT-2040

PLT-2040 disable executing of commands

api/command.go

@@ -69,6 +69,7 @@ func listCommands(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	if *utils.Cfg.ServiceSettings.EnableCommands {
 		if result := <-Srv.Store.Command().GetByTeam(c.Session.TeamId); result.Err != nil {
 			c.Err = result.Err
 			return
@@ -82,6 +83,7 @@ func listCommands(c *Context, w http.ResponseWriter, r *http.Request) {
 				}
 			}
 		}
+	}
 
 	w.Write([]byte(model.CommandListToJson(commands)))
 }
@@ -114,6 +116,13 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
 		handleResponse(c, w, response, channelId, provider.GetCommand(c), true)
 		return
 	} else {
+
+		if !*utils.Cfg.ServiceSettings.EnableCommands {
+			c.Err = model.NewLocAppError("executeCommand", "api.command.disabled.app_error", nil, "")
+			c.Err.StatusCode = http.StatusNotImplemented
+			return
+		}
+
 		chanChan := Srv.Store.Channel().Get(channelId)
 		teamChan := Srv.Store.Team().Get(c.Session.TeamId)
 		userChan := Srv.Store.User().Get(c.Session.UserId)