diff options
| author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-04-26 11:19:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:19:25 -0400 |
| commit | 6d50d836f538253e2d13d5ddb90495820f9cb259 (patch) | |
| tree | 2d61042647dec793be5f6e4e87f095dfef658f14 /app/command.go | |
| parent | d3f09b54e2be65981f0496938f9d5f97507874e6 (diff) | |
| download | chat-6d50d836f538253e2d13d5ddb90495820f9cb259.tar.gz chat-6d50d836f538253e2d13d5ddb90495820f9cb259.tar.bz2 chat-6d50d836f538253e2d13d5ddb90495820f9cb259.zip | |
MM-10232, MM-10259: Improve error handling from invalid json (#8668)
* MM-10232: improve error handling from malformed slash command responses
Switch to json.Unmarshal, which doesn't obscure JSON parse failures like
json.Decode. The latter is primarily designed for streams of JSON, not
necessarily unmarshalling just a single object.
* rework HumanizedJsonError to expose Line and Character discretely
* MM-10259: pinpoint line and character where json config error occurs
* tweak HumanizeJsonError to accept err first
Diffstat (limited to 'app/command.go')
| -rw-r--r-- | app/command.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/command.go b/app/command.go index fa9b38bf3..039952cf0 100644 --- a/app/command.go +++ b/app/command.go @@ -246,8 +246,9 @@ func (a *App) ExecuteCommand(args *model.CommandArgs) (*model.CommandResponse, * return nil, model.NewAppError("command", "api.command.execute_command.failed.app_error", map[string]interface{}{"Trigger": trigger}, err.Error(), http.StatusInternalServerError) } else { if resp.StatusCode == http.StatusOK { - response := model.CommandResponseFromHTTPBody(resp.Header.Get("Content-Type"), resp.Body) - if response == nil { + if response, err := model.CommandResponseFromHTTPBody(resp.Header.Get("Content-Type"), resp.Body); err != nil { + return nil, model.NewAppError("command", "api.command.execute_command.failed.app_error", map[string]interface{}{"Trigger": trigger}, err.Error(), http.StatusInternalServerError) + } else if response == nil { return nil, model.NewAppError("command", "api.command.execute_command.failed_empty.app_error", map[string]interface{}{"Trigger": trigger}, "", http.StatusInternalServerError) } else { return a.HandleCommandResponse(cmd, args, response, false) |