summaryrefslogtreecommitdiffstats
path: root/api4/webhook.go
diff options
context:
space:
mode:
authorJesse Hallam <jesse.hallam@gmail.com>2018-04-26 11:19:25 -0400
committerGitHub <noreply@github.com>2018-04-26 11:19:25 -0400
commit6d50d836f538253e2d13d5ddb90495820f9cb259 (patch)
tree2d61042647dec793be5f6e4e87f095dfef658f14 /api4/webhook.go
parentd3f09b54e2be65981f0496938f9d5f97507874e6 (diff)
downloadchat-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 'api4/webhook.go')
-rw-r--r--api4/webhook.go12
1 files changed, 8 insertions, 4 deletions
diff --git a/api4/webhook.go b/api4/webhook.go
index 52c4ea331..a0e7b5785 100644
--- a/api4/webhook.go
+++ b/api4/webhook.go
@@ -509,11 +509,15 @@ func commandWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
id := params["id"]
- response := model.CommandResponseFromHTTPBody(r.Header.Get("Content-Type"), r.Body)
-
- err := c.App.HandleCommandWebhook(id, response)
+ response, err := model.CommandResponseFromHTTPBody(r.Header.Get("Content-Type"), r.Body)
if err != nil {
- c.Err = err
+ c.Err = model.NewAppError("commandWebhook", "web.command_webhook.parse.app_error", nil, err.Error(), http.StatusBadRequest)
+ return
+ }
+
+ appErr := c.App.HandleCommandWebhook(id, response)
+ if appErr != nil {
+ c.Err = appErr
return
}