diff options
| author | Florian Orben <florian.orben@gmail.com> | 2015-11-06 00:42:12 +0100 |
|---|---|---|
| committer | Florian Orben <florian.orben@gmail.com> | 2015-11-06 00:42:12 +0100 |
| commit | c1baee398493434f7684f2db5ad48cc4b1b59279 (patch) | |
| tree | a61f076339d86ad1d2efd3b2a56ac4e55d982a6a /web/web.go | |
| parent | d96cb50b68adca9f035c7582f1ceefdde64fb4f7 (diff) | |
| download | chat-c1baee398493434f7684f2db5ad48cc4b1b59279.tar.gz chat-c1baee398493434f7684f2db5ad48cc4b1b59279.tar.bz2 chat-c1baee398493434f7684f2db5ad48cc4b1b59279.zip | |
don't panic if incoming webhook contains invalid json
Diffstat (limited to 'web/web.go')
| -rw-r--r-- | web/web.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/web/web.go b/web/web.go index 51f6664b6..96f826359 100644 --- a/web/web.go +++ b/web/web.go @@ -983,6 +983,11 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { parsedRequest = model.IncomingWebhookRequestFromJson(strings.NewReader(r.FormValue("payload"))) } + if parsedRequest == nil { + c.Err = model.NewAppError("incomingWebhook", "Unable to parse incoming data", "") + return + } + text := parsedRequest.Text if len(text) == 0 { c.Err = model.NewAppError("incomingWebhook", "No text specified", "") |