From 078e2b2c39f119b9cbe5678ce12f1cc9eb6ddda9 Mon Sep 17 00:00:00 2001 From: lengyuqu Date: Fri, 23 Jul 2021 12:41:27 +0800 Subject: [PATCH] Add support for corporate WeChat webhooks (#15910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 企业微信webhook * 企业微信webhook * 企业微信webhook * Update templates/admin/hook_new.tmpl Co-authored-by: a1012112796 <1012112796@qq.com> * Update services/webhook/wechatwork.go Co-authored-by: a1012112796 <1012112796@qq.com> * 修善wechatwork * 修善wechatwork * fix * Update locale_cs-CZ.ini fix * fix build * fix * fix build * make webhooks.zh-cn.md * delet unnecessary blank line * delet unnecessary blank line * 企业微信webhook * 企业微信webhook * 企业微信webhook * Update templates/admin/hook_new.tmpl Co-authored-by: a1012112796 <1012112796@qq.com> * Update services/webhook/wechatwork.go Co-authored-by: a1012112796 <1012112796@qq.com> * 修善wechatwork * 修善wechatwork * fix * fix build * fix * fix build * make webhooks.zh-cn.md * delet unnecessary blank line * delet unnecessary blank line * 企业微信webhook * 企业微信webhook * 企业微信webhook * 企业微信webhook * 企业微信webhook * fix * fix * 企业微信webhook * 企业微信webhook * 企业微信webhook * fix wechat * fix wechat * fix wechat * fix wechat * Fix invalid params and typo of email templates (#16394) Signed-off-by: Meano * Add LRU mem cache implementation (#16226) The current default memory cache implementation is unbounded in size and number of objects cached. This is hardly ideal. This PR proposes creating a TwoQueue LRU cache as the underlying cache for Gitea. The cache is limited by the number of objects stored in the cache (rather than size) for simplicity. The default number of objects is 50000 - which is perhaps too small as most of our objects cached are going to be much less than 1kB. It may be worth considering using a different LRU implementation that actively limits sizes or avoids GC - however, this is just a beginning implementation. Signed-off-by: Andrew Thornton * [skip ci] Updated translations via Crowdin * Replace `plugins/docker` with `techknowlogick/drone-docker`in ci (#16407) * plugins/docker -> techknowlogick/drone-docker * It is multi-arch * docs: rewrite email setup (#16404) * Add intro for both the docs page and mailer methods * Fix numbering level in SMTP section * Recommends implicit TLS Signed-off-by: Bagas Sanjaya * Validate Issue Index before querying DB (#16406) * Fix external renderer (#16401) * fix external renderer * use GBackground context as fallback * no fallback, return error Co-authored-by: Lauris BH * Add checkbox to delete pull branch after successful merge (#16049) * Add checkbox to delete pull branch after successful merge * Omit DeleteBranchAfterMerge field in json * Log a warning instead of error when PR head branch deleted * Add DefaultDeleteBranchAfterMerge to PullRequestConfig * Add support for delete_branch_after_merge via API * Fix for API: the branch should be deleted from the HEAD repo If head and base repo are the same, reuse the already opened ctx.Repo.GitRepo * Don't delegate to CleanupBranch, only reuse branch deletion code CleanupBranch contains too much logic that has already been performed by the Merge * Reuse gitrepo in MergePullRequest Co-authored-by: Andrew Thornton * [skip ci] Updated translations via Crowdin * Detect encoding changes while parsing diff (#16330) * Detect encoding changes while parsing diff * Let branch/tag name be a valid ref to get CI status (#16400) * fix #16384# * refactor: move shared helper func to utils package * extend Tests * use ctx.Repo.GitRepo if not nil * fix * fix * 企业微信webhook * 企业微信webhook * 企业微信webhook * fix build * fix build * Apply suggestions from code review Co-authored-by: a1012112796 <1012112796@qq.com> Co-authored-by: myheavily Co-authored-by: zhaoxin Co-authored-by: Meano Co-authored-by: zeripath Co-authored-by: GiteaBot Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Bagas Sanjaya Co-authored-by: Norwin Co-authored-by: Lauris BH Co-authored-by: Jimmy Praet Co-authored-by: Lunny Xiao --- docs/content/doc/features/webhooks.en-us.md | 1 + docs/content/doc/features/webhooks.zh-cn.md | 13 ++ docs/content/doc/features/webhooks.zh-tw.md | 1 + models/migrations/v161.go | 20 +- models/migrations/v162.go | 20 +- models/webhook.go | 19 +- modules/setting/webhook.go | 2 +- modules/structs/hook.go | 2 +- options/locale/locale_cs-CZ.ini | 1 + options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + options/locale/locale_zh-TW.ini | 1 + public/img/wechatwork.png | Bin 0 -> 9341 bytes routers/web/repo/webhook.go | 77 +++++++ routers/web/web.go | 5 + services/forms/repo_form.go | 12 ++ services/webhook/webhook.go | 4 + services/webhook/wechatwork.go | 188 ++++++++++++++++++ templates/admin/hook_new.tmpl | 3 + templates/org/settings/hook_new.tmpl | 3 + .../repo/settings/webhook/base_list.tmpl | 3 + templates/repo/settings/webhook/new.tmpl | 3 + .../repo/settings/webhook/wechatwork.tmpl | 11 + templates/swagger/v1_json.tmpl | 3 +- 24 files changed, 364 insertions(+), 30 deletions(-) create mode 100644 public/img/wechatwork.png create mode 100644 services/webhook/wechatwork.go create mode 100644 templates/repo/settings/webhook/wechatwork.tmpl diff --git a/docs/content/doc/features/webhooks.en-us.md b/docs/content/doc/features/webhooks.en-us.md index 5d792f5f57..7a88f2a5e7 100644 --- a/docs/content/doc/features/webhooks.en-us.md +++ b/docs/content/doc/features/webhooks.en-us.md @@ -27,6 +27,7 @@ All event pushes are POST requests. The methods currently supported are: - Telegram - Microsoft Teams - Feishu +- Wechatwork ### Event information diff --git a/docs/content/doc/features/webhooks.zh-cn.md b/docs/content/doc/features/webhooks.zh-cn.md index fe9008717a..f3a312eee2 100644 --- a/docs/content/doc/features/webhooks.zh-cn.md +++ b/docs/content/doc/features/webhooks.zh-cn.md @@ -15,4 +15,17 @@ menu: # Webhooks +Gitea 的存储 webhook。这可以有存储库管路设定页 `/:username/:reponame/settings/hooks` 中的。Webhook 也可以按照组织调整或全系统调整，所有时间的推送都是POST请求 +。此方法目前被下列服务支援： + +- Gitea (也可以是 GET 請求) +- Gogs +- Slack +- Discord +- Dingtalk +- Telegram +- Microsoft Teams +- Feishu +- Wechatwork + ## TBD diff --git a/docs/content/doc/features/webhooks.zh-tw.md b/docs/content/doc/features/webhooks.zh-tw.md index 0d1c564f6d..697b413916 100644 --- a/docs/content/doc/features/webhooks.zh-tw.md +++ b/docs/content/doc/features/webhooks.zh-tw.md @@ -26,6 +26,7 @@ Gitea 的儲存庫事件支援 web hook。這可以有儲存庫管理員在設 - Telegram - Microsoft Teams - Feishu +- Wechatwork ### 事件資訊 diff --git a/models/migrations/v161.go b/models/migrations/v161.go index 4ca9f01218..7ef06b4c26 100644 --- a/models/migrations/v161.go +++ b/models/migrations/v161.go @@ -19,18 +19,20 @@ func convertTaskTypeToString(x *xorm.Engine) error { MSTEAMS FEISHU MATRIX + WECHATWORK ) hookTaskTypes := map[int]string{ - GITEA: "gitea", - GOGS: "gogs", - SLACK: "slack", - DISCORD: "discord", - DINGTALK: "dingtalk", - TELEGRAM: "telegram", - MSTEAMS: "msteams", - FEISHU: "feishu", - MATRIX: "matrix", + GITEA: "gitea", + GOGS: "gogs", + SLACK: "slack", + DISCORD: "discord", + DINGTALK: "dingtalk", + TELEGRAM: "telegram", + MSTEAMS: "msteams", + FEISHU: "feishu", + MATRIX: "matrix", + WECHATWORK: "wechatwork", } type HookTask struct { diff --git a/models/migrations/v162.go b/models/migrations/v162.go index 9dd175cd38..cf2baadbca 100644 --- a/models/migrations/v162.go +++ b/models/migrations/v162.go @@ -19,18 +19,20 @@ func convertWebhookTaskTypeToString(x *xorm.Engine) error { MSTEAMS FEISHU MATRIX + WECHATWORK ) hookTaskTypes := map[int]string{ - GITEA: "gitea", - GOGS: "gogs", - SLACK: "slack", - DISCORD: "discord", - DINGTALK: "dingtalk", - TELEGRAM: "telegram", - MSTEAMS: "msteams", - FEISHU: "feishu", - MATRIX: "matrix", + GITEA: "gitea", + GOGS: "gogs", + SLACK: "slack", + DISCORD: "discord", + DINGTALK: "dingtalk", + TELEGRAM: "telegram", + MSTEAMS: "msteams", + FEISHU: "feishu", + MATRIX: "matrix", + WECHATWORK: "wechatwork", } type Webhook struct { diff --git a/models/webhook.go b/models/webhook.go index 29cfcf6ed4..9c8c0a568b 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -114,15 +114,16 @@ type HookType = string // Types of webhooks const ( - GITEA HookType = "gitea" - GOGS HookType = "gogs" - SLACK HookType = "slack" - DISCORD HookType = "discord" - DINGTALK HookType = "dingtalk" - TELEGRAM HookType = "telegram" - MSTEAMS HookType = "msteams" - FEISHU HookType = "feishu" - MATRIX HookType = "matrix" + GITEA HookType = "gitea" + GOGS HookType = "gogs" + SLACK HookType = "slack" + DISCORD HookType = "discord" + DINGTALK HookType = "dingtalk" + TELEGRAM HookType = "telegram" + MSTEAMS HookType = "msteams" + FEISHU HookType = "feishu" + MATRIX HookType = "matrix" + WECHATWORK HookType = "wechatwork" ) // HookStatus is the status of a web hook diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go index 4a0c593c8d..8ef54f5cbe 100644 --- a/modules/setting/webhook.go +++ b/modules/setting/webhook.go @@ -36,7 +36,7 @@ func newWebhookService() { Webhook.QueueLength = sec.Key("QUEUE_LENGTH").MustInt(1000) Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5) Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool() - Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk", "telegram", "msteams", "feishu", "matrix"} + Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk", "telegram", "msteams", "feishu", "matrix", "wechatwork"} Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10) Webhook.ProxyURL = sec.Key("PROXY_URL").MustString("") if Webhook.ProxyURL != "" { diff --git a/modules/structs/hook.go b/modules/structs/hook.go index e4ec99df40..ad86cb35a4 100644 --- a/modules/structs/hook.go +++ b/modules/structs/hook.go @@ -42,7 +42,7 @@ type CreateHookOptionConfig map[string]string // CreateHookOption options when create a hook type CreateHookOption struct { // required: true - // enum: dingtalk,discord,gitea,gogs,msteams,slack,telegram,feishu + // enum: dingtalk,discord,gitea,gogs,msteams,slack,telegram,feishu,wechatwork Type string `json:"type" binding:"Required"` // required: true Config CreateHookOptionConfig `json:"config" binding:"Required"` diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 2ee17ef36d..373ee94575 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1758,6 +1758,7 @@ settings.add_telegram_hook_desc=Integrovat Telegram do vašeho settings.add_matrix_hook_desc=Integrovat Matrix do vašeho repozitáře. settings.add_msteams_hook_desc=Integrovat Microsoft Teams do vašeho repozitáře. settings.add_feishu_hook_desc=Integrovat Feishu do vašeho repozitáře. +settings.add_wechatwork_hook_desc=Integrovat Wechatwork do vašeho repozitáře. settings.deploy_keys=Klíče pro nasazení settings.add_deploy_key=Přidat klíč pro nasazení settings.deploy_key_desc=Klíče pro nasazení mají k tomuto repozitáři přístup pouze pro čtení. diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2479bc5bb4..760c026116 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1848,6 +1848,7 @@ settings.add_telegram_hook_desc = Integrate Telegram into your settings.add_matrix_hook_desc = Integrate Matrix into your repository. settings.add_msteams_hook_desc = Integrate Microsoft Teams into your repository. settings.add_feishu_hook_desc = Integrate Feishu into your repository. +settings.add_Wechat_hook_desc = Integrate Wechatwork into your repository. settings.deploy_keys = Deploy Keys settings.add_deploy_key = Add Deploy Key settings.deploy_key_desc = Deploy keys have read-only pull access to the repository. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 60a2e5c9fa..9e1374ceca 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1848,6 +1848,7 @@ settings.add_telegram_hook_desc=将 Telegram 集成到您的仓 settings.add_matrix_hook_desc=将 Matrix 集成到您的仓库中。 settings.add_msteams_hook_desc=将 Microsoft Teams 集成到您的仓库中。 settings.add_feishu_hook_desc=将 Feishu 集成到您的仓库中。 +settings.add_wechatwork_hook_desc=将 Wechatwork 集成到您的仓库中。 settings.deploy_keys=部署密钥 settings.add_deploy_key=添加部署密钥 settings.deploy_key_desc=部署密钥具有对仓库的只读拉取权限。 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index e8c0e3c92b..39f5b38e42 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -1833,6 +1833,7 @@ settings.add_telegram_hook_desc=將 Telegram 整合到您的儲 settings.add_matrix_hook_desc=將 Matrix 整合到您的儲存庫。 settings.add_msteams_hook_desc=將 Microsoft Teams 整合到您的儲存庫。 settings.add_feishu_hook_desc=將 Feishu 整合到您的儲存庫。 +settings.add_wechatwork_hook_desc=将 Wechatwork 整合到您的儲存庫。 settings.deploy_keys=部署金鑰 settings.add_deploy_key=新增部署金鑰 settings.deploy_key_desc=部署金鑰具有唯讀權限，可拉取此儲存庫。 diff --git a/public/img/wechatwork.png b/public/img/wechatwork.png new file mode 100644 index 0000000000000000000000000000000000000000..296225fb885144f88c2b02073d7ca642877be9ac GIT binary patch literal 9341 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 %s ", p.Repo.FullName, branchName, commitDesc) + + var text string + // for each commit, generate attachment text + for i, commit := range p.Commits { + var authorName string + if commit.Author != nil { + authorName = "Author：" + commit.Author.Name + } + + message := strings.ReplaceAll(commit.Message, "\n\n", "\r\n") + text += fmt.Sprintf(" > [%s](%s) \r\n >%s \n >%s", commit.ID[:7], commit.URL, + message, authorName) + + // add linebreak to each commit but the last + if i < len(p.Commits)-1 { + text += "\n" + } + } + return newWechatworkMarkdownPayload(title + "\r\n\r\n" + text), nil + +} + +// Issue implements PayloadConvertor Issue method +func (f *WechatworkPayload) Issue(p *api.IssuePayload) (api.Payloader, error) { + text, issueTitle, attachmentText, _ := getIssuesPayloadInfo(p, noneLinkFormatter, true) + var content string + content += fmt.Sprintf(" >%s\n >%s \n > %s", text, attachmentText, issueTitle) + + return newWechatworkMarkdownPayload(content), nil + +} + +// IssueComment implements PayloadConvertor IssueComment method +func (f *WechatworkPayload) IssueComment(p *api.IssueCommentPayload) (api.Payloader, error) { + text, issueTitle, _ := getIssueCommentPayloadInfo(p, noneLinkFormatter, true) + var content string + content += fmt.Sprintf(" >%s\n >%s \n >%s", text, p.Comment.Body, issueTitle) + + return newWechatworkMarkdownPayload(content), nil + +} + +// PullRequest implements PayloadConvertor PullRequest method +func (f *WechatworkPayload) PullRequest(p *api.PullRequestPayload) (api.Payloader, error) { + text, issueTitle, attachmentText, _ := getPullRequestPayloadInfo(p, noneLinkFormatter, true) + pr := fmt.Sprintf("> %s \r\n > %s \r\n > %s \r\n", + text, issueTitle, attachmentText) + + return newWechatworkMarkdownPayload(pr), nil + +} + +// Review implements PayloadConvertor Review method +func (f *WechatworkPayload) Review(p *api.PullRequestPayload, event models.HookEventType) (api.Payloader, error) { + var text, title string + switch p.Action { + case api.HookIssueSynchronized: + action, err := parseHookPullRequestEventType(event) + if err != nil { + return nil, err + } + title = fmt.Sprintf("[%s] Pull request review %s : #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title) + text = p.Review.Content + } + + return newWechatworkMarkdownPayload("# " + title + "\r\n\r\n >" + text), nil + +} + +// Repository implements PayloadConvertor Repository method +func (f *WechatworkPayload) Repository(p *api.RepositoryPayload) (api.Payloader, error) { + var title string + switch p.Action { + case api.HookRepoCreated: + title = fmt.Sprintf("[%s] Repository created", p.Repository.FullName) + return newWechatworkMarkdownPayload(title), nil + case api.HookRepoDeleted: + title = fmt.Sprintf("[%s] Repository deleted", p.Repository.FullName) + return newWechatworkMarkdownPayload(title), nil + } + + return nil, nil +} + +// Release implements PayloadConvertor Release method +func (f *WechatworkPayload) Release(p *api.ReleasePayload) (api.Payloader, error) { + text, _ := getReleasePayloadInfo(p, noneLinkFormatter, true) + + return newWechatworkMarkdownPayload(text), nil +} + +// GetWechatworkPayload GetWechatworkPayload converts a ding talk webhook into a WechatworkPayload +func GetWechatworkPayload(p api.Payloader, event models.HookEventType, meta string) (api.Payloader, error) { + return convertPayloader(new(WechatworkPayload), p, event) +} diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 01e9e429a6..4710498b20 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -32,6 +32,8 @@ {{else if eq .HookType "matrix"}} + {{else if eq .HookType "wechatwork"}} + {{end}} @@ -45,6 +47,7 @@ {{template "repo/settings/webhook/msteams" .}} {{template "repo/settings/webhook/feishu" .}} {{template "repo/settings/webhook/matrix" .}} + {{template "repo/settings/webhook/wechatwork" .}} {{template "repo/settings/webhook/history" .}} diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index d070b8bc4b..43351d0ceb 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -27,6 +27,8 @@ {{else if eq .HookType "matrix"}} + {{else if eq .HookType "wechatwork"}} + {{end}} @@ -40,6 +42,7 @@ {{template "repo/settings/webhook/msteams" .}} {{template "repo/settings/webhook/feishu" .}} {{template "repo/settings/webhook/matrix" .}} + {{template "repo/settings/webhook/wechatwork" .}} {{template "repo/settings/webhook/history" .}} diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index e77e747742..e96d086039 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -31,6 +31,9 @@ Matrix + + Wechatwork + diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 7c2e5b1a90..6df128f40a 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -25,6 +25,8 @@ {{else if eq .HookType "matrix"}} + {{else if eq .HookType "wechatwork"}} + {{end}} @@ -38,6 +40,7 @@ {{template "repo/settings/webhook/msteams" .}} {{template "repo/settings/webhook/feishu" .}} {{template "repo/settings/webhook/matrix" .}} + {{template "repo/settings/webhook/wechatwork" .}} {{template "repo/settings/webhook/history" .}} diff --git a/templates/repo/settings/webhook/wechatwork.tmpl b/templates/repo/settings/webhook/wechatwork.tmpl new file mode 100644 index 0000000000..503fab205f --- /dev/null +++ b/templates/repo/settings/webhook/wechatwork.tmpl @@ -0,0 +1,11 @@ +{{if eq .HookType "wechatwork"}} +

{{.i18n.Tr "repo.settings.add_wechatwork_hook_desc" "https://work.weixin.qq.com" | Str2html}}

+
+ {{.CsrfTokenHtml}} +
+ + +
+ {{template "repo/settings/webhook/settings" .}} +
+{{end}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index eeb002cb9a..238265fd7e 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -12917,7 +12917,8 @@ "msteams", "slack", "telegram", - "feishu" + "feishu", + "wechatwork" ], "x-go-name": "Type" }