diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-05-22 14:15:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:15:54 -0400 |
| commit | f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab (patch) | |
| tree | 85d274cb7ecca9ea6e8e595b15aa631c54acf1ea /app | |
| parent | 4c683aff7627040ff811f065848a820b2cb19d59 (diff) | |
| parent | ce378adc97399dcae9e1c9621c584669b813b2d2 (diff) | |
| download | chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.gz chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.bz2 chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'app')
| -rw-r--r-- | app/diagnostics.go | 1 | ||||
| -rw-r--r-- | app/webhook.go | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 6855731ce..527ca9840 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -338,6 +338,7 @@ func (a *App) trackConfig() { "enable_email_batching": *cfg.EmailSettings.EnableEmailBatching, "email_batching_buffer_size": *cfg.EmailSettings.EmailBatchingBufferSize, "email_batching_interval": *cfg.EmailSettings.EmailBatchingInterval, + "enable_preview_mode_banner": *cfg.EmailSettings.EnablePreviewModeBanner, "isdefault_feedback_name": isDefault(cfg.EmailSettings.FeedbackName, ""), "isdefault_feedback_email": isDefault(cfg.EmailSettings.FeedbackEmail, ""), "isdefault_feedback_organization": isDefault(*cfg.EmailSettings.FeedbackOrganization, model.EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION), diff --git a/app/webhook.go b/app/webhook.go index a5ab28952..c887fec97 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -633,6 +633,10 @@ func (a *App) HandleIncomingWebhook(hookId string, req *model.IncomingWebhookReq } } + if hook.ChannelLocked && hook.ChannelId != channel.Id { + return model.NewAppError("HandleIncomingWebhook", "web.incoming_webhook.channel_locked.app_error", nil, "", http.StatusForbidden) + } + if a.License() != nil && *a.Config().TeamSettings.ExperimentalTownSquareIsReadOnly && channel.Name == model.DEFAULT_CHANNEL { return model.NewAppError("HandleIncomingWebhook", "api.post.create_post.town_square_read_only", nil, "", http.StatusForbidden) |