Teamcity webhook

models/webhook.go

@@ -546,7 +546,7 @@ func copyDefaultWebhooksToRepo(e Engine, repoID int64) error {
 //  \___|_  / \____/ \____/|__|_ \ |____|  (____  /____  >__|_ \
 //        \/                    \/              \/     \/     \/
 
-// HookTaskType is the type of an hook task
+// HookTaskType is the type of a hook task
 type HookTaskType int
 
 // Types of hook tasks
@@ -560,6 +560,7 @@ const (
 	MSTEAMS
 	FEISHU
 	MATRIX
+	TEAMCITY
 )
 
 var hookTaskTypes = map[string]HookTaskType{
@@ -570,6 +571,7 @@ var hookTaskTypes = map[string]HookTaskType{
 	"dingtalk": DINGTALK,
 	"telegram": TELEGRAM,
 	"msteams":  MSTEAMS,
+	"teamcity": TEAMCITY,
 	"feishu":   FEISHU,
 	"matrix":   MATRIX,
 }
@@ -579,7 +581,7 @@ func ToHookTaskType(name string) HookTaskType {
 	return hookTaskTypes[name]
 }
 
-// Name returns the name of an hook task type
+// Name returns the name of a hook task type
 func (t HookTaskType) Name() string {
 	switch t {
 	case GITEA:
@@ -596,6 +598,8 @@ func (t HookTaskType) Name() string {
 		return "telegram"
 	case MSTEAMS:
 		return "msteams"
+	case TEAMCITY:
+		return "teamcity"
 	case FEISHU:
 		return "feishu"
 	case MATRIX:
@@ -687,6 +691,7 @@ type HookTask struct {
 	RepoID          int64 `xorm:"INDEX"`
 	HookID          int64
 	UUID            string
+	BearerToken     string
 	Type            HookTaskType
 	URL             string `xorm:"TEXT"`
 	Signature       string `xorm:"TEXT"`

modules/auth/repo_form.go

@@ -267,6 +267,18 @@ func (f *NewGogshookForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
 
+type NewTeamCityhookForm struct {
+	HostUrl   string `binding:"Required;ValidUrl"`
+	AuthToken string `binding:"Required"`
+	VcsRootId string `binding:"Required"`
+	WebhookForm
+}
+
+// Validate validates the fields
+func (f *NewTeamCityhookForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
 // NewSlackHookForm form for creating slack hook
 type NewSlackHookForm struct {
 	PayloadURL string `binding:"Required;ValidUrl"`

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", "teamcity", "feishu", "matrix"}
 	Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10)
 	Webhook.ProxyURL = sec.Key("PROXY_URL").MustString("")
 	if Webhook.ProxyURL != "" {

modules/webhook/deliver.go

@@ -50,7 +50,6 @@ func Deliver(t *models.HookTask) error {
 			if err != nil {
 				return err
 			}
-
 			req.Header.Set("Content-Type", "application/json")
 		case models.ContentTypeForm:
 			var forms = url.Values{
@@ -91,6 +90,10 @@ func Deliver(t *models.HookTask) error {
 		return fmt.Errorf("Invalid http method for webhook: [%d] %v", t.ID, t.HTTPMethod)
 	}
 
+	if t.BearerToken != "" {
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", t.BearerToken))
+	}
+
 	req.Header.Add("X-Gitea-Delivery", t.UUID)
 	req.Header.Add("X-Gitea-Event", t.EventType.Event())
 	req.Header.Add("X-Gitea-Signature", t.Signature)

modules/webhook/teamcity.go

@@ -0,0 +1,25 @@
+package webhook
+
+import (
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/log"
+	"encoding/json"
+)
+
+type (
+	TeamCityMeta struct {
+		HostUrl   string `json:"host_url"`
+		AuthToken string `json:"auth_token"`
+		VcsRootId string `json:"vcs_root_id"`
+	}
+)
+
+func GetTeamCityHook(w *models.Webhook) *TeamCityMeta {
+	s := &TeamCityMeta{}
+
+	if err := json.Unmarshal([]byte(w.Meta), s); err != nil {
+		log.Error("webhook.GetTeamCityHook(%d): %v", w.ID, err)
+	}
+
+	return s
+}

modules/webhook/webhook.go

@@ -95,6 +95,8 @@ func prepareWebhook(w *models.Webhook, repo *models.Repository, event models.Hoo
 
 	var payloader api.Payloader
 	var err error
+	var authToken string
+
 	// Use separate objects so modifications won't be made on payload on non-Gogs/Gitea type hooks.
 	switch w.HookTaskType {
 	case models.SLACK:
@@ -132,6 +134,10 @@ func prepareWebhook(w *models.Webhook, repo *models.Repository, event models.Hoo
 		if err != nil {
 			return fmt.Errorf("GetMatrixPayload: %v", err)
 		}
+	case models.TEAMCITY:
+		payloader = p              // TeamCity POST hooks don't have a body
+		hook := GetTeamCityHook(w) // Reuse the JSON marshalling
+		authToken = hook.AuthToken
 	default:
 		p.SetSecret(w.Secret)
 		payloader = p
@@ -153,6 +159,7 @@ func prepareWebhook(w *models.Webhook, repo *models.Repository, event models.Hoo
 
 	if err = models.CreateHookTask(&models.HookTask{
 		RepoID:      repo.ID,
+		BearerToken: authToken,
 		HookID:      w.ID,
 		Type:        w.HookTaskType,
 		URL:         w.URL,

options/locale/locale_bg-BG.ini

@@ -909,6 +909,9 @@ settings.hook_type=Тип на куката
 settings.slack_token=API ключ
 settings.slack_domain=Домейн
 settings.slack_channel=Канал
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.deploy_keys=Ключове за внедряване
 settings.add_deploy_key=Добави ключ за внедряване
 settings.title=Заглавие

options/locale/locale_cs-CZ.ini

@@ -1569,9 +1569,13 @@ settings.add_slack_hook_desc=Integrovat <a href="%s">Slack</a> do vašeho repozi
 settings.slack_token=Poukázka
 settings.slack_domain=Doména
 settings.slack_channel=Kanál
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=Integrovat <a href="%s">Discord</a> do vašeho repozitáře.
 settings.add_dingtalk_hook_desc=Integrovat <a href="%s">Dingtalk</a> do vašeho repozitáře.
 settings.add_telegram_hook_desc=Integrovat <a href="%s">Telegram</a> do vašeho repozitáře.
+settings.add_teamcity_hook_desc=Integrovat <a href="%s">TeamCity</a> do vašeho repozitáře.
 settings.add_matrix_hook_desc=Integrovat <a href="%s">Matrix</a> do vašeho repozitáře.
 settings.add_msteams_hook_desc=Integrovat <a href="%s">Microsoft Teams</a> do vašeho repozitáře.
 settings.add_feishu_hook_desc=Integrovat <a href="%s">Feishu</a> do vašeho repozitáře.

options/locale/locale_de-DE.ini

@@ -1601,9 +1601,13 @@ settings.add_slack_hook_desc=<a href="%s">Slack</a>-Integration zu deinem Reposi
 settings.slack_token=Token
 settings.slack_domain=Domain
 settings.slack_channel=Kanal
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=<a href="%s">Discord</a>-Integration zu deinem Repository hinzufügen.
 settings.add_dingtalk_hook_desc=<a href="%s">Dingtalk</a>-Integration zu deinem Repository hinzufügen.
 settings.add_telegram_hook_desc=<a href="%s">Telegram</a>-Integration zu deinem Repository hinzufügen.
+settings.add_teamcity_hook_desc=<a href="%s">TeamCity</a>-Integration zu deinem Repository hinzufügen.
 settings.add_matrix_hook_desc=<a href="%s">Matrix</a>-Integration zu deinem Repository hinzufügen.
 settings.add_msteams_hook_desc=<a href="%s">"Microsoft Teams"</a>-Integration zu deinem Repository hinzufügen.
 settings.add_feishu_hook_desc=<a href="%s">Feishu</a>-Integration zu deinem Repository hinzufügen.

options/locale/locale_en-US.ini

@@ -954,7 +954,7 @@ issues.new.no_reviewers = No reviewers
 issues.new.add_reviewer_title = Request review
 issues.choose.get_started = Get Started
 issues.choose.blank = Default
-issues.choose.blank_about = Create an issue from default template. 
+issues.choose.blank_about = Create an issue from default template.
 issues.no_ref = No Branch/Tag Specified
 issues.create = Create Issue
 issues.new_label = New Label
@@ -1612,9 +1612,13 @@ settings.add_slack_hook_desc = Integrate <a href="%s">Slack</a> into your reposi
 settings.slack_token = Token
 settings.slack_domain = Domain
 settings.slack_channel = Channel
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc = Integrate <a href="%s">Discord</a> into your repository.
 settings.add_dingtalk_hook_desc = Integrate <a href="%s">Dingtalk</a> into your repository.
 settings.add_telegram_hook_desc = Integrate <a href="%s">Telegram</a> into your repository.
+settings.add_teamcity_hook_desc = Integrate <a href="%s">TeamCity</a> into your repository.
 settings.add_matrix_hook_desc = Integrate <a href="%s">Matrix</a> into your repository.
 settings.add_msteams_hook_desc = Integrate <a href="%s">Microsoft Teams</a> into your repository.
 settings.add_feishu_hook_desc = Integrate <a href="%s">Feishu</a> into your repository.

options/locale/locale_es-ES.ini

@@ -1594,9 +1594,13 @@ settings.add_slack_hook_desc=Integrar <a href="%s">Slack</a> en su repositorio.
 settings.slack_token=Token
 settings.slack_domain=Dominio
 settings.slack_channel=Canal
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=Integrar <a href="%s">Discord</a> en su repositorio.
 settings.add_dingtalk_hook_desc=Integrar <a href="%s">Dingtalk</a> en su repositorio.
 settings.add_telegram_hook_desc=Integrar <a href="%s">Telegrama</a> en tu repositorio.
+settings.add_teamcity_hook_desc=Integrar <a href="%s">TeamCity</a> en tu repositorio.
 settings.add_matrix_hook_desc=Integrar <a href="%s">Matrix</a> en su repositorio.
 settings.add_msteams_hook_desc=Integrar <a href="%s">Microsoft Teams</a> en tu repositorio.
 settings.add_feishu_hook_desc=Integrar <a href="%s">Slack</a> en su repositorio.

options/locale/locale_fa-IR.ini

@@ -548,10 +548,10 @@ access_token_deletion=حذف توکن
 access_token_deletion_desc=حذف token باعث از کار افتادن تمامی برنامه‎هایی که در آنها به کار رفته می‎شود. آیا ادامه می‎دهید؟
 delete_token_success=token مورد نظر حذف شد. برنامه هایی که از آن استفاده می‎کنند به زودی دسترسی به حساب کاربری شما را از دست می‎دهند.
 
-manage_oauth2_applications=مدیریت برنامه‎های OAuth2 
-edit_oauth2_application=ویرایش برنامه OAuth2 
+manage_oauth2_applications=مدیریت برنامه‎های OAuth2
+edit_oauth2_application=ویرایش برنامه OAuth2
 oauth2_applications_desc=برنامه‎های OAuth2 احراز هویت برنامه های شخص ثالث را با بستری امن میسر می‎کند.
-remove_oauth2_application=حذف برنامه OAuth2 
+remove_oauth2_application=حذف برنامه OAuth2
 remove_oauth2_application_desc=حذف برنامه OAuth2  دسترسی تمام برنامه های متصل با آن را از بین می‎برد. آیا ادامه می‎دهید؟
 remove_oauth2_application_success=برنامه حذف شده است.
 create_oauth2_application=ساختن یک برنامه OAuth2 جدید
@@ -1483,9 +1483,13 @@ settings.add_slack_hook_desc=درست کردن <a href="%s">سستی </a> در 
 settings.slack_token=توکن
 settings.slack_domain=دامنه
 settings.slack_channel=کانال
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=درست کردن <a href="%s">اختلاف‌ها </a> در مخزن شما.
 settings.add_dingtalk_hook_desc=درست کردن <a href="%s">Dingtalk </a> در مخزن شما.
 settings.add_telegram_hook_desc=درست کردن <a href="%s">تلگرام  </a> در مخزن شما.
+settings.add_teamcity_hook_desc=درست کردن <a href="%s">TeamCity </a> در مخزن شما.
 settings.add_msteams_hook_desc=درست کردن <a href="%s">تیم مایکروسافت </a> در مخزن شما.
 settings.deploy_keys=کلید های استقرار
 settings.add_deploy_key=افزودن کلید استقرار

options/locale/locale_fi-FI.ini

@@ -900,9 +900,13 @@ settings.add_slack_hook_desc=Liitä <a href="%s">Slack</a> repoon.
 settings.slack_token=Pääsymerkki
 settings.slack_domain=Verkkotunnus
 settings.slack_channel=Kanava
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=Liitä <a href="%s">Discord</a> repoon.
 settings.add_dingtalk_hook_desc=Liitä <a href="%s">Dingtalk</a> repoon.
 settings.add_telegram_hook_desc=Liitä <a href="%s">Telegram</a> repoon.
+settings.add_teamcity_hook_desc=Liitä <a href="%s">TeamCity</a> repoon.
 settings.add_matrix_hook_desc=Liitä <a href="%s">Matrix</a> repoon.
 settings.add_msteams_hook_desc=Liitä <a href="%s">Microsoft Teams</a> repoon.
 settings.add_feishu_hook_desc=Liitä <a href="%s">Feishu</a> repoon.

options/locale/locale_fr-FR.ini

@@ -1480,9 +1480,13 @@ settings.add_slack_hook_desc=Intégrer <a href="%s">Slack</a> au dépôt.
 settings.slack_token=Jeton
 settings.slack_domain=Domaine
 settings.slack_channel=Canal
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=Intégrer <a href="%s">Discord</a> au dépôt.
 settings.add_dingtalk_hook_desc=Intégrer <a href="%s">Dingtalk</a> au dépôt.
 settings.add_telegram_hook_desc=Intégrer <a href="%s">Telegram</a> au dépôt.
+settings.add_teamcity_hook_desc=Intégrer <a href="%s">TeamCity</a> au dépôt.
 settings.add_matrix_hook_desc=Intégrer <a href="%s">Matrix</a> au dépôt.
 settings.add_msteams_hook_desc=Intégrer <a href="%s">Microsoft Teams</a> au dépôt.
 settings.add_feishu_hook_desc=Intégrer <a href="%s">Feishu</a> au dépôt.

options/locale/locale_hu-HU.ini

@@ -1215,9 +1215,13 @@ settings.add_slack_hook_desc=<a href="%s">Slack</a> integrálása a tárolóba.
 settings.slack_token=Token
 settings.slack_domain=Tartomány
 settings.slack_channel=Csatorna
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=<a href="%s">Discord</a> integrálása a tárolóba.
 settings.add_dingtalk_hook_desc=<a href="%s">Dingtalk</a> integrálása a tárolóba.
 settings.add_telegram_hook_desc=<a href="%s">Telegram</a> integrálása a tárolóba.
+settings.add_teamcity_hook_desc=<a href="%s">TeamCity</a> integrálása a tárolóba.
 settings.add_msteams_hook_desc=<a href="%s">Microsoft Teams</a> integrálása a tárolóba.
 settings.deploy_keys=Telepítési kulcsok
 settings.add_deploy_key=Telepítési kulcs hozzáadása
@@ -1544,7 +1548,7 @@ auths.tip.gitlab=Vegyen fel új alkalmazást itt: https://gitlab.com/profile/app
 auths.tip.google_plus=Szerezzen OAuth2 kliens hitelesítési adatokat a Google API konzolban (https://console.developers.google.com/)
 auths.tip.openid_connect=Használja az OpenID kapcsolódás felfedező URL-t (<kiszolgáló>/.well-known/openid-configuration) a végpontok beállításához
 auths.tip.twitter=Menyjen ide: https://dev.twitter.com/apps, hozzon létre egy alkalmazást és győződjön meg róla, hogy az “Allow this application to be used to Sign in with Twitter” opció be van kapcsolva
-auths.tip.discord=Vegyen fel új alkalmazást itt: 
+auths.tip.discord=Vegyen fel új alkalmazást itt:
 https://discordapp.com/developers/applications/me
 auths.tip.gitea=Regisztráljon új OAuth2 alkalmazást. Útmutató erről itt található: https://docs.gitea.io/en-us/oauth2-provider
 auths.edit=Hitelesítési forrás szerkesztése

options/locale/locale_id-ID.ini

@@ -993,6 +993,9 @@ settings.hook_type=Jenis Hook
 settings.slack_token=Token
 settings.slack_domain=Domain
 settings.slack_channel=Saluran
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.deploy_keys=Kunci Deploy
 settings.add_deploy_key=Tambahkan Kunci Deploy
 settings.title=Judul

options/locale/locale_it-IT.ini

@@ -1434,9 +1434,13 @@ settings.add_slack_hook_desc=Integra <a href="%s">Slack</a> nel tuo repository.
 settings.slack_token=Gettone
 settings.slack_domain=Dominio
 settings.slack_channel=Canale
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=Integra <a href="%s">Discord</a> nel tuo repository.
 settings.add_dingtalk_hook_desc=Integra <a href="%s">Dingtalk</a> nel tuo repository.
 settings.add_telegram_hook_desc=Integra <a href="%s">Telegram</a> nella tua repository.
+settings.add_teamcity_hook_desc=Integra <a href="%s">TeamCity</a> nella tua repository.
 settings.add_msteams_hook_desc=Integra <a href="%s">Microsoft Teams</a> nella tua repository.
 settings.add_feishu_hook_desc=Integra <a href="%s">Feishu</a> nel tuo repository.
 settings.deploy_keys=Dispiega Chiavi

options/locale/locale_ja-JP.ini

@@ -1611,9 +1611,13 @@ settings.add_slack_hook_desc=<a href="%s">Slack</a>をリポジトリと組み
 settings.slack_token=トークン
 settings.slack_domain=ドメイン
 settings.slack_channel=チャンネル
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=<a href="%s">Discord</a>をリポジトリと組み合わせます。
 settings.add_dingtalk_hook_desc=<a href="%s">Dingtalk</a>をリポジトリと組み合わせます。
 settings.add_telegram_hook_desc=<a href="%s">Telegram</a>をリポジトリと組み合わせます。
+settings.add_teamcity_hook_desc=<a href="%s">TeamCity</a>をリポジトリと組み合わせます。
 settings.add_matrix_hook_desc=<a href="%s">Matrix</a> とリポジトリを組み合わせます。
 settings.add_msteams_hook_desc=<a href="%s">Microsoft Teams</a>をリポジトリと組み合わせます。
 settings.add_feishu_hook_desc=<a href="%s">Feishu</a>をリポジトリと組み合わせます。

options/locale/locale_ko-KR.ini

@@ -1096,6 +1096,9 @@ settings.add_slack_hook_desc=<a href="%s">Slack</a>을 저장소와 연동.
 settings.slack_token=토큰
 settings.slack_domain=도메인
 settings.slack_channel=채널
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=<a href="%s">Discord</a>를 저장소와 연동.
 settings.add_dingtalk_hook_desc=<a href="%s">Dingtalk</a>을 저장소와 연동.
 settings.deploy_keys=배포 키

options/locale/locale_lv-LV.ini

@@ -1583,9 +1583,13 @@ settings.add_slack_hook_desc=Integrēt <a href="%s">Slack</a> repozitorijā.
 settings.slack_token=Talons
 settings.slack_domain=Domēns
 settings.slack_channel=Kanāls
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_discord_hook_desc=Integrēt <a href="%s">Discord</a> repozitorijā.
 settings.add_dingtalk_hook_desc=Integrēt <a href="%s">Dingtalk</a> repozitorijā.
 settings.add_telegram_hook_desc=Integrēt <a href="%s">Telegram</a> repozitorijā.
+settings.add_teamcity_hook_desc=Integrēt <a href="%s">TeamCity</a> repozitorijā.
 settings.add_matrix_hook_desc=Integrēt <a href="%s">Matrix</a> repozitorijā.
 settings.add_msteams_hook_desc=Integrēt <a href="%s">Microsoft Teams</a> repozitorijā.
 settings.add_feishu_hook_desc=Integrēt <a href="%s">Feishu</a> repozitorijā.

options/locale/locale_nl-NL.ini

@@ -1423,6 +1423,9 @@ settings.hook_type=Type hook
 settings.slack_token=Slack token
 settings.slack_domain=Slack domein
 settings.slack_channel=Slack kanaal
+settings.teamcity_host_url = Host URL
+settings.teamcity_vcs_root_id = VCS Root ID
+settings.teamcity_auth_token = Authentication Token
 settings.add_matrix_hook_desc=Integreer <a href="%s">Matrix</a> in uw repository.
 settings.add_feishu_hook_desc=Integreer <a href="%s">Feishu</a> in uw repository.
 settings.deploy_keys=Installeer sleutels