summaryrefslogtreecommitdiffstats
path: root/model/outgoing_webhook.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-02 14:13:34 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-02 14:13:34 -0500
commit31eee1ef6ebb59a89885ef7e3ebd6801f9a396d4 (patch)
treec21e52d00aa42dbb8e7f0077f259014eeaa8cbaf /model/outgoing_webhook.go
parent17233b1dce530eef75e16944da7abdb060d2c27e (diff)
parent1f3423796eee06a126d3cab7c276e2d0f169b869 (diff)
downloadchat-31eee1ef6ebb59a89885ef7e3ebd6801f9a396d4.tar.gz
chat-31eee1ef6ebb59a89885ef7e3ebd6801f9a396d4.tar.bz2
chat-31eee1ef6ebb59a89885ef7e3ebd6801f9a396d4.zip
Merge pull request #1268 from mattermost/plt-514
PLT-514 Validate callback urls on the server and add help text to outgoing webhooks
Diffstat (limited to 'model/outgoing_webhook.go')
-rw-r--r--model/outgoing_webhook.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go
index 8958dd5b0..9a1b89a85 100644
--- a/model/outgoing_webhook.go
+++ b/model/outgoing_webhook.go
@@ -100,6 +100,12 @@ func (o *OutgoingWebhook) IsValid() *AppError {
return NewAppError("OutgoingWebhook.IsValid", "Invalid callback urls", "")
}
+ for _, callback := range o.CallbackURLs {
+ if !IsValidHttpUrl(callback) {
+ return NewAppError("OutgoingWebhook.IsValid", "Invalid callback URLs. Each must be a valid URL and start with http:// or https://", "")
+ }
+ }
+
return nil
}