mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Move macaron to chi (#14293)
Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR. - [x] Define `context.ResponseWriter` interface with an implementation `context.Response`. - [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before. - [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic . - [x] Use https://github.com/unrolled/render instead of macaron's internal render - [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip - [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK** - [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha - [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache - [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding - [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors - [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation` - [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle. - [x] Removed macaron log service because it's not need any more. **BREAK** - [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition. - [x] Move Git HTTP protocol implementation to use routers directly. - [x] Fix the problem that chi routes don't support trailing slash but macaron did. - [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. Notices: - Chi router don't support request with trailing slash - Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI. Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
@@ -13,14 +13,15 @@ import (
|
||||
"strings"
|
||||
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/auth"
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
"code.gitea.io/gitea/modules/context"
|
||||
"code.gitea.io/gitea/modules/convert"
|
||||
auth "code.gitea.io/gitea/modules/forms"
|
||||
"code.gitea.io/gitea/modules/git"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
"code.gitea.io/gitea/modules/util"
|
||||
"code.gitea.io/gitea/modules/web"
|
||||
"code.gitea.io/gitea/services/webhook"
|
||||
)
|
||||
|
||||
@@ -181,7 +182,8 @@ func ParseHookEvent(form auth.WebhookForm) *models.HookEvent {
|
||||
}
|
||||
|
||||
// GiteaHooksNewPost response for creating Gitea webhook
|
||||
func GiteaHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) {
|
||||
func GiteaHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewWebhookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings.add_webhook")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -230,8 +232,9 @@ func GiteaHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) {
|
||||
}
|
||||
|
||||
// GogsHooksNewPost response for creating webhook
|
||||
func GogsHooksNewPost(ctx *context.Context, form auth.NewGogshookForm) {
|
||||
newGogsWebhookPost(ctx, form, models.GOGS)
|
||||
func GogsHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewGogshookForm)
|
||||
newGogsWebhookPost(ctx, *form, models.GOGS)
|
||||
}
|
||||
|
||||
// newGogsWebhookPost response for creating gogs hook
|
||||
@@ -283,7 +286,8 @@ func newGogsWebhookPost(ctx *context.Context, form auth.NewGogshookForm, kind mo
|
||||
}
|
||||
|
||||
// DiscordHooksNewPost response for creating discord hook
|
||||
func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) {
|
||||
func DiscordHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewDiscordHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -334,7 +338,8 @@ func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) {
|
||||
}
|
||||
|
||||
// DingtalkHooksNewPost response for creating dingtalk hook
|
||||
func DingtalkHooksNewPost(ctx *context.Context, form auth.NewDingtalkHookForm) {
|
||||
func DingtalkHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewDingtalkHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -376,7 +381,8 @@ func DingtalkHooksNewPost(ctx *context.Context, form auth.NewDingtalkHookForm) {
|
||||
}
|
||||
|
||||
// TelegramHooksNewPost response for creating telegram hook
|
||||
func TelegramHooksNewPost(ctx *context.Context, form auth.NewTelegramHookForm) {
|
||||
func TelegramHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewTelegramHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -427,7 +433,8 @@ func TelegramHooksNewPost(ctx *context.Context, form auth.NewTelegramHookForm) {
|
||||
}
|
||||
|
||||
// MatrixHooksNewPost response for creating a Matrix hook
|
||||
func MatrixHooksNewPost(ctx *context.Context, form auth.NewMatrixHookForm) {
|
||||
func MatrixHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewMatrixHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -481,7 +488,8 @@ func MatrixHooksNewPost(ctx *context.Context, form auth.NewMatrixHookForm) {
|
||||
}
|
||||
|
||||
// MSTeamsHooksNewPost response for creating MS Teams hook
|
||||
func MSTeamsHooksNewPost(ctx *context.Context, form auth.NewMSTeamsHookForm) {
|
||||
func MSTeamsHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewMSTeamsHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -523,7 +531,8 @@ func MSTeamsHooksNewPost(ctx *context.Context, form auth.NewMSTeamsHookForm) {
|
||||
}
|
||||
|
||||
// SlackHooksNewPost response for creating slack hook
|
||||
func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) {
|
||||
func SlackHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewSlackHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -582,7 +591,8 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) {
|
||||
}
|
||||
|
||||
// FeishuHooksNewPost response for creating feishu hook
|
||||
func FeishuHooksNewPost(ctx *context.Context, form auth.NewFeishuHookForm) {
|
||||
func FeishuHooksNewPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewFeishuHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksNew"] = true
|
||||
@@ -685,7 +695,8 @@ func WebHooksEdit(ctx *context.Context) {
|
||||
}
|
||||
|
||||
// WebHooksEditPost response for editing web hook
|
||||
func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) {
|
||||
func WebHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewWebhookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings.update_webhook")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -725,7 +736,8 @@ func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) {
|
||||
}
|
||||
|
||||
// GogsHooksEditPost response for editing gogs hook
|
||||
func GogsHooksEditPost(ctx *context.Context, form auth.NewGogshookForm) {
|
||||
func GogsHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewGogshookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings.update_webhook")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -764,7 +776,8 @@ func GogsHooksEditPost(ctx *context.Context, form auth.NewGogshookForm) {
|
||||
}
|
||||
|
||||
// SlackHooksEditPost response for editing slack hook
|
||||
func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) {
|
||||
func SlackHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewSlackHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -814,7 +827,8 @@ func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) {
|
||||
}
|
||||
|
||||
// DiscordHooksEditPost response for editing discord hook
|
||||
func DiscordHooksEditPost(ctx *context.Context, form auth.NewDiscordHookForm) {
|
||||
func DiscordHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewDiscordHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -856,7 +870,8 @@ func DiscordHooksEditPost(ctx *context.Context, form auth.NewDiscordHookForm) {
|
||||
}
|
||||
|
||||
// DingtalkHooksEditPost response for editing discord hook
|
||||
func DingtalkHooksEditPost(ctx *context.Context, form auth.NewDingtalkHookForm) {
|
||||
func DingtalkHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewDingtalkHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -888,7 +903,8 @@ func DingtalkHooksEditPost(ctx *context.Context, form auth.NewDingtalkHookForm)
|
||||
}
|
||||
|
||||
// TelegramHooksEditPost response for editing discord hook
|
||||
func TelegramHooksEditPost(ctx *context.Context, form auth.NewTelegramHookForm) {
|
||||
func TelegramHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewTelegramHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -928,7 +944,8 @@ func TelegramHooksEditPost(ctx *context.Context, form auth.NewTelegramHookForm)
|
||||
}
|
||||
|
||||
// MatrixHooksEditPost response for editing a Matrix hook
|
||||
func MatrixHooksEditPost(ctx *context.Context, form auth.NewMatrixHookForm) {
|
||||
func MatrixHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewMatrixHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -971,7 +988,8 @@ func MatrixHooksEditPost(ctx *context.Context, form auth.NewMatrixHookForm) {
|
||||
}
|
||||
|
||||
// MSTeamsHooksEditPost response for editing MS Teams hook
|
||||
func MSTeamsHooksEditPost(ctx *context.Context, form auth.NewMSTeamsHookForm) {
|
||||
func MSTeamsHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewMSTeamsHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
@@ -1003,7 +1021,8 @@ func MSTeamsHooksEditPost(ctx *context.Context, form auth.NewMSTeamsHookForm) {
|
||||
}
|
||||
|
||||
// FeishuHooksEditPost response for editing feishu hook
|
||||
func FeishuHooksEditPost(ctx *context.Context, form auth.NewFeishuHookForm) {
|
||||
func FeishuHooksEditPost(ctx *context.Context) {
|
||||
form := web.GetForm(ctx).(*auth.NewFeishuHookForm)
|
||||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsHooks"] = true
|
||||
ctx.Data["PageIsSettingsHooksEdit"] = true
|
||||
|
Reference in New Issue
Block a user