mirror of
https://github.com/go-gitea/gitea
synced 2024-11-05 21:59:20 +01:00
d6fa138e7c
There is a bug in the system webhooks whereby the active state is not checked when webhooks are prepared and there is a bug that deactivating webhooks do not prevent queued deliveries. * Only add SystemWebhooks to the prepareWebhooks list if they are active * At the time of delivery if the underlying webhook is not active mark it as "delivered" but with a failed delivery so it does not get delivered. Fix #19220 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
73 lines
2.2 KiB
Go
73 lines
2.2 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package admin
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"code.gitea.io/gitea/models/webhook"
|
|
"code.gitea.io/gitea/modules/base"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/util"
|
|
)
|
|
|
|
const (
|
|
// tplAdminHooks template path to render hook settings
|
|
tplAdminHooks base.TplName = "admin/hooks"
|
|
)
|
|
|
|
// DefaultOrSystemWebhooks renders both admin default and system webhook list pages
|
|
func DefaultOrSystemWebhooks(ctx *context.Context) {
|
|
var err error
|
|
|
|
ctx.Data["PageIsAdminSystemHooks"] = true
|
|
ctx.Data["PageIsAdminDefaultHooks"] = true
|
|
|
|
def := make(map[string]interface{}, len(ctx.Data))
|
|
sys := make(map[string]interface{}, len(ctx.Data))
|
|
for k, v := range ctx.Data {
|
|
def[k] = v
|
|
sys[k] = v
|
|
}
|
|
|
|
sys["Title"] = ctx.Tr("admin.systemhooks")
|
|
sys["Description"] = ctx.Tr("admin.systemhooks.desc")
|
|
sys["Webhooks"], err = webhook.GetSystemWebhooks(util.OptionalBoolNone)
|
|
sys["BaseLink"] = setting.AppSubURL + "/admin/hooks"
|
|
sys["BaseLinkNew"] = setting.AppSubURL + "/admin/system-hooks"
|
|
if err != nil {
|
|
ctx.ServerError("GetWebhooksAdmin", err)
|
|
return
|
|
}
|
|
|
|
def["Title"] = ctx.Tr("admin.defaulthooks")
|
|
def["Description"] = ctx.Tr("admin.defaulthooks.desc")
|
|
def["Webhooks"], err = webhook.GetDefaultWebhooks()
|
|
def["BaseLink"] = setting.AppSubURL + "/admin/hooks"
|
|
def["BaseLinkNew"] = setting.AppSubURL + "/admin/default-hooks"
|
|
if err != nil {
|
|
ctx.ServerError("GetWebhooksAdmin", err)
|
|
return
|
|
}
|
|
|
|
ctx.Data["DefaultWebhooks"] = def
|
|
ctx.Data["SystemWebhooks"] = sys
|
|
|
|
ctx.HTML(http.StatusOK, tplAdminHooks)
|
|
}
|
|
|
|
// DeleteDefaultOrSystemWebhook handler to delete an admin-defined system or default webhook
|
|
func DeleteDefaultOrSystemWebhook(ctx *context.Context) {
|
|
if err := webhook.DeleteDefaultSystemWebhook(ctx.FormInt64("id")); err != nil {
|
|
ctx.Flash.Error("DeleteDefaultWebhook: " + err.Error())
|
|
} else {
|
|
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
|
|
}
|
|
|
|
ctx.JSON(http.StatusOK, map[string]interface{}{
|
|
"redirect": setting.AppSubURL + "/admin/hooks",
|
|
})
|
|
}
|