diff options
| author | Lanre Adelowo <adelowomailbox@gmail.com> | 2018-09-10 15:31:08 +0100 |
|---|---|---|
| committer | techknowlogick <techknowlogick@users.noreply.github.com> | 2018-09-10 10:31:08 -0400 |
| commit | be48397945c77748d412baad3493bb5bd1c95e2a (patch) | |
| tree | d53dc2e78052588b6985400b762e994227183e76 /routers/repo | |
| parent | 6e03390aa8fa096206457962db1955d642860b57 (diff) | |
| download | gitea-be48397945c77748d412baad3493bb5bd1c95e2a.tar.gz gitea-be48397945c77748d412baad3493bb5bd1c95e2a.zip | |
Slack webhook channel name cannot be empty or just contain an hashtag (#4786)
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/webhook.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 53c1afe660..6c69354c70 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -332,8 +332,14 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { return } + if form.HasInvalidChannel() { + ctx.Flash.Error(ctx.Tr("repo.settings.add_webhook.invalid_channel_name")) + ctx.Redirect(orCtx.Link + "/settings/hooks/slack/new") + return + } + meta, err := json.Marshal(&models.SlackMeta{ - Channel: form.Channel, + Channel: strings.TrimSpace(form.Channel), Username: form.Username, IconURL: form.IconURL, Color: form.Color, @@ -515,8 +521,14 @@ func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) { return } + if form.HasInvalidChannel() { + ctx.Flash.Error(ctx.Tr("repo.settings.add_webhook.invalid_channel_name")) + ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID)) + return + } + meta, err := json.Marshal(&models.SlackMeta{ - Channel: form.Channel, + Channel: strings.TrimSpace(form.Channel), Username: form.Username, IconURL: form.IconURL, Color: form.Color, |