mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-25 06:03:40 +09:00
191287d8be
Since #39229 the commit page header dereferences `.Verification.CommittingUser` when the committer is not the author. `Verification` is `nil` for unsigned commits (see `repo.Diff`), so opening such a commit — a rebased or cherry-picked one, for example — logs a template error and the page comes out truncated: ``` Render failed: failed to render template: repo/commit_page, error: template error: builtin(bindata):repo/commit_page:138:22 : executing "repo/commit_page" at <.Verification.CommittingUser>: nil pointer evaluating interface {}.CommittingUser ``` This guards the access and adds an integration test that creates a commit with distinct author and committer identities and checks the page renders completely (the status stays 200 on a mid-render failure, so the test looks at the body). _The fix was worked out with help from an AI assistant; I reviewed and tested it myself._ --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
81 lines
2.7 KiB
Go
81 lines
2.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package common
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/httpcache"
|
|
"gitea.dev/modules/log"
|
|
"gitea.dev/modules/reqctx"
|
|
"gitea.dev/modules/setting"
|
|
"gitea.dev/modules/templates"
|
|
"gitea.dev/modules/web/middleware"
|
|
"gitea.dev/modules/web/routing"
|
|
"gitea.dev/services/context"
|
|
)
|
|
|
|
const (
|
|
tplStatus500 templates.TplName = "status/500"
|
|
|
|
PageInternalServerErrorMark = "status-page-500"
|
|
)
|
|
|
|
func renderServerErrorPage(w http.ResponseWriter, req *http.Request, respCode int, tmpl templates.TplName, ctxData map[string]any, plainMsg string) {
|
|
acceptsHTML := false
|
|
for _, part := range req.Header["Accept"] {
|
|
if strings.Contains(part, "text/html") {
|
|
acceptsHTML = true
|
|
break
|
|
}
|
|
}
|
|
|
|
httpcache.SetCacheControlInHeader(w.Header(), &httpcache.CacheControlOptions{})
|
|
tmplCtx := context.NewTemplateContextForWeb(reqctx.FromContext(req.Context()), req, middleware.Locale(w, req))
|
|
w.WriteHeader(respCode)
|
|
|
|
outBuf := &bytes.Buffer{}
|
|
if acceptsHTML {
|
|
err := templates.PageRenderer().HTML(outBuf, respCode, tmpl, ctxData, tmplCtx)
|
|
if err != nil {
|
|
log.Error("Failed to render error page template %s: %v", tmpl, err)
|
|
_, _ = w.Write([]byte("Internal server error but failed to render error page template, please collect error logs and report to Gitea issue tracker"))
|
|
return
|
|
}
|
|
} else {
|
|
outBuf.WriteString(plainMsg)
|
|
}
|
|
_, _ = io.Copy(w, outBuf)
|
|
}
|
|
|
|
// renderPanicErrorPage renders a 500 page with the recovered panic value, it handles the stack trace, and it never panics
|
|
func renderPanicErrorPage(w http.ResponseWriter, req *http.Request, recovered any) {
|
|
combinedErr := fmt.Errorf("%v\n%s", recovered, log.Stack(2))
|
|
log.Error("PANIC: %v", combinedErr)
|
|
|
|
defer func() {
|
|
if err := recover(); err != nil {
|
|
log.Error("Panic occurs again when rendering error page: %v. Stack:\n%s", combinedErr, log.Stack(2))
|
|
}
|
|
}()
|
|
|
|
routing.UpdatePanicError(req.Context(), combinedErr)
|
|
|
|
plainMsg := "Internal Server Error"
|
|
ctxData := middleware.GetContextData(req.Context())
|
|
// This recovery handler could be called without Gitea's web context, so we shouldn't touch that context too much.
|
|
// Otherwise, the 500-page may cause new panics, eg: cache.GetContextWithData, it makes the developer&users couldn't find the original panic.
|
|
user, _ := ctxData[middleware.ContextDataKeySignedUser].(*user_model.User)
|
|
if !setting.IsProd || setting.IsInTesting || (user != nil && user.IsAdmin) {
|
|
plainMsg = "PANIC: " + combinedErr.Error()
|
|
ctxData["ErrorMsg"] = plainMsg
|
|
}
|
|
renderServerErrorPage(w, req, http.StatusInternalServerError, tplStatus500, ctxData, plainMsg)
|
|
}
|