ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-22 04:33:42 +09:00
Code Issues Projects Releases Wiki Activity

fix: pass merge commit messages to git via stdin (#39269)

Browse Source 
`git commit --message=` passes the merge message as a single argument,
which Linux caps at 128 KiB and Windows at 32 KiB for the whole command
line. Long messages failed with `argument list too long` and the merge
box toast showed the raw HTML 500 page.

Pass the message via `--file=-` on stdin instead, and answer
fetch-action requests with JSON on server errors so the toast shows the
error text. Limits merge commit messages to 512KB which could be
extended or made configurable later.

Fixes: https://github.com/go-gitea/gitea/issues/39261
Fixes: https://github.com/go-gitea/gitea/issues/30276
Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
silverwind
2026-09-19 13:04:53 +00:00
committed by GitHub
co-authored by wxiaoguang
parent cc34c26172
commit cdf786ce92
21 changed files with 175 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/context/context_response.go
+28 -21
View File
@@ -7,13 +7,11 @@ import (
"errors"
"fmt"
"html/template"
"net"
"net/http"
"net/url"
"path"
"strconv"
"strings"
"syscall"
"time"
user_model "gitea.dev/models/user"
@@ -90,7 +88,7 @@ func (ctx *Context) HTML(status int, name templates.TplName) {
}
err := ctx.Render.HTML(ctx.Resp, status, name, ctx.Data, ctx.TemplateContext)
if err == nil || errors.Is(err, syscall.EPIPE) {
if err == nil || httplib.IsClientOrNetworkError(ctx, err) {
return
}
@@ -126,13 +124,13 @@ func (ctx *Context) RenderWithErrDeprecated(msg any, tpl templates.TplName, form
// NotFound displays a 404 (Not Found) page and prints the given error, if any.
func (ctx *Context) NotFound(logErr error) {
ctx.notFoundInternal("", logErr)
ctx.notFoundInternal(1, "", logErr)
}
func (ctx *Context) notFoundInternal(logMsg string, logErr error) {
func (ctx *Context) notFoundInternal(skip int, logMsg string, logErr error) {
// TODO: it's safe to show the error message to end users if the error is fully controlled by our error system
if logErr != nil {
log.Log(2, log.DEBUG, "%s: %v", logMsg, logErr)
log.Log(skip+1, log.DEBUG, "%s: %v", logMsg, logErr)
}
// response simple message if Accept isn't text/html
@@ -155,32 +153,41 @@ func (ctx *Context) notFoundInternal(logMsg string, logErr error) {
ctx.HTML(http.StatusNotFound, "status/404")
}
func (ctx *Context) buildUserErrorMessage(msg string, err error) (userErrorMsg string) {
// it's safe to show internal error to admin users, and it helps
if !setting.IsProd || (ctx.Doer != nil && ctx.Doer.IsAdmin) {
userErrorMsg = msg
if err != nil {
userErrorMsg += ", error: " + err.Error()
}
}
return util.IfZero(userErrorMsg, ctx.Locale.TrString("error.occurred"))
}
// ServerError displays a 500 (Internal Server Error) page and prints the given error, if any.
// If the error is controlled by our error system, a related 404 page can be displayed instead.
func (ctx *Context) ServerError(logMsg string, logErr error) {
if errors.Is(logErr, util.ErrNotExist) {
ctx.notFoundInternal(logMsg, logErr)
ctx.notFoundInternal(1, logMsg, logErr)
return
}
ctx.serverErrorInternal(logMsg, logErr)
ctx.serverErrorInternal(1, logMsg, logErr)
}
func (ctx *Context) serverErrorInternal(logMsg string, logErr error) {
func (ctx *Context) serverErrorInternal(skip int, logMsg string, logErr error) {
if logErr != nil {
log.ErrorWithSkip(2, "%s: %v", logMsg, logErr)
if _, ok := logErr.(*net.OpError); ok || errors.Is(logErr, &net.OpError{}) {
// This is an error within the underlying connection
// and further rendering will not work so just return
return
}
logLevel := util.Iif(httplib.IsClientOrNetworkError(ctx, logErr), log.DEBUG, log.ERROR)
log.Log(skip+1, logLevel, "%s: %v", logMsg, logErr)
}
// it's safe to show internal error to admin users, and it helps
if !setting.IsProd || (ctx.Doer != nil && ctx.Doer.IsAdmin) {
ctx.Data["ErrorMsg"] = fmt.Sprintf("%s, %s", logMsg, logErr)
}
userErrorMsg := ctx.buildUserErrorMessage(logMsg, logErr)
if httplib.IsGiteaFetchActionRequest(ctx.Req) {
ctx.JSON(http.StatusInternalServerError, buildJsonErrorMap(userErrorMsg))
return
}
ctx.Data["Title"] = "Internal Server Error"
ctx.Data["ErrorMsg"] = userErrorMsg
ctx.HTML(http.StatusInternalServerError, tplStatus500)
}
@@ -190,8 +197,8 @@ func (ctx *Context) serverErrorInternal(logMsg string, logErr error) {
// TODO: remove the "errCheck" and use util.ErrNotFound to check
func (ctx *Context) NotFoundOrServerError(logMsg string, errCheck func(error) bool, logErr error) {
if errCheck(logErr) {
ctx.notFoundInternal(logMsg, logErr)
ctx.notFoundInternal(1, logMsg, logErr)
return
}
ctx.serverErrorInternal(logMsg, logErr)
ctx.serverErrorInternal(1, logMsg, logErr)
}