diff --git a/modules/git/hook.go b/modules/git/hook.go index 6682b9f9b34..d4d7f74c411 100644 --- a/modules/git/hook.go +++ b/modules/git/hook.go @@ -22,9 +22,6 @@ var hookNames = []string{ "post-receive", } -// ErrNotValidHook error when a git hook is not valid -var ErrNotValidHook = errors.New("not a valid Git hook") - // IsValidHookName returns true if given name is a valid Git hook. func IsValidHookName(name string) bool { return slices.Contains(hookNames, name) @@ -43,7 +40,7 @@ type Hook struct { func GetHook(repo RepositoryFacade, name string) (*Hook, error) { repoPath := gitrepo.RepoLocalPath(repo) if !IsValidHookName(name) { - return nil, ErrNotValidHook + return nil, util.NewNotExistErrorf("invalid hook name: %s", name) } h := &Hook{ name: name, diff --git a/modules/httplib/server_request.go b/modules/httplib/server_request.go index 6e79df4c739..e6e4d118532 100644 --- a/modules/httplib/server_request.go +++ b/modules/httplib/server_request.go @@ -267,3 +267,12 @@ func IsClientOrNetworkError(ctx context.Context, err error) bool { } return false } + +func ClientAcceptHTML(req *http.Request) bool { + for _, part := range req.Header["Accept"] { + if strings.Contains(part, "text/html") { + return true + } + } + return false +} diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go index c78a1dc63a2..bd8c41b5e4f 100644 --- a/routers/api/packages/rubygems/rubygems.go +++ b/routers/api/packages/rubygems/rubygems.go @@ -89,7 +89,7 @@ func enumeratePackages(ctx *context.Context, filename string, pvs []*packages_mo zw.Name = filename if err := rubygems_module.NewMarshalEncoder(zw).Encode(specs); err != nil { - ctx.ServerError("Download file failed", err) + ctx.ServerErrorAuto(err) } } @@ -158,7 +158,7 @@ func ServePackageSpecification(ctx *context.Context) { } if err := rubygems_module.NewMarshalEncoder(zw).Encode(spec); err != nil { - ctx.ServerError("Download file failed", err) + ctx.ServerErrorAuto(err) } } diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 03c1e2592de..1ae469109b8 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -311,11 +311,6 @@ func ListBranches(ctx *context.APIContext) { keyword := ctx.FormString("q") if !ctx.Repo.Repository.IsEmpty { - if ctx.Repo.GitRepo == nil { - ctx.APIErrorInternal(nil) - return - } - branchOpts := git_model.FindBranchOptions{ ListOptions: listOptions, RepoID: ctx.Repo.Repository.ID, diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go index 4b55a9b55ab..f17bb312349 100644 --- a/routers/api/v1/repo/git_hook.go +++ b/routers/api/v1/repo/git_hook.go @@ -4,7 +4,6 @@ package repo import ( - "errors" "net/http" "gitea.dev/modules/git" @@ -83,11 +82,7 @@ func GetGitHook(ctx *context.APIContext) { hookID := ctx.PathParam("id") hook, err := git.GetHook(ctx.Repo.GitRepo, hookID) if err != nil { - if errors.Is(err, git.ErrNotValidHook) { - ctx.APIErrorNotFound() - } else { - ctx.APIErrorInternal(err) - } + ctx.APIErrorAuto(err) return } ctx.JSON(http.StatusOK, convert.ToGitHook(hook)) @@ -130,11 +125,7 @@ func EditGitHook(ctx *context.APIContext) { hookID := ctx.PathParam("id") hook, err := git.GetHook(ctx.Repo.GitRepo, hookID) if err != nil { - if errors.Is(err, git.ErrNotValidHook) { - ctx.APIErrorNotFound() - } else { - ctx.APIErrorInternal(err) - } + ctx.APIErrorAuto(err) return } @@ -179,11 +170,7 @@ func DeleteGitHook(ctx *context.APIContext) { hookID := ctx.PathParam("id") hook, err := git.GetHook(ctx.Repo.GitRepo, hookID) if err != nil { - if errors.Is(err, git.ErrNotValidHook) { - ctx.APIErrorNotFound() - } else { - ctx.APIErrorInternal(err) - } + ctx.APIErrorAuto(err) return } diff --git a/routers/common/errpage.go b/routers/common/errpage.go index fcf60fc7ebd..7b5ef4c3f99 100644 --- a/routers/common/errpage.go +++ b/routers/common/errpage.go @@ -8,10 +8,10 @@ import ( "fmt" "io" "net/http" - "strings" user_model "gitea.dev/models/user" "gitea.dev/modules/httpcache" + "gitea.dev/modules/httplib" "gitea.dev/modules/log" "gitea.dev/modules/reqctx" "gitea.dev/modules/setting" @@ -28,20 +28,12 @@ const ( ) 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 { + if httplib.ClientAcceptHTML(req) { err := templates.PageRenderer().HTML(outBuf, respCode, tmpl, ctxData, tmplCtx) if err != nil { log.Error("Failed to render error page template %s: %v", tmpl, err) diff --git a/routers/install/install.go b/routers/install/install.go index 1490947b879..d985f664dbd 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -480,7 +480,7 @@ func initAdminUser(ctx *context.Context, form *forms.InstallForm) bool { nt, token, err := auth_service.CreateAuthTokenForUserID(ctx, adminUser.ID) if err != nil { - ctx.ServerError("CreateAuthTokenForUserID", err) + ctx.ServerErrorAuto(err) return false } diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index d418dcb037d..a347211f9c6 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -258,13 +258,13 @@ func MonitorStats(ctx *context.Context) { ctx.Data["PageIsAdminMonitorStats"] = true bs, err := json.Marshal(activities_model.GetStatistic(ctx).Counter) if err != nil { - ctx.ServerError("MonitorStats", err) + ctx.ServerErrorAuto(err) return } statsCounter := map[string]any{} err = json.Unmarshal(bs, &statsCounter) if err != nil { - ctx.ServerError("MonitorStats", err) + ctx.ServerErrorAuto(err) return } statsKeys := make([]string, 0, len(statsCounter)) diff --git a/routers/web/admin/applications.go b/routers/web/admin/applications.go index 488ca672912..b454b49a78b 100644 --- a/routers/web/admin/applications.go +++ b/routers/web/admin/applications.go @@ -37,7 +37,7 @@ func Applications(ctx *context.Context) { IsGlobal: true, }) if err != nil { - ctx.ServerError("GetOAuth2ApplicationsByUserID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Applications"] = apps diff --git a/routers/web/admin/audit.go b/routers/web/admin/audit.go index 8950cb14f09..65f5902cf68 100644 --- a/routers/web/admin/audit.go +++ b/routers/web/admin/audit.go @@ -40,7 +40,7 @@ func ExportAuditLogs(ctx *context.Context) { // the first page is fetched before any header is written so a failing query still results in a proper error page events, total, err := findPage() if err != nil { - ctx.ServerError("FindEvents", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 31c4045a33a..3d002ce7ce6 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -54,7 +54,7 @@ func Authentications(ctx *context.Context) { var err error ctx.Data["Sources"], ctx.Data["Total"], err = db.FindAndCount[auth.Source](ctx, auth.FindSourcesOptions{}) if err != nil { - ctx.ServerError("auth.Sources", err) + ctx.ServerErrorAuto(err) return } @@ -313,7 +313,7 @@ func NewAuthSourcePost(ctx *context.Context) { ctx.Data["Err_DiscoveryURL"] = true ctx.RenderWithErrDeprecated(ctx.Tr("admin.auths.unable_to_initialize_openid", errInit.Unwrap()), tplAuthNew, form) } else { - ctx.ServerError("auth.CreateSource", err) + ctx.ServerErrorAuto(err) } return } @@ -336,7 +336,7 @@ func EditAuthSource(ctx *context.Context) { source, err := auth.GetSourceByID(ctx, ctx.PathParamInt64("authid")) if err != nil { - ctx.ServerError("auth.GetSourceByID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Source"] = source @@ -367,7 +367,7 @@ func EditAuthSourcePost(ctx *context.Context) { source, err := auth.GetSourceByID(ctx, ctx.PathParamInt64("authid")) if err != nil { - ctx.ServerError("auth.GetSourceByID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Source"] = source @@ -425,7 +425,7 @@ func EditAuthSourcePost(ctx *context.Context) { ctx.Data["Err_DiscoveryURL"] = true ctx.HTML(http.StatusOK, tplAuthEdit) } else { - ctx.ServerError("UpdateSource", err) + ctx.ServerErrorAuto(err) } return } @@ -439,7 +439,7 @@ func EditAuthSourcePost(ctx *context.Context) { func DeleteAuthSource(ctx *context.Context) { source, err := auth.GetSourceByID(ctx, ctx.PathParamInt64("authid")) if err != nil { - ctx.ServerError("auth.GetSourceByID", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/badges.go b/routers/web/admin/badges.go index 6c4e9b54b9b..1861f9051bc 100644 --- a/routers/web/admin/badges.go +++ b/routers/web/admin/badges.go @@ -71,7 +71,7 @@ func NewBadgePost(ctx *context.Context) { if errors.Is(err, util.ErrAlreadyExist) { ctx.JSONError(ctx.Tr("admin.badges.slug_been_taken")) } else { - ctx.ServerError("CreateBadge", err) + ctx.ServerErrorAuto(err) } return } @@ -88,7 +88,7 @@ func prepareBadgeInfo(ctx *context.Context) *user_model.Badge { if errors.Is(err, util.ErrNotExist) { ctx.Redirect(setting.AppSubURL + "/-/admin/badges") } else { - ctx.ServerError("GetBadge", err) + ctx.ServerErrorAuto(err) } return nil } @@ -114,7 +114,7 @@ func ViewBadge(ctx *context.Context) { } users, count, err := user_model.GetBadgeUsers(ctx, opts) if err != nil { - ctx.ServerError("GetBadgeUsers", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Users"] = users @@ -152,7 +152,7 @@ func EditBadgePost(ctx *context.Context) { b.Description = form.Description if err := user_model.UpdateBadge(ctx, b); err != nil { - ctx.ServerError("UpdateBadge", err) + ctx.ServerErrorAuto(err) return } @@ -166,12 +166,12 @@ func EditBadgePost(ctx *context.Context) { func DeleteBadge(ctx *context.Context) { b, err := user_model.GetBadge(ctx, ctx.PathParam("badge_slug")) if err != nil { - ctx.ServerError("GetBadge", err) + ctx.ServerErrorAuto(err) return } if err = user_model.DeleteBadge(ctx, b); err != nil { - ctx.ServerError("DeleteBadge", err) + ctx.ServerErrorAuto(err) return } @@ -197,7 +197,7 @@ func BadgeUsers(ctx *context.Context) { } users, count, err := user_model.GetBadgeUsers(ctx, opts) if err != nil { - ctx.ServerError("GetBadgeUsers", err) + ctx.ServerErrorAuto(err) return } @@ -218,7 +218,7 @@ func BadgeUsersPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("form.user_not_exist")) ctx.Redirect(setting.AppSubURL + ctx.Req.URL.EscapedPath()) } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) } return } @@ -231,7 +231,7 @@ func BadgeUsersPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("admin.badges.user_already_has")) ctx.Redirect(setting.AppSubURL + ctx.Req.URL.EscapedPath()) } else { - ctx.ServerError("AddUserBadge", err) + ctx.ServerErrorAuto(err) } return } @@ -251,14 +251,14 @@ func DeleteBadgeUser(ctx *context.Context) { ctx.JSONRedirect(badgeUsersURL) return } else { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } } if err := user_model.RemoveUserBadge(ctx, user, &user_model.Badge{Slug: ctx.PathParam("badge_slug")}); err == nil { ctx.Flash.Success(ctx.Tr("admin.badges.user_remove_success")) } else { - ctx.ServerError("RemoveUserBadge", err) + ctx.ServerErrorAuto(err) return } @@ -299,7 +299,7 @@ func RenderBadgeSearch(ctx *context.Context, opts *user_model.SearchBadgeOptions if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) { badges, count, err = user_model.SearchBadges(ctx, opts) if err != nil { - ctx.ServerError("SearchBadges", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 069d75e7f90..50ef422b066 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -153,7 +153,7 @@ loop: return } if err := system_model.SetSettings(ctx, configSettings); err != nil { - ctx.ServerError("SetSettings", err) + ctx.ServerErrorAuto(err) return } config.GetDynGetter().InvalidateCache() diff --git a/routers/web/admin/diagnosis.go b/routers/web/admin/diagnosis.go index 3567b46d909..c130c103c54 100644 --- a/routers/web/admin/diagnosis.go +++ b/routers/web/admin/diagnosis.go @@ -29,14 +29,14 @@ func MonitorDiagnosis(ctx *context.Context) { f, err := zipWriter.CreateHeader(&zip.FileHeader{Name: "goroutine-before.txt", Method: zip.Deflate, Modified: time.Now()}) if err != nil { - ctx.ServerError("Failed to create zip file", err) + ctx.ServerErrorAuto(err) return } _ = pprof.Lookup("goroutine").WriteTo(f, 1) f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "cpu-profile.dat", Method: zip.Deflate, Modified: time.Now()}) if err != nil { - ctx.ServerError("Failed to create zip file", err) + ctx.ServerErrorAuto(err) return } @@ -50,21 +50,21 @@ func MonitorDiagnosis(ctx *context.Context) { f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "goroutine-after.txt", Method: zip.Deflate, Modified: time.Now()}) if err != nil { - ctx.ServerError("Failed to create zip file", err) + ctx.ServerErrorAuto(err) return } _ = pprof.Lookup("goroutine").WriteTo(f, 1) f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "heap.dat", Method: zip.Deflate, Modified: time.Now()}) if err != nil { - ctx.ServerError("Failed to create zip file", err) + ctx.ServerErrorAuto(err) return } _ = pprof.Lookup("heap").WriteTo(f, 0) f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "perftrace.txt", Method: zip.Deflate, Modified: time.Now()}) if err != nil { - ctx.ServerError("Failed to create zip file", err) + ctx.ServerErrorAuto(err) return } for _, record := range tailmsg.GetManager().GetTraceRecorder().GetRecords() { diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index eed4ff1cce4..6c30ff8e344 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -80,7 +80,7 @@ func Emails(ctx *context.Context) { if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) { baseEmails, count, err = user_model.SearchEmails(ctx, opts) if err != nil { - ctx.ServerError("SearchEmails", err) + ctx.ServerErrorAuto(err) return } emails = make([]ActiveEmail, len(baseEmails)) @@ -164,13 +164,13 @@ func ActivateEmail(ctx *context.Context) { func DeleteEmail(ctx *context.Context) { u, err := user_model.GetUserByID(ctx, ctx.FormInt64("uid")) if err != nil || u == nil { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } email, err := user_model.GetEmailAddressByID(ctx, u.ID, ctx.FormInt64("id")) if err != nil || email == nil { - ctx.ServerError("GetEmailAddressByID", err) + ctx.ServerErrorAuto(err) return } @@ -180,7 +180,7 @@ func DeleteEmail(ctx *context.Context) { ctx.JSONRedirect("") return } - ctx.ServerError("DeleteEmailAddresses", err) + ctx.ServerErrorAuto(err) return } log.Trace("Email address deleted: %s %s", u.Name, email.Email) diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index eaf54484801..faa5aec65fe 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -40,7 +40,7 @@ func DefaultOrSystemWebhooks(ctx *context.Context) { sys["BaseLink"] = setting.AppSubURL + "/-/admin/hooks" sys["BaseLinkNew"] = setting.AppSubURL + "/-/admin/system-hooks" if err != nil { - ctx.ServerError("GetWebhooksAdmin", err) + ctx.ServerErrorAuto(err) return } @@ -50,7 +50,7 @@ func DefaultOrSystemWebhooks(ctx *context.Context) { def["BaseLink"] = setting.AppSubURL + "/-/admin/hooks" def["BaseLinkNew"] = setting.AppSubURL + "/-/admin/default-hooks" if err != nil { - ctx.ServerError("GetWebhooksAdmin", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/notice.go b/routers/web/admin/notice.go index de2311af3f6..4a97b061bef 100644 --- a/routers/web/admin/notice.go +++ b/routers/web/admin/notice.go @@ -30,7 +30,7 @@ func Notices(ctx *context.Context) { notices, err := system_model.Notices(ctx, page, setting.UI.Admin.NoticePagingNum) if err != nil { - ctx.ServerError("Notices", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Notices"] = notices @@ -65,7 +65,7 @@ func DeleteNotices(ctx *context.Context) { // EmptyNotices delete all the notices func EmptyNotices(ctx *context.Context) { if err := system_model.DeleteNotices(ctx, 0, 0); err != nil { - ctx.ServerError("DeleteNotices", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 64322ac1823..ff263fa5d36 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -39,25 +39,25 @@ func Packages(ctx *context.Context) { }, }) if err != nil { - ctx.ServerError("SearchVersions", err) + ctx.ServerErrorAuto(err) return } pds, err := packages_model.GetPackageDescriptors(ctx, pvs) if err != nil { - ctx.ServerError("GetPackageDescriptors", err) + ctx.ServerErrorAuto(err) return } totalBlobSize, err := packages_model.GetTotalBlobSize(ctx) if err != nil { - ctx.ServerError("GetTotalBlobSize", err) + ctx.ServerErrorAuto(err) return } totalUnreferencedBlobSize, err := packages_model.GetTotalUnreferencedBlobSize(ctx) if err != nil { - ctx.ServerError("CalculateBlobSize", err) + ctx.ServerErrorAuto(err) return } @@ -82,12 +82,12 @@ func Packages(ctx *context.Context) { func DeletePackageVersion(ctx *context.Context) { pv, err := packages_model.GetVersionByID(ctx, ctx.FormInt64("id")) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } if err := packages_service.RemovePackageVersion(ctx, ctx.Doer, pv); err != nil { - ctx.ServerError("RemovePackageVersion", err) + ctx.ServerErrorAuto(err) return } @@ -97,7 +97,7 @@ func DeletePackageVersion(ctx *context.Context) { func CleanupExpiredData(ctx *context.Context) { if err := packages_cleanup_service.CleanupExpiredData(ctx, time.Duration(0)); err != nil { - ctx.ServerError("CleanupExpiredData", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/queue.go b/routers/web/admin/queue.go index e5ac55bdfcd..499f6e68ce0 100644 --- a/routers/web/admin/queue.go +++ b/routers/web/admin/queue.go @@ -80,7 +80,7 @@ func QueueRemoveAllItems(ctx *context.Context) { } if err := mq.RemoveAllItems(ctx); err != nil { - ctx.ServerError("RemoveAllItems", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index 766666d5da2..20c56709cfa 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -34,12 +34,12 @@ func Repos(ctx *context.Context) { func DeleteRepo(ctx *context.Context) { repo, err := repo_model.GetRepositoryByID(ctx, ctx.FormInt64("id")) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } if err := repo_service.DeleteRepository(ctx, ctx.Doer, repo, true); err != nil { - ctx.ServerError("DeleteRepository", err) + ctx.ServerErrorAuto(err) return } log.Trace("Repository deleted: %s", repo.FullName()) diff --git a/routers/web/admin/stacktrace.go b/routers/web/admin/stacktrace.go index 79eaa64137b..4803b508e91 100644 --- a/routers/web/admin/stacktrace.go +++ b/routers/web/admin/stacktrace.go @@ -34,7 +34,7 @@ func Stacktrace(ctx *context.Context) { showNoSystem := show == "process" processStacks, processCount, _, err := process.GetManager().ProcessStacktraces(false, showNoSystem) if err != nil { - ctx.ServerError("GoroutineStacktrace", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 70ae4af1ebd..de29e958686 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -85,7 +85,7 @@ func Users(ctx *context.Context) { // inactive sources are listed too, users stay attached to a source after it is deactivated sources, err := db.Find[auth.Source](ctx, auth.FindSourcesOptions{}) if err != nil { - ctx.ServerError("auth.Sources", err) + ctx.ServerErrorAuto(err) return } sourceIDFilter := ctx.FormOptionalInt64("source_id") @@ -137,7 +137,7 @@ func NewUser(ctx *context.Context) { IsActive: optional.Some(true), }) if err != nil { - ctx.ServerError("auth.Sources", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Sources"] = sources @@ -158,7 +158,7 @@ func NewUserPost(ctx *context.Context) { IsActive: optional.Some(true), }) if err != nil { - ctx.ServerError("auth.Sources", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Sources"] = sources @@ -243,7 +243,7 @@ func NewUserPost(ctx *context.Context) { ctx.Data["Err_UserName"] = true ctx.RenderWithErrDeprecated(ctx.Tr("user.form.name_chars_not_allowed", errNameCharsNotAllowed.Name), tplUserNew, &form) default: - ctx.ServerError("CreateUser", err) + ctx.ServerErrorAuto(err) } return } @@ -271,7 +271,7 @@ func prepareUserInfo(ctx *context.Context) *user_model.User { if user_model.IsErrUserNotExist(err) { ctx.Redirect(setting.AppSubURL + "/-/admin/users") } else { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) } return nil } @@ -280,7 +280,7 @@ func prepareUserInfo(ctx *context.Context) *user_model.User { if u.LoginSource > 0 { ctx.Data["LoginSource"], err = auth.GetSourceByID(ctx, u.LoginSource) if err != nil { - ctx.ServerError("auth.GetSourceByID", err) + ctx.ServerErrorAuto(err) return nil } } else { @@ -289,19 +289,19 @@ func prepareUserInfo(ctx *context.Context) *user_model.User { sources, err := db.Find[auth.Source](ctx, auth.FindSourcesOptions{}) if err != nil { - ctx.ServerError("auth.Sources", err) + ctx.ServerErrorAuto(err) return nil } ctx.Data["Sources"] = sources hasTOTP, err := auth.HasTwoFactorByUID(ctx, u.ID) if err != nil { - ctx.ServerError("auth.HasTwoFactorByUID", err) + ctx.ServerErrorAuto(err) return nil } hasWebAuthn, err := auth.HasWebAuthnRegistrationsByUID(ctx, u.ID) if err != nil { - ctx.ServerError("auth.HasWebAuthnRegistrationsByUID", err) + ctx.ServerErrorAuto(err) return nil } ctx.Data["TwoFactorEnabled"] = hasTOTP || hasWebAuthn @@ -330,7 +330,7 @@ func ViewUser(ctx *context.Context) { Collaborate: optional.Some(false), }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } @@ -339,7 +339,7 @@ func ViewUser(ctx *context.Context) { emails, err := user_model.GetEmailAddresses(ctx, u.ID) if err != nil { - ctx.ServerError("GetEmailAddresses", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Emails"] = emails @@ -347,7 +347,7 @@ func ViewUser(ctx *context.Context) { ctx.Data["UserOrgs"], err = org_model.GetUserOrganizations(ctx, u.ID) if err != nil { - ctx.ServerError("FindOrgs", err) + ctx.ServerErrorAuto(err) return } @@ -365,7 +365,7 @@ func ViewUser(ctx *context.Context) { func getTargetBot(ctx *context.Context) *user_model.User { u, err := user_model.GetUserByID(ctx, ctx.PathParamInt64("userid")) if err != nil { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return nil } if !u.IsTypeBot() { @@ -450,7 +450,7 @@ func EditUserPost(ctx *context.Context) { ctx.Data["Err_UserName"] = true ctx.RenderWithErrDeprecated(ctx.Tr("user.form.name_chars_not_allowed", form.UserName), tplUserEdit, &form) default: - ctx.ServerError("RenameUser", err) + ctx.ServerErrorAuto(err) } return } @@ -496,7 +496,7 @@ func EditUserPost(ctx *context.Context) { ctx.Flash.Error(err.Error()) ctx.Redirect(userLink) default: - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) } return } @@ -511,7 +511,7 @@ func EditUserPost(ctx *context.Context) { ctx.Data["Err_Email"] = true ctx.RenderWithErrDeprecated(ctx.Tr("form.email_invalid"), tplUserEdit, &form) default: - ctx.ServerError("AddOrSetPrimaryEmailAddress", err) + ctx.ServerErrorAuto(err) } return } @@ -547,7 +547,7 @@ func EditUserPost(ctx *context.Context) { ctx.Flash.Error(err.Error()) ctx.Redirect(userLink) default: - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) } return } @@ -556,7 +556,7 @@ func EditUserPost(ctx *context.Context) { if form.Reset2FA { if _, _, err := auth.DisableTwoFactor(ctx, u.ID); err != nil { - ctx.ServerError("auth.DisableTwoFactor", err) + ctx.ServerErrorAuto(err) return } } @@ -579,7 +579,7 @@ func ImpersonateUser(ctx *context.Context) { err = auth_service.ImpersonateUser(ctx.Session, u) if err != nil { - ctx.ServerError("unable to impersonate user", err) + ctx.ServerErrorAuto(err) return } audit.Record(ctx, audit_model.UserImpersonation, u) @@ -590,7 +590,7 @@ func ImpersonateUser(ctx *context.Context) { func DeleteUser(ctx *context.Context) { u, err := user_model.GetUserByID(ctx, ctx.PathParamInt64("userid")) if err != nil { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } @@ -616,7 +616,7 @@ func DeleteUser(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("auth.last_admin")) ctx.Redirect(setting.AppSubURL + "/-/admin/users/" + url.PathEscape(ctx.PathParam("userid"))) default: - ctx.ServerError("DeleteUser", err) + ctx.ServerErrorAuto(err) } return } @@ -635,7 +635,7 @@ func RemoveUserFromOrg(ctx *context.Context) { orgID := ctx.PathParamInt64("org_id") org, err := org_model.GetOrgByID(ctx, orgID) if err != nil { - ctx.ServerError("GetOrgByID", err) + ctx.ServerErrorAuto(err) return } @@ -645,7 +645,7 @@ func RemoveUserFromOrg(ctx *context.Context) { ctx.JSONRedirect("") return } else if err != nil { - ctx.ServerError("RemoveOrgUser", err) + ctx.ServerErrorAuto(err) return } @@ -661,7 +661,7 @@ func RemoveUserFromAllOrgs(ctx *context.Context) { orgs, err := org_model.GetUserOrganizations(ctx, u.ID) if err != nil { - ctx.ServerError("GetUserOrganizations", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/auth/2fa.go b/routers/web/auth/2fa.go index d2884af4b8b..d990200a9e0 100644 --- a/routers/web/auth/2fa.go +++ b/routers/web/auth/2fa.go @@ -36,7 +36,7 @@ func TwoFactor(ctx *context.Context) { // Ensure user is in a 2FA session. if ctx.Session.Get("twofaUid") == nil { - ctx.ServerError("UserSignIn", errors.New("not in 2FA session")) + ctx.ServerErrorAuto(errors.New("not in 2FA session")) return } @@ -51,20 +51,20 @@ func TwoFactorPost(ctx *context.Context) { // Ensure user is in a 2FA session. id, hasSession := ctx.Session.Get("twofaUid").(int64) if !hasSession { - ctx.ServerError("UserSignIn", errors.New("not in 2FA session")) + ctx.ServerErrorAuto(errors.New("not in 2FA session")) return } twofa, err := auth.GetTwoFactorByUID(ctx, id) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } // Validate the passcode and atomically consume it to prevent reuse/replay. tfaResult, err := twofa.ValidateAndConsumeTOTP(ctx, form.Passcode) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } @@ -72,12 +72,12 @@ func TwoFactorPost(ctx *context.Context) { remember := ctx.Session.Get("twofaRemember").(bool) //nolint:forcetypeassert // must exist u, err := user_model.GetUserByID(ctx, id) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if err = completePendingLinks(ctx, u); err != nil { - ctx.ServerError("completePendingLinks", err) + ctx.ServerErrorAuto(err) return } @@ -104,7 +104,7 @@ func TwoFactorScratch(ctx *context.Context) { // Ensure user is in a 2FA session. if ctx.Session.Get("twofaUid") == nil { - ctx.ServerError("UserSignIn", errors.New("not in 2FA session")) + ctx.ServerErrorAuto(errors.New("not in 2FA session")) return } @@ -119,13 +119,13 @@ func TwoFactorScratchPost(ctx *context.Context) { // Ensure user is in a 2FA session. id, hasSession := ctx.Session.Get("twofaUid").(int64) if !hasSession { - ctx.ServerError("UserSignIn", errors.New("not in 2FA session")) + ctx.ServerErrorAuto(errors.New("not in 2FA session")) return } twofa, err := auth.GetTwoFactorByUID(ctx, id) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } @@ -134,23 +134,23 @@ func TwoFactorScratchPost(ctx *context.Context) { // Invalidate the scratch token. _, err = twofa.GenerateScratchToken() if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if err = auth.UpdateTwoFactor(ctx, twofa); err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } remember := ctx.Session.Get("twofaRemember").(bool) //nolint:forcetypeassert // must exist u, err := user_model.GetUserByID(ctx, id) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if err = completePendingLinks(ctx, u); err != nil { - ctx.ServerError("completePendingLinks", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 288a2c5b77d..4446f17746f 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -211,7 +211,7 @@ func performAutoLogin(ctx *context.Context) bool { ctx.Flash.Error(ctx.Tr("auth.remember_me.compromised"), true) return false } - ctx.ServerError("autoSignIn", err) + ctx.ServerErrorAuto(err) return true } @@ -318,7 +318,7 @@ func SignInPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("auth.prohibit_login") ctx.HTML(http.StatusOK, "user/auth/prohibit_login") } else { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) } return } @@ -334,7 +334,7 @@ func SignInPost(ctx *context.Context) { // Instead, redirect them to the 2FA authentication page. hasTwoFactor, err := auth.HasTwoFactorOrWebAuthn(ctx, u.ID) if err != nil { - ctx.ServerError("HasTwoFactorOrWebAuthn", err) + ctx.ServerErrorAuto(err) return } if !hasTwoFactor { @@ -349,12 +349,12 @@ func handleTwoFactorRequired(ctx *context.Context, u *user_model.User, remember updates := map[string]any{"twofaUid": u.ID, "twofaRemember": remember} maps.Copy(updates, extra) if err := regenerateSession(ctx, updates); err != nil { - ctx.ServerError("RegenerateSession", err) + ctx.ServerErrorAuto(err) return } hasWebAuthn, err := auth.HasWebAuthnRegistrationsByUID(ctx, u.ID) if err != nil { - ctx.ServerError("HasWebAuthnRegistrationsByUID", err) + ctx.ServerErrorAuto(err) return } if hasWebAuthn { @@ -380,7 +380,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember bool) { } nt, token, err := auth_service.CreateAuthTokenForUserID(ctx, u.ID) if err != nil { - ctx.ServerError("CreateAuthTokenForUserID", err) + ctx.ServerErrorAuto(err) return } @@ -389,7 +389,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember bool) { userHasTwoFactorAuth, err := auth.HasTwoFactorOrWebAuthn(ctx, u.ID) if err != nil { - ctx.ServerError("HasTwoFactorOrWebAuthn", err) + ctx.ServerErrorAuto(err) return } @@ -398,7 +398,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember bool) { session.KeyUID: u.ID, session.KeyUserHasTwoFactorAuth: userHasTwoFactorAuth, }); err != nil { - ctx.ServerError("RegenerateSession", err) + ctx.ServerErrorAuto(err) return } @@ -409,7 +409,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember bool) { Language: optional.Some(ctx.Locale.Language()), } if err := user_service.UpdateUser(ctx, u, opts); err != nil { - ctx.ServerError("UpdateUser Language", fmt.Errorf("Error updating user language [user: %d, locale: %s]", u.ID, ctx.Locale.Language())) + ctx.ServerErrorAuto(fmt.Errorf("Error updating user language [user: %d, locale: %s]", u.ID, ctx.Locale.Language())) return } } @@ -422,7 +422,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember bool) { // Register last login if err := user_service.UpdateUser(ctx, u, &user_service.UpdateOptions{SetLastLogin: true}); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } } @@ -473,7 +473,7 @@ func SignOut(ctx *context.Context) { exitedImpersonated, err := auth_service.ExitImpersonatedUser(ctx.Session) if err != nil { - ctx.ServerError("ExitImpersonatedUser", err) + ctx.ServerErrorAuto(err) return } if exitedImpersonated { @@ -517,14 +517,14 @@ func prepareSignUpPageData(ctx *context.Context) bool { hasUsers, err := user_model.HasUsers(ctx) if err != nil { - ctx.ServerError("HasUsers", err) + ctx.ServerErrorAuto(err) return false } ctx.Data["IsFirstTimeRegistration"] = !hasUsers.HasAnyUser oauth2Providers, err := oauth2.GetOAuth2Providers(ctx, optional.Some(true)) if err != nil { - ctx.ServerError("GetOAuth2Providers", err) + ctx.ServerErrorAuto(err) return false } ctx.Data["OAuth2Providers"] = oauth2Providers @@ -640,16 +640,12 @@ func createUserInContext(ctx *context.Context, tpl templates.TplName, form any, user, err := user_model.GetIndividualUserByName(ctx, u.Name) if err != nil { if !user_model.IsErrUserNotExist(err) { - ctx.ServerError("GetIndividualUserByName", err) + ctx.ServerErrorAuto(err) return false } user, err = user_model.GetIndividualUserByPrimaryEmail(ctx, u.Email) if err != nil { - if !user_model.IsErrUserNotExist(err) { - ctx.ServerError("GetIndividualUserByPrimaryEmail", err) - } else { - ctx.NotFound(err) - } + ctx.ServerErrorAuto(err) return false } } @@ -667,7 +663,7 @@ func createUserInContext(ctx *context.Context, tpl templates.TplName, form any, // handle error without a template if len(tpl) == 0 { - ctx.ServerError("CreateUser", err) + ctx.ServerErrorAuto(err) return false } @@ -696,7 +692,7 @@ func createUserInContext(ctx *context.Context, tpl templates.TplName, form any, ctx.Data["Err_UserName"] = true ctx.RenderWithErrDeprecated(ctx.Tr("user.form.name_chars_not_allowed", errNameCharsNotAllowed.Name), tpl, form) default: - ctx.ServerError("CreateUser", err) + ctx.ServerErrorAuto(err) } return false } @@ -711,7 +707,7 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, possibleLinkAcc // Auto-set admin for the only user. hasUsers, err := user_model.HasUsers(ctx) if err != nil { - ctx.ServerError("HasUsers", err) + ctx.ServerErrorAuto(err) return false } if hasUsers.HasOnlyOneUser { @@ -722,7 +718,7 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, possibleLinkAcc SetLastLogin: true, } if err := user_service.UpdateUser(ctx, u, opts); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return false } } @@ -878,21 +874,17 @@ func handleAccountActivation(ctx *context.Context, user *user_model.User) { user.IsActive = true var err error if user.Rands, err = user_model.GetUserSalt(); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } if err := user_model.UpdateUserCols(ctx, user, "is_active", "rands"); err != nil { - if user_model.IsErrUserNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("UpdateUser", err) - } + ctx.ServerErrorAuto(err) return } if err := user_model.ActivateUserEmail(ctx, user.ID, user.Email, true); err != nil { log.Error("Unable to activate email for user: %-v with email: %s: %v", user, user.Email, err) - ctx.ServerError("ActivateUserEmail", err) + ctx.ServerErrorAuto(err) return } @@ -900,17 +892,17 @@ func handleAccountActivation(ctx *context.Context, user *user_model.User) { if err := regenerateSession(ctx, map[string]any{session.KeyUID: user.ID}); err != nil { log.Error("Unable to regenerate session for user: %-v with email: %s: %v", user, user.Email, err) - ctx.ServerError("ActivateUserEmail", err) + ctx.ServerErrorAuto(err) return } if err := resetLocale(ctx, user); err != nil { - ctx.ServerError("resetLocale", err) + ctx.ServerErrorAuto(err) return } if err := user_service.UpdateUser(ctx, user, &user_service.UpdateOptions{SetLastLogin: true}); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } @@ -926,7 +918,7 @@ func ActivateEmail(ctx *context.Context) { // Verify code. if email := user_model.VerifyActiveEmailCode(ctx, code, emailStr); email != nil { if err := user_model.ActivateEmail(ctx, email); err != nil { - ctx.ServerError("ActivateEmail", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/auth/linkaccount.go b/routers/web/auth/linkaccount.go index cc8e44a081e..13de7e88418 100644 --- a/routers/web/auth/linkaccount.go +++ b/routers/web/auth/linkaccount.go @@ -66,7 +66,7 @@ func LinkAccount(ctx *context.Context) { uname, err := extractUserNameFromOAuth2(&linkAccountData.GothUser) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } email := linkAccountData.GothUser.Email @@ -76,7 +76,7 @@ func LinkAccount(ctx *context.Context) { if email != "" { u, err := user_model.GetUserByEmail(ctx, email) if err != nil && !user_model.IsErrUserNotExist(err) { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if u != nil { @@ -85,7 +85,7 @@ func LinkAccount(ctx *context.Context) { } else if uname != "" { u, err := user_model.GetUserByName(ctx, uname) if err != nil && !user_model.IsErrUserNotExist(err) { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if u != nil { @@ -96,7 +96,7 @@ func LinkAccount(ctx *context.Context) { ctx.HTML(http.StatusOK, tplLinkAccount) } -func handleSignInError(ctx *context.Context, userName string, ptrForm any, tmpl templates.TplName, invoker string, err error) { +func handleSignInError(ctx *context.Context, userName string, ptrForm any, tmpl templates.TplName, err error) { if errors.Is(err, util.ErrNotExist) { ctx.RenderWithErrDeprecated(ctx.Tr("form.username_password_incorrect"), tmpl, ptrForm) } else if errors.Is(err, util.ErrInvalidArgument) { @@ -108,7 +108,7 @@ func handleSignInError(ctx *context.Context, userName string, ptrForm any, tmpl ctx.Data["Title"] = ctx.Tr("auth.prohibit_login") ctx.HTML(http.StatusOK, "user/auth/prohibit_login") } else { - ctx.ServerError(invoker, err) + ctx.ServerErrorAuto(err) } } @@ -122,7 +122,7 @@ func LinkAccountPostSignIn(ctx *context.Context) { linkAccountData := oauth2GetLinkAccountData(ctx) if linkAccountData == nil { - ctx.ServerError("UserSignIn", errors.New("not in LinkAccount session")) + ctx.ServerErrorAuto(errors.New("not in LinkAccount session")) return } @@ -133,7 +133,7 @@ func LinkAccountPostSignIn(ctx *context.Context) { u, _, err := auth_service.UserSignIn(ctx, signInForm.UserName, signInForm.Password) if err != nil { - handleSignInError(ctx, signInForm.UserName, &signInForm, tplLinkAccount, "UserLinkAccount", err) + handleSignInError(ctx, signInForm.UserName, &signInForm, tplLinkAccount, err) return } @@ -151,12 +151,12 @@ func oauth2LinkAccount(ctx *context.Context, u *user_model.User, linkAccountData // We deliberately ignore the skip local 2fa setting here because we are linking to a previous user here hasTwoFactor, err := auth.HasTwoFactorOrWebAuthn(ctx, u.ID) if err != nil { - ctx.ServerError("UserLinkAccount", err) + ctx.ServerErrorAuto(err) return } if !hasTwoFactor { if err := externalaccount.LinkAccountToUser(ctx, linkAccountData.AuthSourceID, u, linkAccountData.GothUser); err != nil { - ctx.ServerError("UserLinkAccount", err) + ctx.ServerErrorAuto(err) return } @@ -165,7 +165,7 @@ func oauth2LinkAccount(ctx *context.Context, u *user_model.User, linkAccountData } if err := Oauth2SetLinkAccountData(ctx, *linkAccountData); err != nil { - ctx.ServerError("Oauth2SetLinkAccountData", err) + ctx.ServerErrorAuto(err) return } @@ -185,7 +185,7 @@ func LinkAccountPostRegister(ctx *context.Context) { linkAccountData := oauth2GetLinkAccountData(ctx) if linkAccountData == nil { - ctx.ServerError("UserSignUp", errors.New("not in LinkAccount session")) + ctx.ServerErrorAuto(errors.New("not in LinkAccount session")) return } if ctx.HasError() { @@ -250,12 +250,12 @@ func LinkAccountPostRegister(ctx *context.Context) { authSource, err := auth.GetSourceByID(ctx, linkAccountData.AuthSourceID) if err != nil { - ctx.ServerError("GetSourceByID", err) + ctx.ServerErrorAuto(err) return } source := auth.MustSourceCfg[*oauth2.Source](authSource) if err := syncGroupsToTeams(ctx, source, &linkAccountData.GothUser, u); err != nil { - ctx.ServerError("SyncGroupsToTeams", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index 89f6f7903a9..dd4154b0180 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -42,7 +42,7 @@ func SignInOAuth(ctx *context.Context) { authName := ctx.PathParam("provider") authSource, err := auth.GetActiveOAuth2SourceByAuthName(ctx, authName) if err != nil { - ctx.ServerError("SignIn", err) + ctx.ServerErrorAuto(err) return } @@ -61,15 +61,15 @@ func SignInOAuth(ctx *context.Context) { if err = oauth2Source.Callout(ctx.Req, ctx.Resp); err != nil { if strings.Contains(err.Error(), "no provider for ") { if err = oauth2.ResetOAuth2(ctx); err != nil { - ctx.ServerError("SignIn", err) + ctx.ServerErrorAuto(err) return } if err = oauth2Source.Callout(ctx.Req, ctx.Resp); err != nil { - ctx.ServerError("SignIn", err) + ctx.ServerErrorAuto(err) } return } - ctx.ServerError("SignIn", err) + ctx.ServerErrorAuto(err) } // redirect is done in oauth2.Auth } @@ -91,12 +91,12 @@ func SignInOAuthCallback(ctx *context.Context) { authName := ctx.PathParam("provider") authSource, err := auth.GetActiveOAuth2SourceByAuthName(ctx, authName) if err != nil { - ctx.ServerError("SignIn", err) + ctx.ServerErrorAuto(err) return } if authSource == nil { - ctx.ServerError("SignIn", errors.New("no valid provider found, check configured callback url in provider")) + ctx.ServerErrorAuto(errors.New("no valid provider found, check configured callback url in provider")) return } @@ -126,7 +126,7 @@ func SignInOAuthCallback(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/login") return } - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } @@ -135,7 +135,7 @@ func SignInOAuthCallback(ctx *context.Context) { // attach user to the current signed-in user err = externalaccount.LinkAccountToUser(ctx, authSource.ID, ctx.Doer, gothUser) if err != nil { - ctx.ServerError("UserLinkAccount", err) + ctx.ServerErrorAuto(err) return } @@ -152,7 +152,7 @@ func SignInOAuthCallback(ctx *context.Context) { } uname, err := extractUserNameFromOAuth2(&gothUser) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if uname == "" { @@ -201,7 +201,7 @@ func SignInOAuthCallback(ctx *context.Context) { } if err := syncGroupsToTeams(ctx, source, &gothUser, u); err != nil { - ctx.ServerError("SyncGroupsToTeams", err) + ctx.ServerErrorAuto(err) return } } else { @@ -293,7 +293,7 @@ func Oauth2SetLinkAccountData(ctx *context.Context, linkAccountData LinkAccountD func showLinkingLogin(ctx *context.Context, authSourceID int64, gothUser goth.User) { if err := Oauth2SetLinkAccountData(ctx, LinkAccountData{authSourceID, gothUser}); err != nil { - ctx.ServerError("Oauth2SetLinkAccountData", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(setting.AppSubURL + "/user/link_account") @@ -353,7 +353,7 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m if !authSource.TwoFactorShouldSkip() { var err error if needs2FA, err = auth.HasTwoFactorOrWebAuthn(ctx, u.ID); err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } } @@ -362,7 +362,7 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m groupTeamMapping, err := auth_module.UnmarshalGroupTeamMapping(oauth2Source.GroupTeamMap) if err != nil { - ctx.ServerError("UnmarshalGroupTeamMapping", err) + ctx.ServerErrorAuto(err) return } @@ -378,7 +378,7 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m if !u.IsActive { extLogin, hasExt, err := user_model.GetExternalLogin(ctx, authSource.ID, gothUser.UserID) if err != nil { - ctx.ServerError("GetExternalLogin", err) + ctx.ServerErrorAuto(err) return } // the cron clears all three token fields when it disables a user, so require the @@ -392,13 +392,13 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m if oauth2Source.GroupTeamMap != "" || oauth2Source.GroupTeamMapRemoval { if err := source_service.SyncGroupsToTeams(ctx, u, groups, groupTeamMapping, oauth2Source.GroupTeamMapRemoval); err != nil { - ctx.ServerError("SyncGroupsToTeams", err) + ctx.ServerErrorAuto(err) return } } if err := externalaccount.EnsureLinkExternalToUser(ctx, authSource.ID, u, gothUser); err != nil { - ctx.ServerError("EnsureLinkExternalToUser", err) + ctx.ServerErrorAuto(err) return } @@ -409,12 +409,12 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m opts.SetLastLogin = true if err := user_service.UpdateUser(audit.WithDoer(ctx, user_model.NewAuthSourceUser()), u, opts); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } userHasTwoFactorAuth, err := auth.HasTwoFactorOrWebAuthn(ctx, u.ID) if err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } @@ -423,12 +423,12 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m session.KeyUserHasTwoFactorAuth: userHasTwoFactorAuth, session.KeySignInMethod: session.SignInMethodOAuth2, }); err != nil { - ctx.ServerError("updateSession", err) + ctx.ServerErrorAuto(err) return } if err := resetLocale(ctx, u); err != nil { - ctx.ServerError("resetLocale", err) + ctx.ServerErrorAuto(err) return } @@ -438,7 +438,7 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m if opts.IsActive.Has() || opts.IsAdmin.Has() || opts.IsRestricted.Has() { if err := user_service.UpdateUser(audit.WithDoer(ctx, user_model.NewAuthSourceUser()), u, opts); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/auth/oauth2_provider.go b/routers/web/auth/oauth2_provider.go index ed73e24944e..034b40d5063 100644 --- a/routers/web/auth/oauth2_provider.go +++ b/routers/web/auth/oauth2_provider.go @@ -105,7 +105,7 @@ func InfoOAuth(ctx *context.Context) { // are unaffected and only explicitly-restricted tokens are rejected tokenScope, _ := user_model.GetDoerTokenScope(ctx.Doer) if allowed, err := tokenScope.HasScope(auth.AccessTokenScopeReadUser); err != nil { - ctx.ServerError("HasScope", err) + ctx.ServerErrorAuto(err) return } else if !allowed { ctx.Resp.Header().Set("WWW-Authenticate", `Bearer realm="Gitea OAuth2"`) @@ -123,7 +123,7 @@ func InfoOAuth(ctx *context.Context) { groups, err := oauth2_provider.GetOAuthGroupsForUser(ctx, ctx.Doer, user_model.IsPublicOnlyDoer(ctx.Doer)) if err != nil { - ctx.ServerError("Oauth groups for user", err) + ctx.ServerErrorAuto(err) return } response.Groups = groups @@ -185,7 +185,7 @@ func IntrospectOAuth(ctx *context.Context) { grant, err := auth.GetOAuth2GrantByID(ctx, token.GrantID) if err != nil { - ctx.ServerError("GetOAuth2GrantByID", err) + ctx.ServerErrorAuto(err) return } if grant == nil || grant.ApplicationID != introspectingApp.ID || (token.Kind == oauth2_provider.KindRefreshToken && isRefreshTokenUsed(grant, token)) { @@ -201,7 +201,7 @@ func IntrospectOAuth(ctx *context.Context) { response.RegisteredClaims = oauth2_provider.NewJwtRegisteredClaimsFromUser(introspectingApp.ClientID, grant.UserID, nil /*exp*/) response.Username = user.Name } else if !errors.Is(err, util.ErrNotExist) && !errors.Is(err, util.ErrPermissionDenied) { - ctx.ServerError("GetValidDoerUserByID", err) + ctx.ServerErrorAuto(err) return } @@ -237,7 +237,7 @@ func AuthorizeOAuth(ctx *context.Context) { }, "") return } - ctx.ServerError("GetOAuth2ApplicationByClientID", err) + ctx.ServerErrorAuto(err) return } @@ -245,7 +245,7 @@ func AuthorizeOAuth(ctx *context.Context) { if app.UID != 0 { user, err = user_model.GetUserByID(ctx, app.UID) if err != nil { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } } @@ -425,7 +425,7 @@ func GrantApplicationOAuth(ctx *context.Context) { app, err := auth.GetOAuth2ApplicationByClientID(ctx, form.ClientID) if err != nil { - ctx.ServerError("GetOAuth2ApplicationByClientID", err) + ctx.ServerErrorAuto(err) return } grant, err := app.GetGrantByUserID(ctx, ctx.Doer.ID) @@ -744,7 +744,7 @@ func handleAuthorizeError(ctx *context.Context, authErr AuthorizeError, redirect } redirect, err := url.Parse(redirectURI) if err != nil { - ctx.ServerError("url.Parse", err) + ctx.ServerErrorAuto(err) return } q := redirect.Query() diff --git a/routers/web/auth/oauth_signin_sync.go b/routers/web/auth/oauth_signin_sync.go index 0642b939005..22b9ecd9411 100644 --- a/routers/web/auth/oauth_signin_sync.go +++ b/routers/web/auth/oauth_signin_sync.go @@ -25,12 +25,12 @@ func oauth2SignInSync(ctx *context.Context, authSourceID int64, u *user_model.Us authSource, err := auth.GetSourceByID(ctx, authSourceID) if err != nil { - ctx.ServerError("GetSourceByID", err) + ctx.ServerErrorAuto(err) return } oauth2Source, _ := authSource.Cfg.(*oauth2.Source) if !authSource.IsOAuth2() || oauth2Source == nil { - ctx.ServerError("oauth2SignInSync", fmt.Errorf("source %s is not an OAuth2 source", gothUser.Provider)) + ctx.ServerErrorAuto(fmt.Errorf("source %s is not an OAuth2 source", gothUser.Provider)) return } diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index 3f47cae146e..d79b1490296 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -55,7 +55,7 @@ func ForgotPasswdPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("auth.forgot_password_title") if setting.MailService == nil { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["IsResetRequest"] = true @@ -75,7 +75,7 @@ func ForgotPasswdPost(ctx *context.Context) { return } - ctx.ServerError("user.ResetPasswd(check existence)", err) + ctx.ServerErrorAuto(err) return } @@ -221,7 +221,7 @@ func ResetPasswdPost(ctx *context.Context) { case password.IsErrIsPwnedRequest(err): ctx.RenderWithErrDeprecated(ctx.Tr("auth.password_pwned_err"), tplResetPassword, nil) default: - ctx.ServerError("UpdateAuth", err) + ctx.ServerErrorAuto(err) } return } @@ -234,11 +234,11 @@ func ResetPasswdPost(ctx *context.Context) { // Invalidate the scratch token. _, err := twofa.GenerateScratchToken() if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if err = auth.UpdateTwoFactor(ctx, twofa); err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } @@ -255,7 +255,7 @@ func ResetPasswdPost(ctx *context.Context) { if twofa == nil { hasWebAuthn, err := auth.HasWebAuthnRegistrationsByUID(ctx, u.ID) if err != nil { - ctx.ServerError("HasWebAuthnRegistrationsByUID", err) + ctx.ServerErrorAuto(err) return } if hasWebAuthn { @@ -288,7 +288,7 @@ func MustChangePasswordPost(ctx *context.Context) { if !common.CheckSignedInUser(ctx.Doer, ctx.Session).NeedChangePassword { log.Debug("User %s attempted to access the must change password page, but they are not required to change their password", ctx.Doer.Name) - ctx.NotFound(nil) + ctx.NotFound() return } @@ -317,7 +317,7 @@ func MustChangePasswordPost(ctx *context.Context) { ctx.Data["Err_Password"] = true ctx.RenderWithErrDeprecated(ctx.Tr("auth.password_pwned_err"), tplMustChangePassword, &form) default: - ctx.ServerError("UpdateAuth", err) + ctx.ServerErrorAuto(err) } return } diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go index 6f43d8a4e8f..8f1ddce4d8c 100644 --- a/routers/web/auth/webauthn.go +++ b/routers/web/auth/webauthn.go @@ -33,13 +33,13 @@ func WebAuthn(ctx *context.Context) { // Ensure user is in a 2FA session. idSess, ok := ctx.Session.Get("twofaUid").(int64) if !ok { - ctx.ServerError("UserSignIn", errors.New("not in WebAuthn session")) + ctx.ServerErrorAuto(errors.New("not in WebAuthn session")) return } hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, idSess) if err != nil { - ctx.ServerError("HasTwoFactorByUID", err) + ctx.ServerErrorAuto(err) return } @@ -58,12 +58,12 @@ func WebAuthnPasskeyAssertion(ctx *context.Context) { // a passkey is the only factor here assertion, sessionData, err := wa.WebAuthn.BeginDiscoverableLogin(webauthn.WithUserVerification(protocol.VerificationRequired)) if err != nil { - ctx.ServerError("webauthn.BeginDiscoverableLogin", err) + ctx.ServerErrorAuto(err) return } if err := ctx.Session.Set("webauthnPasskeyAssertion", sessionData); err != nil { - ctx.ServerError("Session.Set", err) + ctx.ServerErrorAuto(err) return } @@ -79,7 +79,7 @@ func WebAuthnPasskeyLogin(ctx *context.Context) { sessionData, okData := ctx.Session.Get("webauthnPasskeyAssertion").(*webauthn.SessionData) if !okData || sessionData == nil { - ctx.ServerError("ctx.Session.Get", errors.New("not in WebAuthn session")) + ctx.ServerErrorAuto(errors.New("not in WebAuthn session")) return } defer func() { @@ -139,18 +139,18 @@ func WebAuthnPasskeyLogin(ctx *context.Context) { // Success! Get the credential and update the sign count with the new value we received. dbCred, err := auth.GetWebAuthnCredentialByCredID(ctx, user.ID, cred.ID) if err != nil { - ctx.ServerError("GetWebAuthnCredentialByCredID", err) + ctx.ServerErrorAuto(err) return } dbCred.SignCount = cred.Authenticator.SignCount if err := dbCred.UpdateSignCount(ctx); err != nil { - ctx.ServerError("UpdateSignCount", err) + ctx.ServerErrorAuto(err) return } if err := completePendingLinks(ctx, user); err != nil { - ctx.ServerError("completePendingLinks", err) + ctx.ServerErrorAuto(err) return } @@ -164,23 +164,23 @@ func WebAuthnLoginAssertion(ctx *context.Context) { // Ensure user is in a WebAuthn session. idSess, ok := ctx.Session.Get("twofaUid").(int64) if !ok || idSess == 0 { - ctx.ServerError("UserSignIn", errors.New("not in WebAuthn session")) + ctx.ServerErrorAuto(errors.New("not in WebAuthn session")) return } user, err := user_model.GetUserByID(ctx, idSess) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } exists, err := auth.ExistsWebAuthnCredentialsForUID(ctx, user.ID) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } if !exists { - ctx.ServerError("UserSignIn", errors.New("no device registered")) + ctx.ServerErrorAuto(errors.New("no device registered")) return } @@ -188,12 +188,12 @@ func WebAuthnLoginAssertion(ctx *context.Context) { // "discouraged" would hide credProtect protected credentials assertion, sessionData, err := wa.WebAuthn.BeginLogin(webAuthnUser, webauthn.WithUserVerification(protocol.VerificationPreferred)) if err != nil { - ctx.ServerError("webauthn.BeginLogin", err) + ctx.ServerErrorAuto(err) return } if err := ctx.Session.Set("webauthnAssertion", sessionData); err != nil { - ctx.ServerError("Session.Set", err) + ctx.ServerErrorAuto(err) return } ctx.JSON(http.StatusOK, assertion) @@ -204,7 +204,7 @@ func WebAuthnLoginAssertionPost(ctx *context.Context) { idSess, ok := ctx.Session.Get("twofaUid").(int64) sessionData, okData := ctx.Session.Get("webauthnAssertion").(*webauthn.SessionData) if !ok || !okData || sessionData == nil || idSess == 0 { - ctx.ServerError("UserSignIn", errors.New("not in WebAuthn session")) + ctx.ServerErrorAuto(errors.New("not in WebAuthn session")) return } defer func() { @@ -214,7 +214,7 @@ func WebAuthnLoginAssertionPost(ctx *context.Context) { // Load the user from the db user, err := user_model.GetUserByID(ctx, idSess) if err != nil { - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) return } @@ -251,18 +251,18 @@ func WebAuthnLoginAssertionPost(ctx *context.Context) { // Success! Get the credential and update the sign count with the new value we received. dbCred, err := auth.GetWebAuthnCredentialByCredID(ctx, user.ID, cred.ID) if err != nil { - ctx.ServerError("GetWebAuthnCredentialByCredID", err) + ctx.ServerErrorAuto(err) return } dbCred.SignCount = cred.Authenticator.SignCount if err := dbCred.UpdateSignCount(ctx); err != nil { - ctx.ServerError("UpdateSignCount", err) + ctx.ServerErrorAuto(err) return } if err := completePendingLinks(ctx, user); err != nil { - ctx.ServerError("completePendingLinks", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index b0fdcbe641c..24c953d9203 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -32,7 +32,7 @@ import ( func List(ctx *context.Context) { templateNames, err := templates.AssetFS().ListFiles("devtest", true) if err != nil { - ctx.ServerError("AssetFS().ListFiles", err) + ctx.ServerErrorAuto(err) return } var subNames []string @@ -150,7 +150,7 @@ func prepareMockDataBadgeActionsSvg(ctx *context.Context) { err = fmt.Errorf("unknown badge style: %s", selectedStyle) } if err != nil { - ctx.ServerError("RenderToHTML", err) + ctx.ServerErrorAuto(err) return } badgeSVGs = append(badgeSVGs, h) @@ -218,13 +218,13 @@ func prepareMockDataAvatarStack(ctx *context.Context) { func prepareMockDataMarkdown(ctx *context.Context) { content, err := templates.AssetFS().ReadFile("devtest/markdown.md") if err != nil { - ctx.ServerError("ReadFile", err) + ctx.ServerErrorAuto(err) return } rctx := markup.NewRenderContext(ctx).WithMetas(markup.ComposeSimpleDocumentMetas()).WithEnableHeadingIDGeneration(true) ctx.Data["MarkdownHTML"], err = markdown.RenderString(rctx, string(content)) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) } } diff --git a/routers/web/devtest/mail_preview.go b/routers/web/devtest/mail_preview.go index de602941ccb..abfa45dc22a 100644 --- a/routers/web/devtest/mail_preview.go +++ b/routers/web/devtest/mail_preview.go @@ -65,7 +65,7 @@ func MailPreviewRender(ctx *context.Context) { func MailPreviewEmbed(ctx *context.Context) { content, err := mailer.LoadMailIcon(ctx.PathParam("*")) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } ctx.Resp.Header().Set("Content-Type", "image/png") diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 91839c71c7c..b47211c6519 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -60,7 +60,7 @@ func Code(ctx *context.Context) { if ctx.Doer == nil || !isAdmin { repoIDs, err = repo_model.FindUserCodeAccessibleRepoIDs(ctx, ctx.Doer) if err != nil { - ctx.ServerError("FindUserCodeAccessibleRepoIDs", err) + ctx.ServerErrorAuto(err) return } } @@ -84,7 +84,7 @@ func Code(ctx *context.Context) { }) if err != nil { if code_indexer.IsAvailable(ctx) { - ctx.ServerError("SearchResults", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CodeIndexerUnavailable"] = true @@ -101,7 +101,7 @@ func Code(ctx *context.Context) { repoMaps, err := repo_model.GetRepositoriesMapByIDs(ctx, loadRepoIDs) if err != nil { - ctx.ServerError("GetRepositoriesMapByIDs", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 9490f7343c0..a8325aab071 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -117,7 +117,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { IsPrivate: private, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } if isSitemap { diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index a0e5a377e02..07bd8b915d9 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -83,7 +83,7 @@ func RenderUserSearch(ctx *context.Context, opts user_model.SearchUserOptions, t } if opts.SupportedSortOrders != nil && !opts.SupportedSortOrders.Contains(sortOrder) { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -92,7 +92,7 @@ func RenderUserSearch(ctx *context.Context, opts user_model.SearchUserOptions, t if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) { users, count, err = user_model.SearchUsers(ctx, opts) if err != nil { - ctx.ServerError("SearchUsers", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/feed/branch.go b/routers/web/feed/branch.go index 6793bb6a695..bf9b2955e7d 100644 --- a/routers/web/feed/branch.go +++ b/routers/web/feed/branch.go @@ -22,7 +22,7 @@ func showBranchFeed(ctx *context.Context, repo *repo.Repository, formatType stri if ctx.Repo.Commit != nil { commits, err = ctx.Repo.Commit.CommitsByRange(ctx, ctx.Repo.GitRepo, 0, 10, "", "", "") if err != nil { - ctx.ServerError("ShowBranchFeed", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/feed/file.go b/routers/web/feed/file.go index 9ea35a796cc..402ad61ce3d 100644 --- a/routers/web/feed/file.go +++ b/routers/web/feed/file.go @@ -29,7 +29,7 @@ func showFileFeed(ctx *context.Context, repo *repo.Repository, formatType string Page: 1, }) if err != nil { - ctx.ServerError("ShowBranchFeed", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index af0987dad70..286d5a47b71 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -32,7 +32,7 @@ func ShowUserFeedAtom(ctx *context.Context) { // showUserFeed show user activity as RSS / Atom feed func showUserFeed(ctx *context.Context, formatType string) { if !setting.Other.EnableFeed { - ctx.NotFound(nil) + ctx.NotFound() return } context.CheckTokenScopes(ctx, util.Iif(ctx.ContextUser.IsOrganization(), auth_model.AccessTokenScopeReadOrganization, auth_model.AccessTokenScopeReadUser)) @@ -46,7 +46,7 @@ func showUserFeed(ctx *context.Context, formatType string) { // include the private repo's the member has access to. isOrgMember, err := organization.IsOrganizationMember(ctx, ctx.ContextUser.ID, ctx.Doer.ID) if err != nil { - ctx.ServerError("IsOrganizationMember", err) + ctx.ServerErrorAuto(err) return } includePrivate = isOrgMember @@ -61,7 +61,7 @@ func showUserFeed(ctx *context.Context, formatType string) { Date: ctx.FormString("date"), }) if err != nil { - ctx.ServerError("GetFeeds", err) + ctx.ServerErrorAuto(err) return } @@ -69,7 +69,7 @@ func showUserFeed(ctx *context.Context, formatType string) { ctxUserDescription, err := markdown.RenderString(rctx, ctx.ContextUser.Description) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } @@ -82,7 +82,7 @@ func showUserFeed(ctx *context.Context, formatType string) { feed.Items, err = feedActionsToFeedItems(ctx, actions) if err != nil { - ctx.ServerError("convert feed", err) + ctx.ServerErrorAuto(err) return } @@ -94,12 +94,12 @@ func writeFeed(ctx *context.Context, feed *feeds.Feed, formatType string) { if formatType == "atom" { ctx.Resp.Header().Set("Content-Type", ContentTypeAtomXml+"; charset=utf-8") if err := feed.WriteAtom(ctx.Resp); err != nil { - ctx.ServerError("Render Atom failed", err) + ctx.ServerErrorAuto(err) } } else { ctx.Resp.Header().Set("Content-Type", ContentTypeRssXml+"; charset=utf-8") if err := feed.WriteRss(ctx.Resp); err != nil { - ctx.ServerError("Render RSS failed", err) + ctx.ServerErrorAuto(err) } } } diff --git a/routers/web/feed/release.go b/routers/web/feed/release.go index 274eb0cd8af..f885316d6e5 100644 --- a/routers/web/feed/release.go +++ b/routers/web/feed/release.go @@ -23,7 +23,7 @@ func ShowReleaseFeed(ctx *context.Context, repo *repo_model.Repository, isReleas RepoID: ctx.Repo.Repository.ID, }) if err != nil { - ctx.ServerError("GetReleasesByRepoID", err) + ctx.ServerErrorAuto(err) return } @@ -47,7 +47,7 @@ func ShowReleaseFeed(ctx *context.Context, repo *repo_model.Repository, isReleas feed.Items, err = releasesToFeedItems(ctx, releases) if err != nil { - ctx.ServerError("releasesToFeedItems", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/feed/repo.go b/routers/web/feed/repo.go index 2986e00bb6b..4ade5b3b04f 100644 --- a/routers/web/feed/repo.go +++ b/routers/web/feed/repo.go @@ -26,7 +26,7 @@ func ShowRepoFeed(ctx *context.Context, repo *repo_model.Repository, formatType Date: ctx.FormString("date"), }) if err != nil { - ctx.ServerError("GetFeeds", err) + ctx.ServerErrorAuto(err) return } @@ -39,7 +39,7 @@ func ShowRepoFeed(ctx *context.Context, repo *repo_model.Repository, formatType feed.Items, err = feedActionsToFeedItems(ctx, actions) if err != nil { - ctx.ServerError("convert feed", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/home.go b/routers/web/home.go index fcdb2c27bc6..940a7dd0624 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -60,7 +60,7 @@ func HomeSitemap(ctx *context.Context) { Visible: []structs.VisibleType{structs.VisibleTypePublic}, }) if err != nil { - ctx.ServerError("SearchUsers", err) + ctx.ServerErrorAuto(err) return } count := int(cnt) @@ -79,7 +79,7 @@ func HomeSitemap(ctx *context.Context) { AllPublic: true, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } count := int(cnt) diff --git a/routers/web/org/block.go b/routers/web/org/block.go index b5f068298a6..8097de03323 100644 --- a/routers/web/org/block.go +++ b/routers/web/org/block.go @@ -21,7 +21,7 @@ func BlockedUsers(ctx *context.Context) { ctx.Data["PageIsSettingsBlockedUsers"] = true if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/home.go b/routers/web/org/home.go index d9150655b6a..7b1279e625f 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -41,7 +41,7 @@ func orgHome(ctx *context.Context, viewRepositories bool) { org := ctx.Org.Organization if org == nil { // some requests may reach here by "user" route patterns, e.g.: "/{owner}/-/repositories" - ctx.NotFound(nil) + ctx.NotFound() return } @@ -91,7 +91,7 @@ func orgHome(ctx *context.Context, viewRepositories bool) { members, _, err := organization.FindOrgMembers(ctx, opts) if err != nil { - ctx.ServerError("FindOrgMembers", err) + ctx.ServerErrorAuto(err) return } @@ -111,7 +111,7 @@ func orgHome(ctx *context.Context, viewRepositories bool) { ListOptions: db.ListOptions{Page: 1, PageSize: orgOverviewTeamsLimit}, }) if err != nil { - ctx.ServerError("SearchTeam", err) + ctx.ServerErrorAuto(err) return } } @@ -122,7 +122,7 @@ func orgHome(ctx *context.Context, viewRepositories bool) { prepareResult, err := shared_user.RenderUserOrgHeader(ctx) if err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -151,7 +151,7 @@ func orgHome(ctx *context.Context, viewRepositories bool) { IsPrivate: private, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 181593af91f..81c46d0bbf3 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -42,7 +42,7 @@ func Members(ctx *context.Context) { if ctx.Doer != nil { isMember, err := ctx.Org.Organization.IsOrgMember(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("IsOrgMember", err) + ctx.ServerErrorAuto(err) return } opts.IsDoerMember = isMember @@ -51,12 +51,12 @@ func Members(ctx *context.Context) { total, err := organization.CountOrgMembers(ctx, opts) if err != nil { - ctx.ServerError("CountOrgMembers", err) + ctx.ServerErrorAuto(err) return } if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -66,7 +66,7 @@ func Members(ctx *context.Context) { opts.ListOptions.PageSize = pageSize members, membersIsPublic, err := organization.FindOrgMembers(ctx, opts) if err != nil { - ctx.ServerError("GetMembers", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Page"] = pager @@ -85,7 +85,7 @@ func MembersAction(ctx *context.Context) { ctx.HTTPError(http.StatusNotFound) return } else if err != nil { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/mention.go b/routers/web/org/mention.go index 9331a1b8e8f..07d46e51c09 100644 --- a/routers/web/org/mention.go +++ b/routers/web/org/mention.go @@ -27,14 +27,14 @@ func GetMentionsInOwner(ctx *context.Context) { // Get org members members, _, err := org.GetMembers(ctx, ctx.Doer) if err != nil { - ctx.ServerError("GetMembers", err) + ctx.ServerErrorAuto(err) return } c.AddUsers(ctx, members) // Get mentionable teams if err := c.AddMentionableTeams(ctx, ctx.Doer, ctx.ContextUser); err != nil { - ctx.ServerError("AddMentionableTeams", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/org.go b/routers/web/org/org.go index 2d068005dd9..4320b2bbd7d 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -30,7 +30,7 @@ const ( func Create(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_org") if !ctx.Doer.CanCreateOrganization() { - ctx.ServerError("Not allowed", errors.New(ctx.Locale.TrString("org.form.create_org_not_allowed"))) + ctx.ServerErrorAuto(errors.New(ctx.Locale.TrString("org.form.create_org_not_allowed"))) return } @@ -46,7 +46,7 @@ func CreatePost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_org") if !ctx.Doer.CanCreateOrganization() { - ctx.ServerError("Not allowed", errors.New(ctx.Locale.TrString("org.form.create_org_not_allowed"))) + ctx.ServerErrorAuto(errors.New(ctx.Locale.TrString("org.form.create_org_not_allowed"))) return } @@ -77,7 +77,7 @@ func CreatePost(ctx *context.Context) { case organization.IsErrUserNotAllowedCreateOrg(err): ctx.RenderWithErrDeprecated(ctx.Tr("org.form.create_org_not_allowed"), tplCreateOrg, &form) default: - ctx.ServerError("CreateOrganization", err) + ctx.ServerErrorAuto(err) } return } diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 2e39b2ea10e..6db71c31611 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -21,7 +21,7 @@ import ( func RetrieveLabels(ctx *context.Context) { labels, err := issues_model.GetLabelsByOrgID(ctx, ctx.Org.Organization.ID, ctx.FormString("sort"), db.ListOptions{}) if err != nil { - ctx.ServerError("RetrieveLabels.GetLabels", err) + ctx.ServerErrorAuto(err) return } for _, l := range labels { @@ -48,7 +48,7 @@ func NewLabel(ctx *context.Context) { ExclusiveOrder: form.ExclusiveOrder, } if err := issues_model.NewLabel(ctx, l); err != nil { - ctx.ServerError("NewLabel", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(ctx.Org.OrgLink + "/settings/labels") @@ -66,7 +66,7 @@ func UpdateLabel(ctx *context.Context) { ctx.JSONErrorNotFound() return } else if err != nil { - ctx.ServerError("GetLabelInOrgByID", err) + ctx.ServerErrorAuto(err) return } @@ -77,7 +77,7 @@ func UpdateLabel(ctx *context.Context) { l.Color = form.Color l.SetArchived(form.IsArchived) if err := issues_model.UpdateLabel(ctx, l); err != nil { - ctx.ServerError("UpdateLabel", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(ctx.Org.OrgLink + "/settings/labels") @@ -108,7 +108,7 @@ func InitializeLabels(ctx *context.Context) { ctx.Redirect(ctx.Org.OrgLink + "/settings/labels") return } - ctx.ServerError("InitializeLabels", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(ctx.Org.OrgLink + "/settings/labels") diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 242061035fb..046be40a7b4 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -39,7 +39,7 @@ const ( // Projects renders the home page of projects func Projects(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Title"] = ctx.Tr("repo.projects") @@ -68,12 +68,12 @@ func Projects(ctx *context.Context) { Title: keyword, }) if err != nil { - ctx.ServerError("FindProjects", err) + ctx.ServerErrorAuto(err) return } if err := project_service.LoadIssueNumbersForProjects(ctx, projects, ctx.Doer); err != nil { - ctx.ServerError("LoadIssueNumbersForProjects", err) + ctx.ServerErrorAuto(err) return } @@ -83,7 +83,7 @@ func Projects(ctx *context.Context) { Type: projectType, }) if err != nil { - ctx.ServerError("CountProjects", err) + ctx.ServerErrorAuto(err) return } @@ -135,7 +135,7 @@ func RenderNewProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects" if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -147,7 +147,7 @@ func NewProjectPost(ctx *context.Context) { form := web.GetForm[*forms.CreateProjectForm](ctx) ctx.Data["Title"] = ctx.Tr("repo.projects.new") if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -172,7 +172,7 @@ func NewProjectPost(ctx *context.Context) { } if err := project_model.NewProject(ctx, &newProject); err != nil { - ctx.ServerError("NewProject", err) + ctx.ServerErrorAuto(err) return } audit.Record(ctx, audit_model.ProjectCreate, ctx.ContextUser, "project", newProject.Title, "project_id", newProject.ID) @@ -197,12 +197,12 @@ func ChangeProjectStatus(ctx *context.Context) { project, err := project_model.GetProjectByIDAndOwner(ctx, id, ctx.ContextUser.ID) if err != nil { - ctx.ServerError("GetProjectByID", err) + ctx.ServerErrorAuto(err) return } if err := project_model.ChangeProjectStatusByRepoIDAndID(ctx, 0, project.ID, toClose); err != nil { - ctx.ServerError("ChangeProjectStatusByRepoIDAndID", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(project_model.ProjectLinkForOrg(ctx.ContextUser, project.ID)) @@ -212,7 +212,7 @@ func ChangeProjectStatus(ctx *context.Context) { func DeleteProject(ctx *context.Context) { p, err := project_model.GetProjectByIDAndOwner(ctx, ctx.PathParamInt64("id"), ctx.ContextUser.ID) if err != nil { - ctx.ServerError("GetProjectByID", err) + ctx.ServerErrorAuto(err) return } @@ -235,13 +235,13 @@ func RenderEditProject(ctx *context.Context) { ctx.Data["CardTypes"] = project_model.GetCardConfig() if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } p, err := project_model.GetProjectByIDAndOwner(ctx, ctx.PathParamInt64("id"), ctx.ContextUser.ID) if err != nil { - ctx.ServerError("GetProjectByID", err) + ctx.ServerErrorAuto(err) return } @@ -268,7 +268,7 @@ func EditProjectPost(ctx *context.Context) { ctx.Data["CancelLink"] = project_model.ProjectLinkForOrg(ctx.ContextUser, projectID) if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -279,7 +279,7 @@ func EditProjectPost(ctx *context.Context) { p, err := project_model.GetProjectByIDAndOwner(ctx, projectID, ctx.ContextUser.ID) if err != nil { - ctx.ServerError("GetProjectByID", err) + ctx.ServerErrorAuto(err) return } @@ -287,7 +287,7 @@ func EditProjectPost(ctx *context.Context) { p.Description = form.Content p.CardType = form.CardType if err = project_model.UpdateProject(ctx, p); err != nil { - ctx.ServerError("UpdateProjects", err) + ctx.ServerErrorAuto(err) return } audit.Record(ctx, audit_model.ProjectUpdate, ctx.ContextUser, "project", p.Title, "project_id", p.ID) @@ -304,18 +304,18 @@ func EditProjectPost(ctx *context.Context) { func ViewProject(ctx *context.Context) { project, err := project_model.GetProjectByIDAndOwner(ctx, ctx.PathParamInt64("id"), ctx.ContextUser.ID) if err != nil { - ctx.ServerError("GetProjectByID", err) + ctx.ServerErrorAuto(err) return } if err := project.LoadOwner(ctx); err != nil { - ctx.ServerError("LoadOwner", err) + ctx.ServerErrorAuto(err) return } columns, err := project_model.GetColumns(ctx, project.ID, db.ListOptionsAll) if err != nil { - ctx.ServerError("GetColumns", err) + ctx.ServerErrorAuto(err) return } @@ -348,7 +348,7 @@ func ViewProject(ctx *context.Context) { issuesMap, err := project_service.LoadIssuesFromProject(ctx, project, &opts) if err != nil { - ctx.ServerError("LoadIssuesOfColumns", err) + ctx.ServerErrorAuto(err) return } for _, column := range columns { @@ -369,14 +369,14 @@ func ViewProject(ctx *context.Context) { linkedPrsMap, err := project_service.LoadLinkedPullRequests(ctx, issuesMap, ctx.Doer) if err != nil { - ctx.ServerError("LoadLinkedPullRequests", err) + ctx.ServerErrorAuto(err) return } // TODO: Add option to filter also by repository specific labels labels, err := issues_model.GetLabelsByOrgID(ctx, project.OwnerID, "", db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByOrgID", err) + ctx.ServerErrorAuto(err) return } @@ -406,7 +406,7 @@ func ViewProject(ctx *context.Context) { RepoID: project.RepoID, }) if err != nil { - ctx.ServerError("GetRepoMilestones", err) + ctx.ServerErrorAuto(err) return } } else { @@ -424,7 +424,7 @@ func ViewProject(ctx *context.Context) { ProjectID: project.ID, }) if err != nil { - ctx.ServerError("GetOrgMilestones", err) + ctx.ServerErrorAuto(err) return } } @@ -437,7 +437,7 @@ func ViewProject(ctx *context.Context) { // Get assignees. assigneeUsers, err := project_service.LoadIssuesAssigneesForProject(ctx, project.ID) if err != nil { - ctx.ServerError("LoadIssuesAssigneesForProject", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers) @@ -453,7 +453,7 @@ func ViewProject(ctx *context.Context) { ctx.Data["Title"] = fmt.Sprintf("%s - %s", project.Title, ctx.ContextUser.DisplayName()) if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -463,7 +463,7 @@ func ViewProject(ctx *context.Context) { // ProjectWorkflows renders the workflows page of an owner-level project func ProjectWorkflows(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } ctx.Data["PageIsViewProjects"] = true diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 2cd7f94859d..4d7c2aaae03 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -50,7 +50,7 @@ func Settings(ctx *context.Context) { ctx.Data["ContextUser"] = ctx.ContextUser if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -77,7 +77,7 @@ func SettingsPost(ctx *context.Context) { ctx.RenderWithErrDeprecated(ctx.Tr("form.email_invalid"), tplSettingsOptions, &form) return } - ctx.ServerError("UpdateOrgEmailAddress", err) + ctx.ServerErrorAuto(err) return } @@ -93,7 +93,7 @@ func SettingsPost(ctx *context.Context) { } if err := user_service.UpdateUser(ctx, org.AsUser(), opts); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } @@ -158,12 +158,12 @@ func Webhooks(ctx *context.Context) { ws, err := db.Find[webhook.Webhook](ctx, webhook.ListWebhookOptions{OwnerID: ctx.Org.Organization.ID}) if err != nil { - ctx.ServerError("ListWebhooksByOpts", err) + ctx.ServerErrorAuto(err) return } if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -195,7 +195,7 @@ func Labels(ctx *context.Context) { ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/setting_oauth2.go b/routers/web/org/setting_oauth2.go index 953a9c01c70..7c85cf3a106 100644 --- a/routers/web/org/setting_oauth2.go +++ b/routers/web/org/setting_oauth2.go @@ -40,13 +40,13 @@ func Applications(ctx *context.Context) { OwnerID: ctx.Org.Organization.ID, }) if err != nil { - ctx.ServerError("GetOAuth2ApplicationsByUserID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Applications"] = apps if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/setting_packages.go b/routers/web/org/setting_packages.go index 85cb1ff3b81..c91724da6e3 100644 --- a/routers/web/org/setting_packages.go +++ b/routers/web/org/setting_packages.go @@ -26,7 +26,7 @@ func Packages(ctx *context.Context) { ctx.Data["PageIsSettingsPackages"] = true if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -41,7 +41,7 @@ func PackagesRuleAdd(ctx *context.Context) { ctx.Data["PageIsSettingsPackages"] = true if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -56,7 +56,7 @@ func PackagesRuleEdit(ctx *context.Context) { ctx.Data["PageIsSettingsPackages"] = true if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -97,7 +97,7 @@ func PackagesRulePreview(ctx *context.Context) { ctx.Data["PageIsSettingsPackages"] = true if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index d93cbac0b92..2a5ababa61b 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -49,7 +49,7 @@ const ( // Teams render teams list page func Teams(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } org := ctx.Org.Organization @@ -90,13 +90,13 @@ func Teams(ctx *context.Context) { teams, count, err := searchTeams() if err != nil { - ctx.ServerError("SearchTeam", err) + ctx.ServerErrorAuto(err) return } for _, t := range teams { if err := t.LoadMembers(ctx); err != nil { - ctx.ServerError("GetMembers", err) + ctx.ServerErrorAuto(err) return } } @@ -180,7 +180,7 @@ func TeamsAction(ctx *context.Context) { } else if org_model.IsErrUserEmailAlreadyAdded(err) { ctx.Flash.Error(ctx.Tr("org.teams.add_duplicate_users")) } else { - ctx.ServerError("CreateTeamInvite", err) + ctx.ServerErrorAuto(err) return } } @@ -189,7 +189,7 @@ func TeamsAction(ctx *context.Context) { } ctx.Redirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName)) } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) } return } @@ -221,7 +221,7 @@ func TeamsAction(ctx *context.Context) { if err := org_model.RemoveInviteByID(ctx, iid, ctx.Org.Team.ID); err != nil { log.Error("Action(%s): %v", ctx.PathParam("action"), err) - ctx.ServerError("RemoveInviteByID", err) + ctx.ServerErrorAuto(err) return } @@ -255,7 +255,7 @@ func TeamsAction(ctx *context.Context) { func checkIsOrgMemberAndRedirect(ctx *context.Context, defaultRedirect string) { if isOrgMember, err := org_model.IsOrganizationMember(ctx, ctx.Org.Organization.ID, ctx.Doer.ID); err != nil { - ctx.ServerError("IsOrganizationMember", err) + ctx.ServerErrorAuto(err) return } else if !isOrgMember && !ctx.Doer.IsAdmin { if ctx.Org.Organization.Visibility.IsPrivate() { @@ -287,7 +287,7 @@ func TeamsRepoAction(ctx *context.Context) { ctx.Redirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName) + "/repositories") return } - ctx.ServerError("GetRepositoryByName", err) + ctx.ServerErrorAuto(err) return } err = repo_service.TeamAddRepository(ctx, ctx.Org.Team, repo) @@ -301,7 +301,7 @@ func TeamsRepoAction(ctx *context.Context) { if err != nil { log.Error("Action(%s): '%s' %v", ctx.PathParam("action"), ctx.Org.Team.Name, err) - ctx.ServerError("TeamsRepoAction", err) + ctx.ServerErrorAuto(err) return } @@ -315,7 +315,7 @@ func TeamsRepoAction(ctx *context.Context) { // NewTeam render create new team page func NewTeam(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Title"] = ctx.Org.Organization.FullName @@ -381,7 +381,7 @@ func NewTeamPost(ctx *context.Context) { case org_model.IsErrTeamAlreadyExist(err): ctx.RenderWithErrDeprecated(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form) default: - ctx.ServerError("NewTeam", err) + ctx.ServerErrorAuto(err) } return } @@ -392,7 +392,7 @@ func NewTeamPost(ctx *context.Context) { // TeamMembers render team members page func TeamMembers(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -401,14 +401,14 @@ func TeamMembers(ctx *context.Context) { ctx.Data["PageIsOrgTeamMembers"] = true if err := ctx.Org.Team.LoadMembers(ctx); err != nil { - ctx.ServerError("GetMembers", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Units"] = unit_model.Units invites, err := org_model.GetInvitesByTeamID(ctx, ctx.Org.Team.ID) if err != nil { - ctx.ServerError("GetInvitesByTeamID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Invites"] = invites @@ -420,7 +420,7 @@ func TeamMembers(ctx *context.Context) { // TeamRepositories show the repositories of team func TeamRepositories(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -432,7 +432,7 @@ func TeamRepositories(ctx *context.Context) { TeamID: ctx.Org.Team.ID, }) if err != nil { - ctx.ServerError("GetTeamRepositories", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Units"] = unit_model.Units @@ -449,7 +449,7 @@ func SearchTeam(ctx *context.Context) { shouldSeeAll, err := context.UserShouldSeeAllOrgTeams(ctx) if err != nil { - ctx.ServerError("UserShouldSeeAllOrgTeams", err) + ctx.ServerErrorAuto(err) return } @@ -494,13 +494,13 @@ func SearchTeam(ctx *context.Context) { // EditTeam render team edit page func EditTeam(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Title"] = ctx.Org.Organization.FullName ctx.Data["PageIsOrgTeams"] = true if err := ctx.Org.Team.LoadUnits(ctx); err != nil { - ctx.ServerError("LoadUnits", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Team"] = ctx.Org.Team @@ -560,7 +560,7 @@ func EditTeamPost(ctx *context.Context) { case org_model.IsErrTeamAlreadyExist(err): ctx.RenderWithErrDeprecated(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form) default: - ctx.ServerError("UpdateTeam", err) + ctx.ServerErrorAuto(err) } return } @@ -584,11 +584,7 @@ func TeamInvite(ctx *context.Context) { // TODO: to quickly debug the UI, can uncomment this (don't worry, it won't pass CI lint) // invite, org, team, inviter, err = &org_model.TeamInvite{}, &org_model.Organization{}, &org_model.Team{}, ctx.Doer, nil if err != nil { - if org_model.IsErrTeamInviteNotFound(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("getTeamInviteFromContext", err) - } + ctx.ServerErrorAuto(err) return } @@ -605,16 +601,12 @@ func TeamInvite(ctx *context.Context) { func TeamInvitePost(ctx *context.Context) { invite, org, team, _, err := getTeamInviteFromContext(ctx) if err != nil { - if org_model.IsErrTeamInviteNotFound(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("getTeamInviteFromContext", err) - } + ctx.ServerErrorAuto(err) return } if err := org_service.AddTeamMember(ctx, team, ctx.Doer); err != nil { - ctx.ServerError("AddTeamMember", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/org/worktime.go b/routers/web/org/worktime.go index 56d4b16933f..5c32f4361a2 100644 --- a/routers/web/org/worktime.go +++ b/routers/web/org/worktime.go @@ -32,11 +32,11 @@ func parseOrgTimes(ctx *context.Context) (unixFrom, unixTo int64) { timeFrom, err := time.Parse("2006-01-02", rangeFrom) if err != nil { - ctx.ServerError("time.Parse", err) + ctx.ServerErrorAuto(err) } timeTo, err := time.Parse("2006-01-02", rangeTo) if err != nil { - ctx.ServerError("time.Parse", err) + ctx.ServerErrorAuto(err) } unixFrom = timeFrom.Unix() unixTo = timeTo.Add(1440*time.Minute - 1*time.Second).Unix() // humans expect that we include the ending day too @@ -68,12 +68,12 @@ func Worktime(ctx *context.Context) { ctx.Data["WorktimeByRepos"] = true } if err != nil { - ctx.ServerError("GetWorktime", err) + ctx.ServerErrorAuto(err) return } if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 9f7ba159647..63ac175f2bd 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -67,18 +67,18 @@ func (w WorkflowInfo) DisplayName() string { // MustEnableActions check if actions are enabled in settings func MustEnableActions(ctx *context.Context) { if !setting.Actions.Enabled { - ctx.NotFound(nil) + ctx.NotFound() return } if unit.TypeActions.UnitGlobalDisabled() { - ctx.NotFound(nil) + ctx.NotFound() return } if ctx.Repo.Repository != nil { if !ctx.Repo.Permission.CanRead(unit.TypeActions) { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -91,10 +91,10 @@ func List(ctx *context.Context) { commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx, ctx.Repo.Repository.DefaultBranch) if errors.Is(err, util.ErrNotExist) { ctx.Data["NotFoundPrompt"] = ctx.Tr("repo.branch.default_branch_not_exist", ctx.Repo.Repository.DefaultBranch) - ctx.NotFound(nil) + ctx.NotFound() return } else if err != nil { - ctx.ServerError("GetBranchCommit", err) + ctx.ServerErrorAuto(err) return } @@ -157,7 +157,7 @@ func prepareOtherWorkflows(ctx *context.Context, workflows []WorkflowInfo, scope // "Other workflows" lists repo-level orphans only: GetRepoRunWorkflowIDs excludes scoped runs. ids, err := actions_model.GetRepoRunWorkflowIDs(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetRepoRunWorkflowIDs", err) + ctx.ServerErrorAuto(err) return nil } other = container.FilterSlice(ids, func(id string) (string, bool) { @@ -174,7 +174,7 @@ func prepareOtherWorkflows(ctx *context.Context, workflows []WorkflowInfo, scope func WorkflowDispatchInputs(ctx *context.Context) { ref := ctx.FormString("ref") if ref == "" { - ctx.NotFound(nil) + ctx.NotFound() return } // get target commit of run from specified ref @@ -186,11 +186,11 @@ func WorkflowDispatchInputs(ctx *context.Context) { } else if refName.IsBranch() { commit, err = ctx.Repo.GitRepo.GetBranchCommit(ctx, refName.BranchName()) } else { - ctx.ServerError("UnsupportedRefType", nil) + ctx.ServerErrorAuto(errors.New("UnsupportedRefType")) return } if err != nil { - ctx.ServerError("GetTagCommit/GetBranchCommit", err) + ctx.ServerErrorAuto(err) return } workflows, curWorkflowID := prepareWorkflowTemplate(ctx, commit) @@ -209,7 +209,7 @@ func prepareWorkflowTemplate(ctx *context.Context, commit *git.Commit) (workflow _, entries, err := actions.ListWorkflows(ctx, ctx.Repo.GitRepo, commit) if err != nil { - ctx.ServerError("ListWorkflows", err) + ctx.ServerErrorAuto(err) return nil, "" } @@ -218,7 +218,7 @@ func prepareWorkflowTemplate(ctx *context.Context, commit *git.Commit) (workflow workflow := WorkflowInfo{EntryName: entry.Name()} content, err := actions.GetContentFromEntry(ctx, ctx.Repo.GitRepo, entry) if err != nil { - ctx.ServerError("GetContentFromEntry", err) + ctx.ServerErrorAuto(err) return nil, "" } wf, err := jobparser.ReadWorkflow(content) @@ -307,7 +307,7 @@ func prepareScopedWorkflows(ctx *context.Context, curWorkflowID string, curWorkf repo := ctx.Repo.Repository sources, err := actions_model.GetEffectiveScopedWorkflowSources(ctx, repo.OwnerID) if err != nil { - ctx.ServerError("GetEffectiveScopedWorkflowSources", err) + ctx.ServerErrorAuto(err) return scopedNames } if len(sources) == 0 { @@ -465,7 +465,7 @@ func prepareWorkflowDispatchTemplate(ctx *context.Context, workflowInfos []Workf } branches, err := git_model.FindBranchNames(ctx, branchOpts) if err != nil { - ctx.ServerError("FindBranchNames", err) + ctx.ServerErrorAuto(err) return } // always put default branch on the top @@ -475,7 +475,7 @@ func prepareWorkflowDispatchTemplate(ctx *context.Context, workflowInfos []Workf tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetTagNamesByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Tags"] = tags @@ -508,7 +508,7 @@ func (data *actionRunListData) prepareFullPageRuns(ctx *context.Context, otherWo runs, total, err := db.FindAndCount[actions_model.ActionRun](ctx, opts) if err != nil { - ctx.ServerError("FindAndCount", err) + ctx.ServerErrorAuto(err) return false } data.pager = context.NewPagerBuilder(ctx).TotalCount(total).PerPageLimit(opts.PageSize).CurPage(opts.Page).Build() @@ -546,7 +546,7 @@ func (data *actionRunListData) processActionRuns(ctx *context.Context) bool { WithAvailable: true, }) if err != nil { - ctx.ServerError("FindRunners", err) + ctx.ServerErrorAuto(err) return false } @@ -555,7 +555,7 @@ func (data *actionRunListData) processActionRuns(ctx *context.Context) bool { }) jobsByRun, err := actions_model.GetLatestAttemptJobsByRuns(ctx, activeRuns) if err != nil { - ctx.ServerError("GetLatestAttemptJobsByRuns", err) + ctx.ServerErrorAuto(err) return false } @@ -647,7 +647,7 @@ func prepareWorkflowList(ctx *context.Context, curWorkflowID string) *actionRunL func (data *actionRunListData) preparePartialRefreshRuns(ctx *context.Context) bool { runs, err := actions_model.GetRunsByRepoAndID(ctx, ctx.Repo.Repository.ID, data.refreshRunIDs) if err != nil { - ctx.ServerError("GetRunsByRepoAndID", err) + ctx.ServerErrorAuto(err) return false } runsMap := make(map[int64]*actions_model.ActionRun, len(runs)) @@ -668,7 +668,7 @@ func (data *actionRunListData) prepareCommon(ctx *context.Context, workflows []W } if err := actions_model.RunList(data.ActionRuns).LoadTriggerUser(ctx); err != nil { - ctx.ServerError("LoadTriggerUser", err) + ctx.ServerErrorAuto(err) return false } if err := loadIsRefDeleted(ctx, ctx.Repo.Repository.ID, data.ActionRuns); err != nil { @@ -698,14 +698,14 @@ func (data *actionRunListData) prepareFullPageTemplate(ctx *context.Context) boo // fill template data actors, err := actions_model.GetActors(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetActors", err) + ctx.ServerErrorAuto(err) return false } ctx.Data["Actors"] = shared_user.MakeSelfOnTop(ctx.Doer, actors) runBranches, err := actions_model.GetRunBranches(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetRunBranches", err) + ctx.ServerErrorAuto(err) return false } ctx.Data["RunBranches"] = runBranches diff --git a/routers/web/repo/actions/badge.go b/routers/web/repo/actions/badge.go index 34eb3f6ac3a..accb9d74759 100644 --- a/routers/web/repo/actions/badge.go +++ b/routers/web/repo/actions/badge.go @@ -31,7 +31,7 @@ func GetWorkflowBadge(ctx *context.Context) { branchRef := git.RefNameFromBranch(branch) b, err := getWorkflowBadge(ctx, workflowFile, branchRef.String(), event) if err != nil { - ctx.ServerError("GetWorkflowBadge", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/actions/job_queue.go b/routers/web/repo/actions/job_queue.go index 44f1ef4369f..f2f743a068b 100644 --- a/routers/web/repo/actions/job_queue.go +++ b/routers/web/repo/actions/job_queue.go @@ -30,10 +30,10 @@ func prepareActionsSidebar(ctx *context.Context) { commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx, ctx.Repo.Repository.DefaultBranch) if errors.Is(err, util.ErrNotExist) { ctx.Data["NotFoundPrompt"] = ctx.Tr("repo.branch.default_branch_not_exist", ctx.Repo.Repository.DefaultBranch) - ctx.NotFound(nil) + ctx.NotFound() return } else if err != nil { - ctx.ServerError("GetBranchCommit", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 5711d494e64..452ca315264 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -66,10 +66,8 @@ func getCurrentRunByPathParam(ctx *context_module.Context) (run *actions_model.A } else { run, err = actions_model.GetRunByRepoAndID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("run")) } - if errors.Is(err, util.ErrNotExist) { - ctx.NotFound(nil) - } else if err != nil { - ctx.ServerError("GetRun:"+ctx.PathParam("run"), err) + if err != nil { + ctx.ServerErrorAuto(err) } return run } @@ -90,7 +88,7 @@ func resolveCurrentRunForView(ctx *context_module.Context) *actions_model.Action runNum := ctx.PathParamInt64("run") if runNum <= 0 { - ctx.NotFound(nil) + ctx.NotFound() return nil } @@ -113,7 +111,7 @@ func resolveCurrentRunForView(ctx *context_module.Context) *actions_model.Action return runByID } if !errors.Is(err, util.ErrNotExist) { - ctx.ServerError("GetRun:"+ctx.PathParam("run"), err) + ctx.ServerErrorAuto(err) return nil } } @@ -124,16 +122,16 @@ func resolveCurrentRunForView(ctx *context_module.Context) *actions_model.Action return nil } if !errors.Is(err, util.ErrNotExist) { - ctx.ServerError("GetRunByRepoAndIndex", err) + ctx.ServerErrorAuto(err) return nil } - ctx.NotFound(nil) + ctx.NotFound() return nil } jobNum := ctx.PathParamInt64("job") if jobNum < 0 { - ctx.NotFound(nil) + ctx.NotFound() return nil } @@ -149,12 +147,12 @@ func resolveCurrentRunForView(ctx *context_module.Context) *actions_model.Action // Probe the repo-scoped job ID first and only accept it when the job exists and belongs to the same runNum. job, err := actions_model.GetRunJobByRepoAndID(ctx, ctx.Repo.Repository.ID, jobNum) if err != nil && !errors.Is(err, util.ErrNotExist) { - ctx.ServerError("GetRunJobByRepoAndID", err) + ctx.ServerErrorAuto(err) return nil } if job != nil { if err := job.LoadRun(ctx); err != nil { - ctx.ServerError("LoadRun", err) + ctx.ServerErrorAuto(err) return nil } if job.Run.ID == runNum { @@ -167,13 +165,13 @@ func resolveCurrentRunForView(ctx *context_module.Context) *actions_model.Action { run, err := actions_model.GetRunByRepoAndIndex(ctx, ctx.Repo.Repository.ID, runNum) if err != nil && !errors.Is(err, util.ErrNotExist) { - ctx.ServerError("GetRunByRepoAndIndex", err) + ctx.ServerErrorAuto(err) return nil } if run != nil { jobs, err := actions_model.GetLatestAttemptJobsByRepoAndRunID(ctx, run.RepoID, run.ID) if err != nil { - ctx.ServerError("GetRunJobsByRunID", err) + ctx.ServerErrorAuto(err) return nil } if jobNum < int64(len(jobs)) { @@ -184,7 +182,7 @@ func resolveCurrentRunForView(ctx *context_module.Context) *actions_model.Action } if runByID == nil && runByIndex == nil { - ctx.NotFound(nil) + ctx.NotFound() return nil } @@ -252,12 +250,12 @@ func ViewWorkflowFile(ctx *context_module.Context) { commit, err := ctx.Repo.GitRepo.GetCommit(ctx, run.CommitSHA) if err != nil { - ctx.ServerError("GetCommit", err) + ctx.ServerErrorAuto(err) return } rpath, entries, err := actions.ListWorkflows(ctx, ctx.Repo.GitRepo, commit) if err != nil { - ctx.ServerError("ListWorkflows", err) + ctx.ServerErrorAuto(err) return } for _, entry := range entries { @@ -266,7 +264,7 @@ func ViewWorkflowFile(ctx *context_module.Context) { return } } - ctx.NotFound(nil) + ctx.NotFound() } type LogCursor struct { @@ -544,7 +542,7 @@ func ViewPost(ctx *context_module.Context) { return } if err := run.LoadAttributes(ctx); err != nil { - ctx.ServerError("run.LoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -633,11 +631,11 @@ func fillViewRunResponseSummary(ctx *context_module.Context, resp *ViewResponse, attempts, err := actions_model.ListRunAttemptsByRunID(ctx, run.ID) if err != nil { - ctx.ServerError("ListRunAttemptsByRunID", err) + ctx.ServerErrorAuto(err) return } if err := attempts.LoadTriggerUser(ctx); err != nil { - ctx.ServerError("LoadTriggerUser", err) + ctx.ServerErrorAuto(err) return } for _, runAttempt := range attempts { @@ -677,7 +675,7 @@ func fillViewRunResponseSummary(ctx *context_module.Context, resp *ViewResponse, // Scoping server-side avoids rendering every job's markdown on each 1s poll. summaries, err := actions_model.ListActionRunJobSummaries(ctx, ctx.Repo.Repository.ID, run.ID, runAttemptID, ctx.PathParamInt64("job")) if err != nil { - ctx.ServerError("ListActionRunJobSummaries", err) + ctx.ServerErrorAuto(err) return } if len(summaries) > 0 { @@ -702,7 +700,7 @@ func fillViewRunResponseSummary(ctx *context_module.Context, resp *ViewResponse, arts, err := actions_model.ListUploadedArtifactsMetaByRunAttempt(ctx, ctx.Repo.Repository.ID, run.ID, runAttemptID) if err != nil { - ctx.ServerError("ListUploadedArtifactsMetaByRunAttempt", err) + ctx.ServerErrorAuto(err) return } resp.Artifacts = make([]*ArtifactsViewItem, 0, len(arts)) @@ -724,7 +722,7 @@ func fillViewRunResponseCurrentJob(ctx *context_module.Context, resp *ViewRespon current, hasPathParam := findCurrentJobByPathParam(ctx, jobs) if current == nil { if hasPathParam { - ctx.NotFound(nil) + ctx.NotFound() } return } @@ -734,12 +732,12 @@ func fillViewRunResponseCurrentJob(ctx *context_module.Context, resp *ViewRespon var err error task, err = actions_model.GetTaskByID(ctx, effectiveTaskID) if err != nil { - ctx.ServerError("actions_model.GetTaskByID", err) + ctx.ServerErrorAuto(err) return } task.Job = current if err := task.LoadAttributes(ctx); err != nil { - ctx.ServerError("task.LoadAttributes", err) + ctx.ServerErrorAuto(err) return } } @@ -756,7 +754,7 @@ func fillViewRunResponseCurrentJob(ctx *context_module.Context, resp *ViewRespon if task != nil { steps, logs, err := convertToViewModel(ctx, ctx.Locale, req.LogCursors, task) if err != nil { - ctx.ServerError("convertToViewModel", err) + ctx.ServerErrorAuto(err) return } resp.State.CurrentJob.Steps = append(resp.State.CurrentJob.Steps, steps...) @@ -929,7 +927,7 @@ func checkRunRerunAllowed(ctx *context_module.Context, run *actions_model.Action if run.IsScopedRun { optedOut, err := actions_model.IsScopedWorkflowOptedOut(ctx, cfg, ctx.Repo.Repository.OwnerID, run.WorkflowRepoID, run.WorkflowID) if err != nil { - ctx.ServerError("IsScopedWorkflowOptedOut", err) + ctx.ServerErrorAuto(err) return false } disabled = optedOut @@ -943,7 +941,7 @@ func checkRunRerunAllowed(ctx *context_module.Context, run *actions_model.Action func checkLatestAttempt(ctx *context_module.Context, run *actions_model.ActionRun, attempt *actions_model.ActionRunAttempt) bool { if attempt != nil && run.LatestAttemptID != attempt.ID { - ctx.NotFound(nil) + ctx.NotFound() return false } return true @@ -969,7 +967,7 @@ func Rerun(ctx *context_module.Context) { currentJob, hasPathParam := findCurrentJobByPathParam(ctx, jobs) if hasPathParam && currentJob == nil { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -1024,7 +1022,7 @@ func handleWorkflowRerunError(ctx *context_module.Context, err error) { ctx.JSON(http.StatusBadRequest, map[string]any{"message": err.Error()}) return } - ctx.ServerError("RerunWorkflowRunJobs", err) + ctx.ServerErrorAuto(err) } func Logs(ctx *context_module.Context) { @@ -1035,7 +1033,7 @@ func Logs(ctx *context_module.Context) { jobID := ctx.PathParamInt64("job") if err := common.DownloadActionsRunJobLogsWithID(ctx.Base, ctx.Repo.Repository, run.ID, jobID); err != nil { - ctx.ServerError("DownloadActionsRunJobLogsWithID", err) + ctx.ServerErrorAuto(err) } } @@ -1049,7 +1047,7 @@ func Cancel(ctx *context_module.Context) { } if _, err := actions_service.CancelRun(ctx, run, jobs); err != nil { - ctx.ServerError("CancelRun", err) + ctx.ServerErrorAuto(err) return } ctx.JSONOK() @@ -1061,7 +1059,7 @@ func Approve(ctx *context_module.Context) { return } if _, err := actions_service.ApproveRuns(ctx, ctx.Repo.Repository, ctx.Doer, []int64{run.ID}); err != nil { - ctx.ServerError("ApproveRuns", err) + ctx.ServerErrorAuto(err) return } @@ -1080,7 +1078,7 @@ func Delete(ctx *context_module.Context) { } if err := actions_service.DeleteRun(ctx, run); err != nil { - ctx.ServerError("DeleteRun", err) + ctx.ServerErrorAuto(err) return } @@ -1109,7 +1107,7 @@ func getCurrentRunJobsByPathParam(ctx *context_module.Context) (*actions_model.A jobID := ctx.PathParamInt64("job") selectedJob, err = actions_model.GetRunJobByRunAndID(ctx, run.ID, jobID) if err != nil { - ctx.ServerError("GetRunJobByRunAndID", err) + ctx.ServerErrorAuto(err) return nil, nil, nil } } @@ -1124,21 +1122,21 @@ func getCurrentRunJobsByPathParam(ctx *context_module.Context) (*actions_model.A // Explicit attempt number in the URL — user is viewing a historical attempt. attempt, err = actions_model.GetRunAttemptByRunIDAndAttemptNum(ctx, run.ID, attemptNum) if err != nil { - ctx.ServerError("GetRunAttemptByRunIDAndAttemptNum", err) + ctx.ServerErrorAuto(err) return nil, nil, nil } case selectedJob != nil && selectedJob.RunAttemptID > 0: // No explicit attempt in the URL, but the requested job belongs to a known attempt — resolve via the job. attempt, err = actions_model.GetRunAttemptByRepoAndID(ctx, selectedJob.RepoID, selectedJob.RunAttemptID) if err != nil { - ctx.ServerError("GetRunAttemptByRepoAndID", err) + ctx.ServerErrorAuto(err) return nil, nil, nil } default: // No attempt context at all — show the latest attempt (nil for legacy runs). attempt, _, err = run.GetLatestAttempt(ctx) if err != nil { - ctx.ServerError("GetLatestAttempt", err) + ctx.ServerErrorAuto(err) return nil, nil, nil } } @@ -1151,7 +1149,7 @@ func getCurrentRunJobsByPathParam(ctx *context_module.Context) (*actions_model.A } jobs, err := actions_model.GetRunJobsByRunAndAttemptID(ctx, run.ID, resolvedAttemptID) if err != nil { - ctx.ServerError("get current jobs", err) + ctx.ServerErrorAuto(err) return nil, nil, nil } jobs.SortMatrixGroupsByName() @@ -1187,12 +1185,12 @@ func ArtifactsDeleteView(ctx *context_module.Context) { } resolvedAttemptID, err := resolveArtifactAttemptIDFromQuery(ctx, run) if err != nil { - ctx.ServerError("resolveArtifactAttemptIDFromQuery", err) + ctx.ServerErrorAuto(err) return } artifactName := ctx.PathParam("artifact_name") if err := actions_model.SetArtifactNeedDeleteByRunAttempt(ctx, run.ID, resolvedAttemptID, artifactName); err != nil { - ctx.ServerError("SetArtifactNeedDeleteByRunAttempt", err) + ctx.ServerErrorAuto(err) return } ctx.JSON(http.StatusOK, struct{}{}) @@ -1205,13 +1203,13 @@ func ArtifactsDownloadView(ctx *context_module.Context) { } resolvedAttemptID, err := resolveArtifactAttemptIDFromQuery(ctx, run) if err != nil { - ctx.ServerError("resolveArtifactAttemptIDFromQuery", err) + ctx.ServerErrorAuto(err) return } artifactName := ctx.PathParam("artifact_name") artifacts, err := actions_model.GetArtifactsByRunAttemptAndName(ctx, run.ID, resolvedAttemptID, artifactName) if err != nil { - ctx.ServerError("GetArtifactsByRunAttemptAndName", err) + ctx.ServerErrorAuto(err) return } if len(artifacts) == 0 { @@ -1233,7 +1231,7 @@ func ArtifactsDownloadView(ctx *context_module.Context) { if len(artifacts) == 1 && actions_service.IsArtifactV4(artifacts[0]) { err := actions_service.DownloadArtifactV4(ctx.Base, artifacts[0]) if err != nil { - ctx.ServerError("DownloadArtifactV4", err) + ctx.ServerErrorAuto(err) return } return @@ -1275,7 +1273,7 @@ func ArtifactsDownloadView(ctx *context_module.Context) { for _, art := range artifacts { err := writeArtifactToZip(art) if err != nil { - ctx.ServerError("writeArtifactToZip", err) + ctx.ServerErrorAuto(err) return } } @@ -1287,12 +1285,12 @@ func ApproveAllChecks(ctx *context_module.Context) { commitStatuses, err := git_model.GetLatestCommitStatus(ctx, repo.ID, commitID, db.ListOptionsAll) if err != nil { - ctx.ServerError("GetLatestCommitStatus", err) + ctx.ServerErrorAuto(err) return } runs, err := actions_service.GetRunsFromCommitStatuses(ctx, repo.ID, commitStatuses) if err != nil { - ctx.ServerError("GetRunsFromCommitStatuses", err) + ctx.ServerErrorAuto(err) return } @@ -1309,7 +1307,7 @@ func ApproveAllChecks(ctx *context_module.Context) { } if _, err := actions_service.ApproveRuns(ctx, repo, ctx.Doer, runIDs); err != nil { - ctx.ServerError("ApproveRuns", err) + ctx.ServerErrorAuto(err) return } @@ -1341,7 +1339,7 @@ func disableOrEnableWorkflowFile(ctx *context_module.Context, isEnable bool) { // a required scoped workflow can never be opted out required, err := actions_model.IsScopedWorkflowRequired(ctx, ctx.Repo.Repository.OwnerID, scopedRepoID, workflow) if err != nil { - ctx.ServerError("IsScopedWorkflowRequired", err) + ctx.ServerErrorAuto(err) return } if required { @@ -1359,7 +1357,7 @@ func disableOrEnableWorkflowFile(ctx *context_module.Context, isEnable bool) { } if err := repo_model.UpdateRepoUnitConfig(ctx, cfgUnit); err != nil { - ctx.ServerError("UpdateRepoUnit", err) + ctx.ServerErrorAuto(err) return } actions_service.RecordWorkflowToggle(ctx, ctx.Repo.Repository, workflow, isEnable) @@ -1381,13 +1379,13 @@ func Run(ctx *context_module.Context) { workflowID := ctx.FormString("workflow") if len(workflowID) == 0 { - ctx.ServerError("workflow", nil) + ctx.ServerErrorAuto(errors.New("workflow")) return } ref := ctx.FormString("ref") if len(ref) == 0 { - ctx.ServerError("ref", nil) + ctx.ServerErrorAuto(errors.New("ref")) return } sourceRepoID := ctx.FormInt64("scoped_workflow_source_repo_id") @@ -1418,35 +1416,35 @@ func Run(ctx *context_module.Context) { func viewScopedWorkflowFile(ctx *context_module.Context, run *actions_model.ActionRun) { sourceRepo, err := repo_model.GetRepositoryByID(ctx, run.WorkflowRepoID) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } perm, err := access_model.GetDoerRepoPermission(ctx, sourceRepo, ctx.Doer) if err != nil { - ctx.ServerError("GetUserRepoPermission", err) + ctx.ServerErrorAuto(err) return } if !perm.CanRead(unit.TypeCode) { - ctx.NotFound(nil) + ctx.NotFound() return } sourceGitRepo, err := git.OpenRepository(ctx, sourceRepo) if err != nil { - ctx.ServerError("OpenRepository", err) + ctx.ServerErrorAuto(err) return } defer sourceGitRepo.Close() commit, err := sourceGitRepo.GetCommit(ctx, run.WorkflowCommitSHA) if err != nil { - ctx.ServerError("GetCommit", err) + ctx.ServerErrorAuto(err) return } rpath, entries, err := actions.ListScopedWorkflows(ctx, sourceGitRepo, commit) if err != nil { - ctx.ServerError("ListScopedWorkflows", err) + ctx.ServerErrorAuto(err) return } for _, entry := range entries { @@ -1455,7 +1453,7 @@ func viewScopedWorkflowFile(ctx *context_module.Context, run *actions_model.Acti return } } - ctx.NotFound(nil) + ctx.NotFound() } // canViewScopedWorkflowFile reports whether the viewer may follow the "Workflow file" link of a scoped run. diff --git a/routers/web/repo/actions/view_artifact.go b/routers/web/repo/actions/view_artifact.go index 6364c142a3a..e8b045e6e15 100644 --- a/routers/web/repo/actions/view_artifact.go +++ b/routers/web/repo/actions/view_artifact.go @@ -340,7 +340,7 @@ func ServeArtifactPreviewContent(ctx *context_module.Base, filePath string, read func ArtifactsPreviewView(ctx *context_module.Context) { if setting.Actions.ArtifactPreviewMaxSize == 0 { - ctx.NotFound(nil) + ctx.NotFound() return } artifacts, err := loadUploadedArtifactsByID(ctx, ctx.PathParamInt64("artifact_id")) @@ -348,13 +348,13 @@ func ArtifactsPreviewView(ctx *context_module.Context) { err = util.ErrNotExist } if err != nil { - ctx.ServerError("loadUploadedArtifactsByID", err) + ctx.ServerErrorAuto(err) return } artifact := artifacts[0] run, err := actions_model.GetRunByRepoAndID(ctx, artifact.RepoID, artifact.RunID) if err != nil { - ctx.ServerError("GetRunByRepoAndID", err) + ctx.ServerErrorAuto(err) return } run.Repo = ctx.Repo.Repository @@ -369,7 +369,7 @@ func ArtifactsPreviewView(ctx *context_module.Context) { if artifact.RunAttemptID > 0 { attempt, err := actions_model.GetRunAttemptByRepoAndID(ctx, artifact.RepoID, artifact.RunAttemptID) if err != nil { - ctx.ServerError("GetRunAttemptByRepoAndID", err) + ctx.ServerErrorAuto(err) return } data.RunAttempt = attempt.Attempt @@ -380,7 +380,7 @@ func ArtifactsPreviewView(ctx *context_module.Context) { var list artifactPreviewList if !data.PreviewTooLarge { if list, err = listPreview(artifacts); err != nil { - ctx.ServerError("listPreview", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go index 432617f9952..619b7b30495 100644 --- a/routers/web/repo/activity.go +++ b/routers/web/repo/activity.go @@ -54,7 +54,7 @@ func Activity(ctx *context.Context) { branchExist, _ := git_model.IsBranchExist(ctx, ctx.Repo.Repository.ID, ctx.Repo.Repository.DefaultBranch) if !branchExist { ctx.Data["NotFoundPrompt"] = ctx.Tr("repo.branch.default_branch_not_exist", ctx.Repo.Repository.DefaultBranch) - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -68,12 +68,12 @@ func Activity(ctx *context.Context) { canReadCode, ) if err != nil { - ctx.ServerError("GetActivityStats", err) + ctx.ServerErrorAuto(err) return } if ctx.PageData["repoActivityTopAuthors"], err = activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10); err != nil { - ctx.ServerError("GetActivityStatsTopAuthors", err) + ctx.ServerErrorAuto(err) return } @@ -106,7 +106,7 @@ func ActivityAuthors(ctx *context.Context) { authors, err := activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10) if err != nil { - ctx.ServerError("GetActivityStatsTopAuthors", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go index 07d13a6d36b..a0a0f44762f 100644 --- a/routers/web/repo/attachment.go +++ b/routers/web/repo/attachment.go @@ -51,7 +51,7 @@ func uploadAttachment(ctx *context.Context, repoID int64, uploadFunc attachment. file, header, err := ctx.Req.FormFile("file") if err != nil { - ctx.ServerError("FormFile", err) + ctx.ServerErrorAuto(err) return } defer file.Close() @@ -67,7 +67,7 @@ func uploadAttachment(ctx *context.Context, repoID int64, uploadFunc attachment. ctx.HTTPError(http.StatusBadRequest, err.Error()) return } - ctx.ServerError("uploadAttachment(uploadFunc)", err) + ctx.ServerErrorAuto(err) return } @@ -81,7 +81,7 @@ func DeletePendingAttachment(ctx *context.Context) { file := ctx.FormString("file") attach, err := repo_model.GetAttachmentByUUID(ctx, file) if err != nil { - ctx.ServerError("GetAttachmentByUUID", err) + ctx.ServerErrorAuto(err) return } @@ -97,7 +97,7 @@ func DeletePendingAttachment(ctx *context.Context) { err = repo_model.DeleteAttachment(ctx, attach, true) if err != nil { - ctx.ServerError("DeleteAttachment", err) + ctx.ServerErrorAuto(err) return } ctx.JSON(http.StatusOK, map[string]string{ @@ -112,14 +112,14 @@ func ServeAttachment(ctx *context.Context, uuid string) { if repo_model.IsErrAttachmentNotExist(err) { ctx.HTTPError(http.StatusNotFound) } else { - ctx.ServerError("GetAttachmentByUUID", err) + ctx.ServerErrorAuto(err) } return } unitType, repoID, err := repo_service.GetAttachmentLinkedTypeAndRepoID(ctx, attach) if err != nil { - ctx.ServerError("GetAttachmentLinkedTypeAndRepoID", err) + ctx.ServerErrorAuto(err) return } if repoID == 0 { @@ -143,12 +143,12 @@ func ServeAttachment(ctx *context.Context, uuid string) { if repo == nil { repo, err = repo_model.GetRepositoryByID(ctx, repoID) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } perm, err = access_model.GetDoerRepoPermission(ctx, repo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } } else { @@ -167,7 +167,7 @@ func ServeAttachment(ctx *context.Context, uuid string) { if unitType == unit.TypeReleases && attach.ReleaseID != 0 && !perm.CanWrite(unit.TypeReleases) { rel, err := repo_model.GetReleaseByID(ctx, attach.ReleaseID) if err != nil { - ctx.ServerError("GetReleaseByID", err) + ctx.ServerErrorAuto(err) return } if rel.IsDraft { @@ -185,7 +185,7 @@ func ServeAttachment(ctx *context.Context, uuid string) { } if err := attach.IncreaseDownloadCount(ctx); err != nil { - ctx.ServerError("IncreaseDownloadCount", err) + ctx.ServerErrorAuto(err) return } @@ -206,7 +206,7 @@ func ServeAttachment(ctx *context.Context, uuid string) { // If we have matched and access to release or issue fr, err := storage.Attachments.Open(attach.RelativePath()) if err != nil { - ctx.ServerError("Open", err) + ctx.ServerErrorAuto(err) return } defer fr.Close() diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index 40bb7c7a978..e7b883b5e59 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -46,12 +46,16 @@ func RefBlame(ctx *context.Context) { // Get current entry user currently looking at. if ctx.Repo.TreePath == "" { - ctx.NotFound(nil) + ctx.NotFound() return } entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - HandleGitError(ctx, "Repo.Commit.GetTreeEntryByPath", err) + HandleGitError(ctx, err) + return + } + if entry.IsDir() { // a directory has no blame, show its tree instead + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL() + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)) return } @@ -74,14 +78,14 @@ func RefBlame(ctx *context.Context) { _, ctx.Data["NumLines"], err = blob.GetBlobLineCount(ctx, nil) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } bypassBlameIgnore, _ := strconv.ParseBool(ctx.FormString("bypass-blame-ignore")) result, err := performBlame(ctx, bypassBlameIgnore) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } @@ -199,11 +203,7 @@ func processBlameParts(ctx *context.Context, blameParts []*git.BlamePart) map[st if !ok { commit, err = ctx.Repo.GitRepo.GetCommit(ctx, sha) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("Repo.GitRepo.GetCommit", err) - } + ctx.ServerErrorAuto(err) return nil } commitCache[sha] = commit @@ -215,7 +215,7 @@ func processBlameParts(ctx *context.Context, blameParts []*git.BlamePart) map[st // populate commit email addresses to later look up avatars. userCommits, err := gituser.GetUserCommitsByGitCommits(ctx, commits, ctx.Repo.RepoLink, ctx.Repo.RefFullName) if err != nil { - ctx.ServerError("GetUserCommitsByGitCommits", err) + ctx.ServerErrorAuto(err) return nil } for _, c := range userCommits { diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 60893319e11..24be41c144e 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -52,7 +52,7 @@ func Branches(ctx *context.Context) { defaultBranchOptional, branches, branchesCount, err := repo_service.LoadBranches(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Doer, ctx.Repo.Permission, optional.None[bool](), kw, page, pageSize) if err != nil { - ctx.ServerError("LoadBranches", err) + ctx.ServerErrorAuto(err) return } @@ -66,7 +66,7 @@ func Branches(ctx *context.Context) { commitStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(ctx, ctx.Repo.Repository.ID, commitIDs) if err != nil { - ctx.ServerError("LoadBranches", err) + ctx.ServerErrorAuto(err) return } @@ -152,7 +152,7 @@ func RestoreBranchPost(ctx *context.Context) { func CreateBranch(ctx *context.Context) { form := web.GetForm[*forms.NewBranchForm](ctx) if !ctx.Repo.CanCreateBranch() { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -207,7 +207,7 @@ func CreateBranch(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(e.Message), }) if err != nil { - ctx.ServerError("UpdatePullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Error(flashError) @@ -216,7 +216,7 @@ func CreateBranch(ctx *context.Context) { return } - ctx.ServerError("CreateNewBranch", err) + ctx.ServerErrorAuto(err) return } @@ -244,7 +244,7 @@ func MergeUpstream(ctx *context.Context) { ctx.JSONError(ctx.Tr("repo.pulls.unrelated_histories")) return } - ctx.ServerError("MergeUpstream", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect("") diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go index 15281ea74a4..bd157a1a4eb 100644 --- a/routers/web/repo/code_frequency.go +++ b/routers/web/repo/code_frequency.go @@ -34,7 +34,7 @@ func CodeFrequencyData(ctx *context.Context) { ctx.Status(http.StatusAccepted) return } - ctx.ServerError("GetContributorStats", err) + ctx.ServerErrorAuto(err) } else { ctx.JSON(http.StatusOK, contributorStats["total"].Weeks) } diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 94c4920ac61..9c1e2a3a585 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -5,7 +5,6 @@ package repo import ( - "errors" "fmt" "net/http" "strings" @@ -59,7 +58,7 @@ func RefCommits(ctx *context.Context) { func Commits(ctx *context.Context) { ctx.Data["PageIsCommits"] = true if ctx.Repo.Commit == nil { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["PageIsViewCode"] = true @@ -76,12 +75,12 @@ func Commits(ctx *context.Context) { // Both `git log branchName` and `git log commitId` work. commits, err := ctx.Repo.Commit.CommitsByRange(ctx, ctx.Repo.GitRepo, page, pageSize, "", "", "") if err != nil { - ctx.ServerError("CommitsByRange", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Commits"], err = processGitCommits(ctx, commits) if err != nil { - ctx.ServerError("processGitCommits", err) + ctx.ServerErrorAuto(err) return } commitIDs := make([]string, 0, len(commits)) @@ -136,7 +135,7 @@ func Graph(ctx *context.Context) { graphCommitsCount, err = ctx.Repo.GetCommitGraphsCount(ctx, hidePRRefs, branchRefs, files) } if err != nil { - ctx.ServerError("GetCommitGraphsCount", err) + ctx.ServerErrorAuto(err) return } } @@ -144,12 +143,12 @@ func Graph(ctx *context.Context) { page := ctx.FormInt("page") graph, err := gitgraph.GetCommitGraph(ctx, ctx.Repo.GitRepo, page, 0, hidePRRefs, branchRefs, files) if err != nil { - ctx.ServerError("GetCommitGraph", err) + ctx.ServerErrorAuto(err) return } if err := graph.LoadAndProcessCommits(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo); err != nil { - ctx.ServerError("LoadAndProcessCommits", err) + ctx.ServerErrorAuto(err) return } @@ -157,7 +156,7 @@ func Graph(ctx *context.Context) { gitRefs, err := ctx.Repo.GitRepo.GetRefs(ctx) if err != nil { - ctx.ServerError("GitRepo.GetRefs", err) + ctx.ServerErrorAuto(err) return } @@ -190,13 +189,13 @@ func SearchCommits(ctx *context.Context) { opts := git.NewSearchCommitsOptions(query, all) commits, err := ctx.Repo.Commit.SearchCommits(ctx, ctx.Repo.GitRepo, opts) if err != nil { - ctx.ServerError("SearchCommits", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CommitCount"] = len(commits) ctx.Data["Commits"], err = processGitCommits(ctx, commits) if err != nil { - ctx.ServerError("processGitCommits", err) + ctx.ServerErrorAuto(err) return } @@ -227,7 +226,7 @@ func FileHistory(ctx *context.Context) { FollowRename: followRename, }) if err != nil { - ctx.ServerError("CommitsByFileAndRange", err) + ctx.ServerErrorAuto(err) return } @@ -238,13 +237,13 @@ func FileHistory(ctx *context.Context) { } else { commitsCount, err = git.FileCommitsCount(ctx, ctx.Repo.Repository, ctx.Repo.RefFullName.ShortName(), ctx.Repo.TreePath) if err != nil { - ctx.ServerError("FileCommitsCount", err) + ctx.ServerErrorAuto(err) return } } if len(commits) == 0 { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -252,7 +251,7 @@ func FileHistory(ctx *context.Context) { ctx.Data["CommitCount"] = commitsCount ctx.Data["Commits"], err = processGitCommits(ctx, commits) if err != nil { - ctx.ServerError("processGitCommits", err) + ctx.ServerErrorAuto(err) return } @@ -270,7 +269,7 @@ func LoadBranchesAndTags(ctx *context.Context) { ctx.JSON(http.StatusOK, response) return } - ctx.ServerError("LoadBranchesAndTags", err) + ctx.ServerErrorAuto(err) } // Diff show different from current commit to previous commit @@ -292,7 +291,7 @@ func Diff(ctx *context.Context) { var err error gitRepo, err = git.RepositoryFromRequestContextOrOpen(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { - ctx.ServerError("Repo.GitRepo.GetCommit", err) + ctx.ServerErrorAuto(err) return } diffBlobExcerptData.BaseLink = ctx.Repo.RepoLink + "/wiki/blob_excerpt" @@ -300,11 +299,7 @@ func Diff(ctx *context.Context) { commit, err := gitRepo.GetCommit(ctx, commitID) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("Repo.GitRepo.GetCommit", err) - } + ctx.ServerErrorAuto(err) return } if len(commitID) != commit.ID.Type().FullLength() { @@ -330,12 +325,12 @@ func Diff(ctx *context.Context) { MaxFiles: maxFiles, }, files...) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } diffShortStat, err := gitdiff.GetDiffShortStat(ctx, gitRepo, &diffCommonOptions) if err != nil { - ctx.ServerError("GetDiffShortStat", err) + ctx.ServerErrorAuto(err) return } ctx.Data["DiffShortStat"] = diffShortStat @@ -344,7 +339,7 @@ func Diff(ctx *context.Context) { for i := 0; i < commit.ParentCount(); i++ { sha, err := commit.ParentID(i) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } parents[i] = sha.String() @@ -358,7 +353,7 @@ func Diff(ctx *context.Context) { if commit.ParentCount() > 0 { parentCommit, err = gitRepo.GetCommit(ctx, parents[0]) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } parentCommitID = parentCommit.ID.String() @@ -372,7 +367,7 @@ func Diff(ctx *context.Context) { if !fileOnly { diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, parentCommitID, commitID) if err != nil { - ctx.ServerError("GetDiffTree", err) + ctx.ServerErrorAuto(err) return } @@ -403,7 +398,7 @@ func Diff(ctx *context.Context) { if err := asymkey_model.CalculateTrustStatus(verification, ctx.Repo.Repository.GetTrustModel(), func(user *user_model.User) (bool, error) { return repo_model.HasAccessToRepoCodeUnit(ctx, ctx.Repo.Repository, user.ID) }, nil); err != nil { - ctx.ServerError("CalculateTrustStatus", err) + ctx.ServerErrorAuto(err) return } @@ -432,7 +427,7 @@ func RawDiff(ctx *context.Context) { if ctx.Data["PageIsWiki"] != nil { wikiRepo, err := git.OpenRepository(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { - ctx.ServerError("OpenRepository", err) + ctx.ServerErrorAuto(err) return } defer wikiRepo.Close() @@ -440,7 +435,7 @@ func RawDiff(ctx *context.Context) { } else { gitRepo = ctx.Repo.GitRepo if gitRepo == nil { - ctx.ServerError("GitRepo not open", fmt.Errorf("no open git repo for '%s'", ctx.Repo.Repository.FullName())) + ctx.ServerErrorAuto(fmt.Errorf("no open git repo for '%s'", ctx.Repo.Repository.FullName())) return } } @@ -450,11 +445,7 @@ func RawDiff(ctx *context.Context) { git.RawDiffType(ctx.PathParam("ext")), ctx.Resp, ); err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(errors.New("commit " + ctx.PathParam("sha") + " does not exist.")) - return - } - ctx.ServerError("GetRawDiff", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 57046d5d3e7..aebfffb1508 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -436,12 +436,12 @@ func (cpi *comparePageInfoType) prepareCompareDiff(ctx *context.Context, whitesp MaxFiles: maxFiles, }, ctx.FormStrings("files")...) if err != nil { - ctx.ServerError("GetDiff", err) + ctx.ServerErrorAuto(err) return } diffShortStat, err := gitdiff.GetDiffShortStat(ctx, ci.HeadGitRepo, &diffCommonOptions) if err != nil { - ctx.ServerError("GetDiffShortStat", err) + ctx.ServerErrorAuto(err) return } ctx.Data["DiffShortStat"] = diffShortStat @@ -457,7 +457,7 @@ func (cpi *comparePageInfoType) prepareCompareDiff(ctx *context.Context, whitesp if !fileOnly { diffTree, err := gitdiff.GetDiffTree(ctx, ci.HeadGitRepo, false, beforeCommitID, headCommitID) if err != nil { - ctx.ServerError("GetDiffTree", err) + ctx.ServerErrorAuto(err) return } @@ -470,7 +470,7 @@ func (cpi *comparePageInfoType) prepareCompareDiff(ctx *context.Context, whitesp headCommit, err := ci.HeadGitRepo.GetCommit(ctx, headCommitID) if err != nil { - ctx.ServerError("GetCommit", err) + ctx.ServerErrorAuto(err) return } @@ -478,13 +478,13 @@ func (cpi *comparePageInfoType) prepareCompareDiff(ctx *context.Context, whitesp beforeCommit, err := baseGitRepo.GetCommit(ctx, beforeCommitID) if err != nil { - ctx.ServerError("GetCommit", err) + ctx.ServerErrorAuto(err) return } commits, err := processGitCommits(ctx, ci.Commits) if err != nil { - ctx.ServerError("processGitCommits", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Commits"] = commits @@ -516,10 +516,10 @@ func CompareDiff(ctx *context.Context) { comparePageInfo := newComparePageInfo() err := comparePageInfo.parseCompareInfo(ctx, ctx.PathParam("*")) if errors.Is(err, util.ErrNotExist) || errors.Is(err, util.ErrInvalidArgument) { - ctx.NotFound(nil) + ctx.NotFound() return } else if err != nil { - ctx.ServerError("ParseCompareInfo", err) + ctx.ServerErrorAuto(err) return } ci := comparePageInfo.compareInfo @@ -535,7 +535,7 @@ func CompareDiff(ctx *context.Context) { baseTags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetTagNamesByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Tags"] = baseTags @@ -548,7 +548,7 @@ func CompareDiff(ctx *context.Context) { headBranches, headTags, err := getBranchesAndTagsForRepo(ctx, ci.HeadRepo) if err != nil { - ctx.ServerError("GetBranchesAndTagsForRepo", err) + ctx.ServerErrorAuto(err) return } ctx.Data["HeadBranches"] = headBranches @@ -593,9 +593,9 @@ func downloadCompareDiffOrPatch(ctx *context.Context, patch bool) { cpi := newComparePageInfo() if err := cpi.parseCompareInfo(ctx, ctx.PathParam("basehead")); err != nil { if errors.Is(err, util.ErrNotExist) || errors.Is(err, util.ErrInvalidArgument) { - ctx.NotFound(nil) + ctx.NotFound() } else { - ctx.ServerError("ParseCompareInfo", err) + ctx.ServerErrorAuto(err) } return } @@ -611,7 +611,7 @@ func downloadCompareDiffOrPatch(ctx *context.Context, patch bool) { err = ci.HeadGitRepo.GetDiff(ctx, compareArg, ctx.Resp) } if err != nil { - ctx.ServerError("DownloadCompareDiffOrPatch", err) + ctx.ServerErrorAuto(err) return } } @@ -622,13 +622,13 @@ func (cpi *comparePageInfoType) prepareCreatePullRequestPage(ctx *context.Contex pr, err := issues_model.GetUnmergedPullRequest(ctx, ci.HeadRepo.ID, ctx.Repo.Repository.ID, ci.HeadRef.ShortName(), ci.BaseRef.ShortName(), issues_model.PullRequestFlowGithub) if err != nil { if !issues_model.IsErrPullRequestNotExist(err) { - ctx.ServerError("GetUnmergedPullRequest", err) + ctx.ServerErrorAuto(err) return } } else { ctx.Data["HasPullRequest"] = true if err := pr.LoadIssue(ctx); err != nil { - ctx.ServerError("LoadIssue", err) + ctx.ServerErrorAuto(err) return } ctx.Data["PullRequest"] = pr @@ -736,7 +736,7 @@ func ExcerptBlob(ctx *context.Context) { var err error gitRepo, err = git.RepositoryFromRequestContextOrOpen(ctx, ctx.Repo.Repository.WikiStorageRepo()) if err != nil { - ctx.ServerError("OpenRepository", err) + ctx.ServerErrorAuto(err) return } diffBlobExcerptData.BaseLink = ctx.Repo.RepoLink + "/wiki/blob_excerpt" @@ -744,31 +744,31 @@ func ExcerptBlob(ctx *context.Context) { commit, err := gitRepo.GetCommit(ctx, commitID) if err != nil { - ctx.ServerError("GetCommit", err) + ctx.ServerErrorAuto(err) return } blob, err := commit.GetBlobByPath(ctx, gitRepo, filePath) if err != nil { - ctx.ServerError("GetBlobByPath", err) + ctx.ServerErrorAuto(err) return } reader, err := blob.DataAsync(ctx) if err != nil { - ctx.ServerError("DataAsync", err) + ctx.ServerErrorAuto(err) return } defer reader.Close() section, err := gitdiff.BuildBlobExcerptDiffSection(filePath, reader, opts) if err != nil { - ctx.ServerError("BuildBlobExcerptDiffSection", err) + ctx.ServerErrorAuto(err) return } diffBlobExcerptData.PullIssueIndex = ctx.FormInt64("pull_issue_index") if diffBlobExcerptData.PullIssueIndex > 0 { if !ctx.Repo.Permission.CanRead(unit.TypePullRequests) { - ctx.NotFound(nil) + ctx.NotFound() return } diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go index 941f934d11d..bd92075dda8 100644 --- a/routers/web/repo/contributors.go +++ b/routers/web/repo/contributors.go @@ -31,7 +31,7 @@ func ContributorsData(ctx *context.Context) { ctx.Status(http.StatusAccepted) return } - ctx.ServerError("GetContributorStats", err) + ctx.ServerErrorAuto(err) } else { ctx.JSON(http.StatusOK, contributorStats) } diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go index db90d6e3e60..53afb45fefb 100644 --- a/routers/web/repo/download.go +++ b/routers/web/repo/download.go @@ -69,22 +69,18 @@ func ServeBlobOrLFS(ctx *context.Context, blob *git.Blob, lastModified *time.Tim func getBlobForEntry(ctx *context.Context) (*git.Blob, *time.Time) { entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetTreeEntryByPath", err) - } + ctx.ServerErrorAuto(err) return nil, nil } if entry.IsDir() || entry.IsSubModule() { - ctx.NotFound(nil) + ctx.NotFound() return nil, nil } latestCommit, err := ctx.Repo.GitRepo.GetTreePathLatestCommit(ctx, ctx.Repo.Commit.ID.String(), ctx.Repo.TreePath) if err != nil { - ctx.ServerError("GetTreePathLatestCommit", err) + ctx.ServerErrorAuto(err) return nil, nil } lastModified := &latestCommit.Committer.When @@ -104,7 +100,7 @@ func SingleDownload(ctx *context.Context) { } if err := common.ServeBlob(ctx.Base, ctx.Repo.Repository, ctx.Repo.TreePath, blob, lastModified); err != nil { - ctx.ServerError("ServeBlob", err) + ctx.ServerErrorAuto(err) } } @@ -120,7 +116,7 @@ func SingleDownloadOrLFS(ctx *context.Context) { } if err := ServeBlobOrLFS(ctx, blob, lastModified); err != nil { - ctx.ServerError("ServeBlobOrLFS", err) + ctx.ServerErrorAuto(err) } } @@ -132,15 +128,11 @@ func DownloadByID(ctx *context.Context) { blob, err := ctx.Repo.GitRepo.GetBlob(ctx.PathParam("sha")) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetBlob", err) - } + ctx.ServerErrorAuto(err) return } if err = common.ServeBlob(ctx.Base, ctx.Repo.Repository, ctx.Repo.TreePath, blob, nil); err != nil { - ctx.ServerError("ServeBlob", err) + ctx.ServerErrorAuto(err) } } @@ -152,14 +144,10 @@ func DownloadByIDOrLFS(ctx *context.Context) { blob, err := ctx.Repo.GitRepo.GetBlob(ctx.PathParam("sha")) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetBlob", err) - } + ctx.ServerErrorAuto(err) return } if err = ServeBlobOrLFS(ctx, blob, nil); err != nil { - ctx.ServerError("ServeBlob", err) + ctx.ServerErrorAuto(err) } } diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 2cf5711639c..3e8fb530c67 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -15,7 +15,6 @@ import ( "gitea.dev/models/issues" "gitea.dev/models/unit" "gitea.dev/modules/charset" - "gitea.dev/modules/git" "gitea.dev/modules/httplib" "gitea.dev/modules/log" "gitea.dev/modules/setting" @@ -58,7 +57,7 @@ func prepareEditorPageFormOptions(ctx *context.Context, editorAction string) *co commitFormOptions, err := context.PrepareCommitFormOptions(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.Permission, ctx.Repo.RefFullName) if err != nil { - ctx.ServerError("PrepareCommitFormOptions", err) + ctx.ServerErrorAuto(err) return nil } @@ -69,7 +68,7 @@ func prepareEditorPageFormOptions(ctx *context.Context, editorAction string) *co if commitFormOptions.WillSubmitToFork && !commitFormOptions.TargetRepo.CanContentChange() { ctx.Data["NotFoundPrompt"] = ctx.Locale.Tr("repo.editor.fork_not_editable") - ctx.NotFound(nil) + ctx.NotFound() } ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL() @@ -123,7 +122,7 @@ func prepareEditorCommitSubmittedForm[T forms.CommitCommonFormInterface](ctx *co commitFormOptions, err := context.PrepareCommitFormOptions(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.Permission, ctx.Repo.RefFullName) if err != nil { - ctx.ServerError("PrepareCommitFormOptions", err) + ctx.ServerErrorAuto(err) return nil } if commitFormOptions.NeedFork { @@ -135,7 +134,7 @@ func prepareEditorCommitSubmittedForm[T forms.CommitCommonFormInterface](ctx *co // check commit behavior fromBaseBranch := ctx.FormString("from_base_branch") if fromBaseBranch != "" && ctx.Repo.Repository.BaseRepo == nil { - ctx.NotFound(nil) + ctx.NotFound() return nil } commitToNewBranch := commonForm.CommitChoice == editorCommitChoiceNewBranch || fromBaseBranch != "" @@ -146,7 +145,7 @@ func prepareEditorCommitSubmittedForm[T forms.CommitCommonFormInterface](ctx *co } if !issues.CanMaintainerWriteToBranch(ctx, ctx.Repo.Permission, targetBranchName, ctx.Doer) { - ctx.NotFound(nil) + ctx.NotFound() return nil } @@ -161,7 +160,7 @@ func prepareEditorCommitSubmittedForm[T forms.CommitCommonFormInterface](ctx *co // if target branch exists, we should stop targetBranchExists, err := git_model.IsBranchExist(ctx, commitFormOptions.TargetRepo.ID, targetBranchName) if err != nil { - ctx.ServerError("IsBranchExist", err) + ctx.ServerErrorAuto(err) return nil } else if targetBranchExists { if fromBaseBranch != "" { @@ -230,24 +229,20 @@ func redirectForCommitChoice[T any](ctx *context.Context, parsed *preparedEditor func editFileOpenExisting(ctx *context.Context) (prefetch []byte, dataRc io.ReadCloser, fInfo *fileInfo) { entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - HandleGitError(ctx, "GetTreeEntryByPath", err) + HandleGitError(ctx, err) return nil, nil, nil } // No way to edit a directory online. if entry.IsDir() { - ctx.NotFound(nil) + ctx.NotFound() return nil, nil, nil } blob := entry.Blob(ctx.Repo.GitRepo) buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, blob) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("getFileReader", err) - } + ctx.ServerErrorAuto(err) return nil, nil, nil } @@ -255,11 +250,11 @@ func editFileOpenExisting(ctx *context.Context) (prefetch []byte, dataRc io.Read lfsLock, err := git_model.GetTreePathLock(ctx, ctx.Repo.Repository.ID, ctx.Repo.TreePath) if err != nil { _ = dataRc.Close() - ctx.ServerError("GetTreePathLock", err) + ctx.ServerErrorAuto(err) return nil, nil, nil } else if lfsLock != nil && lfsLock.OwnerID != ctx.Doer.ID { _ = dataRc.Close() - ctx.NotFound(nil) + ctx.NotFound() return nil, nil, nil } } @@ -316,7 +311,7 @@ func EditFile(ctx *context.Context) { if ctx.Data["NotEditableReason"] == nil { buf, err := io.ReadAll(io.MultiReader(bytes.NewReader(prefetch), dataRc)) if err != nil { - ctx.ServerError("ReadAll", err) + ctx.ServerErrorAuto(err) return } ctx.Data["FileContent"] = string(charset.ToUTF8(buf, charset.ConvertOpts{KeepBOM: true, ErrorReturnOrigin: true})) @@ -409,7 +404,7 @@ func DeleteFilePost(ctx *context.Context) { // Check if the path is a directory entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, treePath) if err != nil { - ctx.ServerError("GetTreeEntryByPath", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/editor_cherry_pick.go b/routers/web/repo/editor_cherry_pick.go index 8d133de867d..a61a5eea8ae 100644 --- a/routers/web/repo/editor_cherry_pick.go +++ b/routers/web/repo/editor_cherry_pick.go @@ -24,7 +24,7 @@ func CherryPick(ctx *context.Context) { ctx.Data["FromCommitID"] = fromCommitID cherryPickCommit, err := ctx.Repo.GitRepo.GetCommit(ctx, fromCommitID) if err != nil { - HandleGitError(ctx, "GetCommit", err) + HandleGitError(ctx, err) return } diff --git a/routers/web/repo/editor_preview.go b/routers/web/repo/editor_preview.go index 5b4fb5bf740..c98689583da 100644 --- a/routers/web/repo/editor_preview.go +++ b/routers/web/repo/editor_preview.go @@ -21,7 +21,7 @@ func DiffPreviewPost(ctx *context.Context) { entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, treePath) if err != nil { - ctx.ServerError("GetTreeEntryByPath", err) + ctx.ServerErrorAuto(err) return } else if entry.IsDir() { ctx.HTTPError(http.StatusUnprocessableEntity) @@ -30,12 +30,12 @@ func DiffPreviewPost(ctx *context.Context) { oldContent, err := entry.Blob(ctx.Repo.GitRepo).GetBlobContent(ctx, setting.UI.MaxDisplayFileSize) if err != nil { - ctx.ServerError("GetBlobContent", err) + ctx.ServerErrorAuto(err) return } diff, err := files_service.GetDiffPreview(ctx, ctx.Repo.Repository, ctx.Repo.BranchName, treePath, oldContent, newContent) if err != nil { - ctx.ServerError("GetDiffPreview", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/editor_uploader.go b/routers/web/repo/editor_uploader.go index a6d5512b9c2..fb4c45c71f1 100644 --- a/routers/web/repo/editor_uploader.go +++ b/routers/web/repo/editor_uploader.go @@ -18,7 +18,7 @@ import ( func UploadFileToServer(ctx *context.Context) { file, header, err := ctx.Req.FormFile("file") if err != nil { - ctx.ServerError("FormFile", err) + ctx.ServerErrorAuto(err) return } defer file.Close() @@ -45,7 +45,7 @@ func UploadFileToServer(ctx *context.Context) { uploaded, err := repo_model.NewUpload(ctx, name, buf, file) if err != nil { - ctx.ServerError("NewUpload", err) + ctx.ServerErrorAuto(err) return } @@ -56,7 +56,7 @@ func UploadFileToServer(ctx *context.Context) { func RemoveUploadFileFromServer(ctx *context.Context) { fileUUID := ctx.FormString("file") if err := repo_model.DeleteUploadByUUID(ctx, fileUUID); err != nil { - ctx.ServerError("DeleteUploadByUUID", err) + ctx.ServerErrorAuto(err) return } ctx.Status(http.StatusNoContent) diff --git a/routers/web/repo/fork.go b/routers/web/repo/fork.go index 21bc93024cb..0161bd48ad6 100644 --- a/routers/web/repo/fork.go +++ b/routers/web/repo/fork.go @@ -37,12 +37,12 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { if forkRepo.IsEmpty { log.Trace("Empty repository %-v", forkRepo) - ctx.NotFound(nil) + ctx.NotFound() return nil } if err := forkRepo.LoadOwner(ctx); err != nil { - ctx.ServerError("LoadOwner", err) + ctx.ServerErrorAuto(err) return nil } @@ -55,7 +55,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { ownedOrgs, err := organization.GetOrgsCanCreateRepoByUserID(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("GetOrgsCanCreateRepoByUserID", err) + ctx.ServerErrorAuto(err) return nil } var orgs []*organization.Organization @@ -79,7 +79,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { } traverseParentRepo, err = repo_model.GetRepositoryByID(ctx, traverseParentRepo.ForkID) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return nil } } @@ -110,7 +110,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { ExcludeBranchNames: []string{ctx.Repo.Repository.DefaultBranch}, }) if err != nil { - ctx.ServerError("FindBranchNames", err) + ctx.ServerErrorAuto(err) return nil } ctx.Data["Branches"] = append([]string{ctx.Repo.Repository.DefaultBranch}, branches...) @@ -168,7 +168,7 @@ func ForkPost(ctx *context.Context) { } traverseParentRepo, err = repo_model.GetRepositoryByID(ctx, traverseParentRepo.ForkID) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } } @@ -177,7 +177,7 @@ func ForkPost(ctx *context.Context) { if ctxUser.IsOrganization() { isAllowedToFork, err := organization.OrgFromUser(ctxUser).CanCreateOrgRepo(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("CanCreateOrgRepo", err) + ctx.ServerErrorAuto(err) return } else if !isAllowedToFork { ctx.HTTPError(http.StatusForbidden) @@ -219,7 +219,7 @@ func ForkRepoTo(ctx *context.Context, owner *user_model.User, forkOpts repo_serv case errors.Is(err, user_model.ErrBlockedUser): ctx.JSONError(ctx.Tr("repo.fork.blocked_user")) default: - ctx.ServerError("ForkPost", err) + ctx.ServerErrorAuto(err) } return nil } diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go index 04cde5c474c..6f133fce9cd 100644 --- a/routers/web/repo/githttp.go +++ b/routers/web/repo/githttp.go @@ -110,7 +110,7 @@ func httpBase(ctx *context.Context, optGitService ...string) *serviceHandler { repo, err := repo_model.GetRepositoryByName(ctx, owner.ID, repoName) if err != nil { if !repo_model.IsErrRepoNotExist(err) { - ctx.ServerError("GetRepositoryByName", err) + ctx.ServerErrorAuto(err) return nil } @@ -138,7 +138,7 @@ func httpBase(ctx *context.Context, optGitService ...string) *serviceHandler { if !canAnonymousPull && ctx.Doer == nil { anonPerm, err := access_model.GetDoerRepoPermission(ctx, repo, nil) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return nil } canAnonymousPull = anonPerm.CanAccess(accessMode, unitType) @@ -172,7 +172,7 @@ func httpBase(ctx *context.Context, optGitService ...string) *serviceHandler { ctx.PlainText(http.StatusUnauthorized, "Users with two-factor authentication enabled cannot perform HTTP/HTTPS operations via plain username and password. Please create and use a personal access token on the user settings page") return nil } else if !auth_model.IsErrTwoFactorNotEnrolled(err) { - ctx.ServerError("IsErrTwoFactorNotEnrolled", err) + ctx.ServerErrorAuto(err) return nil } } @@ -190,7 +190,7 @@ func httpBase(ctx *context.Context, optGitService ...string) *serviceHandler { p, err := access_model.GetDoerRepoPermission(ctx, repo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return nil } @@ -252,7 +252,7 @@ func httpBase(ctx *context.Context, optGitService ...string) *serviceHandler { ctx.PlainText(http.StatusForbidden, "repository wiki is disabled") return nil } - ctx.ServerError("GetUnit(UnitTypeWiki) for "+repo.FullName(), err) + ctx.ServerErrorAuto(err) return nil } } @@ -478,7 +478,7 @@ func GetInfoRefs(ctx *context.Context) { // it's said that some legacy git clients will send requests to "/info/refs" without "service" parameter, // although there should be no such case client in the modern days. TODO: not quite sure why we need this UpdateServerInfo logic if err := git.UpdateServerInfo(ctx, repo); err != nil { - ctx.ServerError("UpdateServerInfo", err) + ctx.ServerErrorAuto(err) return } h.sendFile(ctx, "text/plain; charset=utf-8", "info/refs") @@ -496,7 +496,7 @@ func GetInfoRefs(ctx *context.Context) { repoExists, err := git.IsRepositoryExist(ctx, repo) if err != nil { - ctx.ServerError("IsRepositoryExist", err) + ctx.ServerErrorAuto(err) return } @@ -514,7 +514,7 @@ func GetInfoRefs(ctx *context.Context) { cmd = cmd.AddArguments("--stateless-rpc", "--advertise-refs", ".").WithEnv(gitCmdEnvs) refs, _, err := cmd.WithRepo(repo).RunStdBytes(ctx) if err != nil { - ctx.ServerError("RunGitServiceAdvertiseRefs", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go index 49d79ec6926..4046f989b7e 100644 --- a/routers/web/repo/helper.go +++ b/routers/web/repo/helper.go @@ -8,12 +8,10 @@ import ( "gitea.dev/services/context" ) -func HandleGitError(ctx *context.Context, msg string, err error) { +func HandleGitError(ctx *context.Context, err error) { if git.IsErrNotExist(err) { ctx.Data["NotFoundPrompt"] = ctx.Locale.Tr("repo.tree_path_not_found", ctx.Repo.TreePath, ctx.Repo.RefTypeNameSubURL()) ctx.Data["NotFoundGoBackURL"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL() - ctx.NotFound(err) - } else { - ctx.ServerError(msg, err) } + ctx.ServerErrorAuto(err) } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 2d3f5fe2ac4..46a1854f989 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -77,7 +77,7 @@ var IssueTemplateCandidates = []string{ func MustEnableIssues(ctx *context.Context) { if !ctx.Repo.Permission.CanRead(unit.TypeIssues) && !ctx.Repo.Permission.CanRead(unit.TypeExternalTracker) { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -94,7 +94,7 @@ func MustEnableIssues(ctx *context.Context) { // MustAllowPulls check if repository enable pull requests and user have right to do that func MustAllowPulls(ctx *context.Context) { if !ctx.Repo.Repository.CanEnablePulls() || !ctx.Repo.Permission.CanRead(unit.TypePullRequests) { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -121,7 +121,7 @@ func retrieveProjectsInternal(ctx *context.Context, repo *repo_model.Repository) Type: project_model.TypeRepository, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerErrorAuto(err) return nil, nil } closedProjects, err = db.Find[project_model.Project](ctx, project_model.SearchOptions{ @@ -131,7 +131,7 @@ func retrieveProjectsInternal(ctx *context.Context, repo *repo_model.Repository) Type: project_model.TypeRepository, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerErrorAuto(err) return nil, nil } } @@ -144,7 +144,7 @@ func retrieveProjectsInternal(ctx *context.Context, repo *repo_model.Repository) Type: repoOwnerType, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerErrorAuto(err) return nil, nil } openProjects = append(openProjects, openProjects2...) @@ -155,7 +155,7 @@ func retrieveProjectsInternal(ctx *context.Context, repo *repo_model.Repository) Type: repoOwnerType, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerErrorAuto(err) return nil, nil } closedProjects = append(closedProjects, closedProjects2...) @@ -167,17 +167,17 @@ func retrieveProjectsInternal(ctx *context.Context, repo *repo_model.Repository) func GetActionIssue(ctx *context.Context, accessModeOpt ...perm.AccessMode) *issues_model.Issue { issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerErrorAuto(err) return nil } issue.Repo = ctx.Repo.Repository accessMode := util.OptionalArg(accessModeOpt, perm.AccessModeRead) if !ctx.Repo.Permission.CanAccess(accessMode, util.Iif(issue.IsPull, unit.TypePullRequests, unit.TypeIssues)) { - ctx.NotFound(nil) + ctx.NotFound() return nil } if err = issue.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return nil } return issue @@ -187,21 +187,21 @@ func getActionIssues(ctx *context.Context, accessMode perm.AccessMode) issues_mo issueIDs := ctx.FormStringInt64s("issue_ids") issues, err := issues_model.GetIssuesByIDs(ctx, issueIDs) if err != nil { - ctx.ServerError("GetIssuesByIDs", err) + ctx.ServerErrorAuto(err) return nil } for _, issue := range issues { if issue.RepoID != ctx.Repo.Repository.ID { - ctx.NotFound(errors.New("some issue's RepoID is incorrect")) + ctx.NotFound() return nil } issue.Repo = ctx.Repo.Repository if !ctx.Repo.Permission.CanAccess(accessMode, util.Iif(issue.IsPull, unit.TypePullRequests, unit.TypeIssues)) { - ctx.NotFound(nil) + ctx.NotFound() return nil } if err = issue.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return nil } } @@ -259,7 +259,7 @@ func UpdateIssueTitle(ctx *context.Context) { } if err := issue_service.ChangeTitle(ctx, issue, ctx.Doer, title); err != nil { - ctx.ServerError("ChangeTitle", err) + ctx.ServerErrorAuto(err) return } @@ -283,7 +283,7 @@ func UpdateIssueRef(ctx *context.Context) { ref := ctx.FormTrim("ref") if err := issue_service.ChangeIssueRef(ctx, issue, ctx.Doer, ref); err != nil { - ctx.ServerError("ChangeRef", err) + ctx.ServerErrorAuto(err) return } @@ -314,7 +314,7 @@ func UpdateIssueContent(ctx *context.Context) { ctx.JSONError(ctx.Tr("repo.issues.edit.already_changed")) } } else { - ctx.ServerError("ChangeContent", err) + ctx.ServerErrorAuto(err) } return } @@ -322,7 +322,7 @@ func UpdateIssueContent(ctx *context.Context) { // when update the request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates if !ctx.FormBool("ignore_attachments") { if err := updateAttachments(ctx, issue, ctx.FormStrings("files[]")); err != nil { - ctx.ServerError("UpdateAttachments", err) + ctx.ServerErrorAuto(err) return } } @@ -332,7 +332,7 @@ func UpdateIssueContent(ctx *context.Context) { }) content, err := markdown.RenderString(rctx, issue.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } @@ -348,7 +348,7 @@ func UpdateIssueDeadline(ctx *context.Context) { issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) } else { ctx.HTTPError(http.StatusInternalServerError, "GetIssueByIndex", err.Error()) } @@ -387,14 +387,14 @@ func UpdateIssueMilestone(ctx *context.Context) { var err error issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID) if err != nil { - ctx.ServerError("GetMilestoneByRepoID", err) + ctx.ServerErrorAuto(err) return } } else { issue.Milestone = nil } if err := issue_service.ChangeMilestoneAssign(ctx, issue, ctx.Doer, oldMilestoneID); err != nil { - ctx.ServerError("ChangeMilestoneAssign", err) + ctx.ServerErrorAuto(err) return } } @@ -416,19 +416,19 @@ func UpdateIssueAssignee(ctx *context.Context) { switch action { case "clear": if err := issue_service.DeleteNotPassedAssignee(ctx, issue, ctx.Doer, []*user_model.User{}); err != nil { - ctx.ServerError("ClearAssignees", err) + ctx.ServerErrorAuto(err) return } default: assignee, err := user_model.GetUserByID(ctx, assigneeID) if err != nil { - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } valid, err := access_model.CanBeAssigned(ctx, assignee, issue.Repo) if err != nil { - ctx.ServerError("canBeAssigned", err) + ctx.ServerErrorAuto(err) return } if !valid { @@ -438,7 +438,7 @@ func UpdateIssueAssignee(ctx *context.Context) { _, _, err = issue_service.ToggleAssigneeWithNotify(ctx, issue, ctx.Doer, assigneeID) if err != nil { - ctx.ServerError("ToggleAssignee", err) + ctx.ServerErrorAuto(err) return } } @@ -474,7 +474,7 @@ func ChangeIssueReaction(ctx *context.Context) { reaction, err := issue_service.CreateIssueReaction(ctx, ctx.Doer, issue, form.Content) if err != nil { if issues_model.IsErrForbiddenIssueReaction(err) || errors.Is(err, user_model.ErrBlockedUser) { - ctx.ServerError("ChangeIssueReaction", err) + ctx.ServerErrorAuto(err) return } log.Info("CreateIssueReaction: %s", err) @@ -490,7 +490,7 @@ func ChangeIssueReaction(ctx *context.Context) { log.Trace("Reaction for issue created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, reaction.ID) case "unreact": if err := issues_model.DeleteIssueReaction(ctx, ctx.Doer.ID, issue.ID, form.Content); err != nil { - ctx.ServerError("DeleteIssueReaction", err) + ctx.ServerErrorAuto(err) return } @@ -503,7 +503,7 @@ func ChangeIssueReaction(ctx *context.Context) { log.Trace("Reaction for issue removed: %d/%d", ctx.Repo.Repository.ID, issue.ID) default: - ctx.NotFound(nil) + ctx.NotFound() return } @@ -517,7 +517,7 @@ func renderReactions(ctx *context.Context, actionURL string, reactions issues_mo "AllowedReactions": allowedReactions, }) if err != nil { - ctx.ServerError("RenderToHTML", err) + ctx.ServerErrorAuto(err) return } ctx.JSON(http.StatusOK, map[string]any{"html": html}) @@ -593,7 +593,7 @@ func attachmentsHTML(ctx *context.Context, attachments []*repo_model.Attachment, "Content": content, }) if err != nil { - ctx.ServerError("attachmentsHTML.HTMLString", err) + ctx.ServerErrorAuto(err) return "" } return attachHTML diff --git a/routers/web/repo/issue_comment.go b/routers/web/repo/issue_comment.go index 25a88bd8879..4523c9f79ed 100644 --- a/routers/web/repo/issue_comment.go +++ b/routers/web/repo/issue_comment.go @@ -57,7 +57,7 @@ func NewComment(ctx *context.Context) { if errors.Is(err, user_model.ErrBlockedUser) { ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_user")) } else { - ctx.ServerError("CreateIssueComment", err) + ctx.ServerErrorAuto(err) } return } @@ -101,7 +101,7 @@ func NewComment(ctx *context.Context) { return } if err := pull_service.PushToBaseRepo(ctx, pull); err != nil { - ctx.ServerError("PushToBaseRepo", err) + ctx.ServerErrorAuto(err) return } } @@ -123,7 +123,7 @@ func NewComment(ctx *context.Context) { } } else { if err := stopTimerIfAvailable(ctx, ctx.Doer, issue); err != nil { - ctx.ServerError("stopTimerIfAvailable", err) + ctx.ServerErrorAuto(err) return } log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed) @@ -142,11 +142,11 @@ func NewComment(ctx *context.Context) { func getRepoIssueComment(ctx *context.Context, commentID int64) *issues_model.Comment { comment, err := issues_model.GetCommentWithRepoID(ctx, ctx.Repo.Repository.ID, commentID) if err != nil { - ctx.ServerError("GetCommentWithRepoID", err) + ctx.ServerErrorAuto(err) return nil } if !ctx.Repo.Permission.CanReadIssuesOrPulls(comment.Issue.IsPull) { - ctx.NotFound(nil) + ctx.NotFound() return nil } return comment @@ -192,21 +192,21 @@ func UpdateCommentContent(ctx *context.Context) { } else if errors.Is(err, issues_model.ErrCommentAlreadyChanged) { ctx.JSONError(ctx.Tr("repo.comments.edit.already_changed")) } else { - ctx.ServerError("UpdateComment", err) + ctx.ServerErrorAuto(err) } return } } if err := comment.LoadAttachments(ctx); err != nil { - ctx.ServerError("LoadAttachments", err) + ctx.ServerErrorAuto(err) return } // when the update request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates if !ctx.FormBool("ignore_attachments") { if err := updateAttachments(ctx, comment, ctx.FormStrings("files[]")); err != nil { - ctx.ServerError("UpdateAttachments", err) + ctx.ServerErrorAuto(err) return } } @@ -219,7 +219,7 @@ func UpdateCommentContent(ctx *context.Context) { var err error renderedContent, err = markdown.RenderString(rctx, comment.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } } @@ -239,7 +239,7 @@ func DeleteComment(ctx *context.Context) { } if err := issue_service.DeleteComment(ctx, ctx.Doer, comment); err != nil { - ctx.ServerError("DeleteComment", err) + ctx.ServerErrorAuto(err) return } @@ -259,7 +259,7 @@ func ChangeCommentReaction(ctx *context.Context) { reaction, err := issue_service.CreateCommentReaction(ctx, ctx.Doer, comment, form.Content) if err != nil { if issues_model.IsErrForbiddenIssueReaction(err) || errors.Is(err, user_model.ErrBlockedUser) { - ctx.ServerError("ChangeIssueReaction", err) + ctx.ServerErrorAuto(err) return } log.Info("CreateCommentReaction: %s", err) @@ -275,7 +275,7 @@ func ChangeCommentReaction(ctx *context.Context) { log.Trace("Reaction for comment created: %d/%d/%d/%d", ctx.Repo.Repository.ID, comment.Issue.ID, comment.ID, reaction.ID) case "unreact": if err := issues_model.DeleteCommentReaction(ctx, ctx.Doer.ID, comment.Issue.ID, comment.ID, form.Content); err != nil { - ctx.ServerError("DeleteCommentReaction", err) + ctx.ServerErrorAuto(err) return } @@ -288,7 +288,7 @@ func ChangeCommentReaction(ctx *context.Context) { log.Trace("Reaction for comment removed: %d/%d/%d", ctx.Repo.Repository.ID, comment.Issue.ID, comment.ID) default: - ctx.NotFound(nil) + ctx.NotFound() return } @@ -303,13 +303,13 @@ func GetCommentAttachments(ctx *context.Context) { } if !comment.Type.HasAttachmentSupport() { - ctx.ServerError("GetCommentAttachments", fmt.Errorf("comment type %v does not support attachments", comment.Type)) + ctx.ServerErrorAuto(fmt.Errorf("comment type %v does not support attachments", comment.Type)) return } attachments := make([]*api.Attachment, 0) if err := comment.LoadAttachments(ctx); err != nil { - ctx.ServerError("LoadAttachments", err) + ctx.ServerErrorAuto(err) return } for i := 0; i < len(comment.Attachments); i++ { diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index f085ba2ee09..de26c972e0a 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -186,7 +186,7 @@ func SoftDeleteContentHistory(ctx *context.Context) { return } if ctx.Doer == nil { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -202,11 +202,11 @@ func SoftDeleteContentHistory(ctx *context.Context) { return } if history.IssueID != issue.ID { - ctx.NotFound(issues_model.ErrCommentNotExist{}) + ctx.NotFound() return } if history.CommentID != commentID { - ctx.NotFound(issues_model.ErrCommentNotExist{}) + ctx.NotFound() return } if commentID != 0 { @@ -215,7 +215,7 @@ func SoftDeleteContentHistory(ctx *context.Context) { return } if comment.IssueID != issue.ID { - ctx.NotFound(issues_model.ErrCommentNotExist{}) + ctx.NotFound() return } } diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index 1223f1868c3..7d5b5012242 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -15,7 +15,7 @@ func AddDependency(ctx *context.Context) { issueIndex := ctx.PathParamInt64("index") issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, issueIndex) if err != nil { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerErrorAuto(err) return } @@ -28,7 +28,7 @@ func AddDependency(ctx *context.Context) { depID := ctx.FormInt64("newDependency") if err = issue.LoadRepo(ctx); err != nil { - ctx.ServerError("LoadRepo", err) + ctx.ServerErrorAuto(err) return } @@ -46,13 +46,13 @@ func AddDependency(ctx *context.Context) { return } if err := dep.LoadRepo(ctx); err != nil { - ctx.ServerError("loadRepo", err) + ctx.ServerErrorAuto(err) return } // Can ctx.Doer read issues in the dep repo? depRepoPerm, err := access_model.GetDoerRepoPermission(ctx, dep.Repo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } if !depRepoPerm.CanReadIssuesOrPulls(dep.IsPull) { @@ -75,7 +75,7 @@ func AddDependency(ctx *context.Context) { ctx.JSONError(ctx.Tr("repo.issues.dependency.add_error_cannot_create_circular")) return } else if err != nil { - ctx.ServerError("CreateOrUpdateIssueDependency", err) + ctx.ServerErrorAuto(err) return } ctx.JSONOK() @@ -86,7 +86,7 @@ func RemoveDependency(ctx *context.Context) { issueIndex := ctx.PathParamInt64("index") issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, issueIndex) if err != nil { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerErrorAuto(err) return } @@ -99,7 +99,7 @@ func RemoveDependency(ctx *context.Context) { depID := ctx.FormInt64("removeDependencyID") if err = issue.LoadRepo(ctx); err != nil { - ctx.ServerError("LoadRepo", err) + ctx.ServerErrorAuto(err) return } @@ -121,7 +121,7 @@ func RemoveDependency(ctx *context.Context) { // Dependency dep, err := issues_model.GetIssueByID(ctx, depID) if err != nil { - ctx.ServerError("GetIssueByID", err) + ctx.ServerErrorAuto(err) return } @@ -130,12 +130,12 @@ func RemoveDependency(ctx *context.Context) { // doer can read the dependency's repository. if issue.RepoID != dep.RepoID { if err := dep.LoadRepo(ctx); err != nil { - ctx.ServerError("loadRepo", err) + ctx.ServerErrorAuto(err) return } depRepoPerm, err := access_model.GetDoerRepoPermission(ctx, dep.Repo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } if !depRepoPerm.CanReadIssuesOrPulls(dep.IsPull) { @@ -149,7 +149,7 @@ func RemoveDependency(ctx *context.Context) { ctx.JSONError(ctx.Tr("repo.issues.dependency.add_error_dep_not_exist")) return } else if err != nil { - ctx.ServerError("RemoveIssueDependency", err) + ctx.ServerErrorAuto(err) return } ctx.JSONOK() diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index bfde7fc9827..795e91b4443 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -51,7 +51,7 @@ func InitializeLabels(ctx *context.Context) { ctx.Redirect(ctx.Repo.RepoLink + "/labels") return } - ctx.ServerError("InitializeLabels", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(ctx.Repo.RepoLink + "/labels") @@ -61,7 +61,7 @@ func InitializeLabels(ctx *context.Context) { func RetrieveLabelsForList(ctx *context.Context) { labels, err := issues_model.GetLabelsByRepoID(ctx, ctx.Repo.Repository.ID, ctx.FormString("sort"), db.ListOptions{}) if err != nil { - ctx.ServerError("RetrieveLabelsForList.GetLabels", err) + ctx.ServerErrorAuto(err) return } @@ -74,7 +74,7 @@ func RetrieveLabelsForList(ctx *context.Context) { if ctx.Repo.Owner.IsOrganization() { orgLabels, err := issues_model.GetLabelsByOrgID(ctx, ctx.Repo.Owner.ID, ctx.FormString("sort"), db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByOrgID", err) + ctx.ServerErrorAuto(err) return } for _, l := range orgLabels { @@ -94,13 +94,13 @@ func RetrieveLabelsForList(ctx *context.Context) { org, err := organization.GetOrgByName(ctx, ctx.Repo.Owner.LowerName) if err != nil { - ctx.ServerError("GetOrgByName", err) + ctx.ServerErrorAuto(err) return } if ctx.Doer != nil { ctx.Org.IsOwner, err = org.IsOwnedBy(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("org.IsOwnedBy", err) + ctx.ServerErrorAuto(err) return } ctx.Org.OrgLink = org.AsUser().OrganisationLink() @@ -128,7 +128,7 @@ func NewLabel(ctx *context.Context) { Color: form.Color, } if err := issues_model.NewLabel(ctx, l); err != nil { - ctx.ServerError("NewLabel", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(ctx.Repo.RepoLink + "/labels") @@ -146,7 +146,7 @@ func UpdateLabel(ctx *context.Context) { ctx.JSONErrorNotFound() return } else if err != nil { - ctx.ServerError("GetLabelInRepoByID", err) + ctx.ServerErrorAuto(err) return } @@ -157,7 +157,7 @@ func UpdateLabel(ctx *context.Context) { l.Color = form.Color l.SetArchived(form.IsArchived) if err := issues_model.UpdateLabel(ctx, l); err != nil { - ctx.ServerError("UpdateLabel", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(ctx.Repo.RepoLink + "/labels") @@ -185,7 +185,7 @@ func UpdateIssueLabel(ctx *context.Context) { case "clear": for _, issue := range issues { if err := issue_service.ClearLabels(ctx, issue, ctx.Doer); err != nil { - ctx.ServerError("ClearLabels", err) + ctx.ServerErrorAuto(err) return } } @@ -197,7 +197,7 @@ func UpdateIssueLabel(ctx *context.Context) { if errors.Is(err, util.ErrNotExist) { ctx.HTTPError(http.StatusNotFound, "GetLabelByID") } else { - ctx.ServerError("GetLabelByID", err) + ctx.ServerErrorAuto(err) } return } @@ -222,14 +222,14 @@ func UpdateIssueLabel(ctx *context.Context) { if action == "attach" { for _, issue := range issues { if err = issue_service.AddLabel(ctx, issue, ctx.Doer, label); err != nil { - ctx.ServerError("AddLabel", err) + ctx.ServerErrorAuto(err) return } } } else { for _, issue := range issues { if err = issue_service.RemoveLabel(ctx, issue, ctx.Doer, label); err != nil { - ctx.ServerError("RemoveLabel", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go index 2cba3bb0cf4..27d811a4b6e 100644 --- a/routers/web/repo/issue_list.go +++ b/routers/web/repo/issue_list.go @@ -64,7 +64,7 @@ func SearchGlobalIssues(ctx *context.Context) { if errors.Is(err, util.ErrNotExist) || errors.Is(err, util.ErrInvalidArgument) { ctx.HTTPError(http.StatusBadRequest, err.Error()) } else { - ctx.ServerError("SearchIssuesRepoIDs", err) + ctx.ServerErrorAuto(err) } return } @@ -81,7 +81,7 @@ func SearchGlobalIssues(ctx *context.Context) { } includedAnyLabels, err = issues_model.GetLabelIDsByNames(ctx, includedLabelNames) if err != nil { - ctx.ServerError("GetLabelIDsByNames", err) + ctx.ServerErrorAuto(err) return } } @@ -95,7 +95,7 @@ func SearchGlobalIssues(ctx *context.Context) { } includedMilestones, err = issues_model.GetMilestoneIDsByNames(ctx, includedMilestoneNames) if err != nil { - ctx.ServerError("GetMilestoneIDsByNames", err) + ctx.ServerErrorAuto(err) return } } @@ -159,12 +159,12 @@ func SearchGlobalIssues(ctx *context.Context) { ids, total, err := issue_indexer.SearchIssues(ctx, searchOpt) if err != nil { - ctx.ServerError("SearchIssues", err) + ctx.ServerErrorAuto(err) return } issues, err := issues_model.GetIssuesByIDs(ctx, ids, true) if err != nil { - ctx.ServerError("FindIssuesByIDs", err) + ctx.ServerErrorAuto(err) return } @@ -180,7 +180,7 @@ func getUserIDForFilter(ctx *context.Context, queryName string) int64 { user, err := user_model.GetUserByName(ctx, userName) if user_model.IsErrUserNotExist(err) { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return 0 } @@ -321,7 +321,7 @@ func BatchDeleteIssues(ctx *context.Context) { } for _, issue := range issues { if err := issue_service.DeleteIssue(ctx, ctx.Doer, issue); err != nil { - ctx.ServerError("DeleteIssue", err) + ctx.ServerErrorAuto(err) return } } @@ -342,11 +342,11 @@ func UpdateIssueStatus(ctx *context.Context) { } if _, err := issues.LoadRepositories(ctx); err != nil { - ctx.ServerError("LoadRepositories", err) + ctx.ServerErrorAuto(err) return } if err := issues.LoadPullRequests(ctx); err != nil { - ctx.ServerError("LoadPullRequests", err) + ctx.ServerErrorAuto(err) return } @@ -360,12 +360,12 @@ func UpdateIssueStatus(ctx *context.Context) { ctx.JSONError(ctx.Tr("repo.issues.dependency.issue_batch_close_blocked", issue.Index)) return } - ctx.ServerError("CloseIssue", err) + ctx.ServerErrorAuto(err) return } } else if action == "open" && issue.IsClosed { if err := issue_service.ReopenIssue(ctx, issue, ctx.Doer, ""); err != nil { - ctx.ServerError("ReopenIssue", err) + ctx.ServerErrorAuto(err) return } } @@ -393,7 +393,7 @@ func renderMilestones(ctx *context.Context, projectID int64) { ProjectID: projectID, }) if err != nil { - ctx.ServerError("GetAllRepoMilestones", err) + ctx.ServerErrorAuto(err) return } @@ -469,7 +469,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI keywordMatchedIssueIDs, _, err = issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, statsOpts)) if err != nil { if issue_indexer.IsAvailable(ctx) { - ctx.ServerError("issueIDsFromSearch", err) + ctx.ServerErrorAuto(err) return } ctx.Data["IssueIndexerUnavailable"] = true @@ -489,7 +489,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI // Or the keyword is empty, so it doesn't need issueIDs as filter, just get issueStats with statsOpts. issueStats, err = issues_model.GetIssueStats(ctx, statsOpts) if err != nil { - ctx.ServerError("GetIssueStats", err) + ctx.ServerErrorAuto(err) return } } @@ -504,7 +504,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI if repo.IsTimetrackerEnabled(ctx) { totalTrackedTime, err := issues_model.GetIssueTotalTrackedTime(ctx, statsOpts, isShowClosed) if err != nil { - ctx.ServerError("GetIssueTotalTrackedTime", err) + ctx.ServerErrorAuto(err) return } ctx.Data["TotalTrackedTime"] = totalTrackedTime @@ -544,26 +544,26 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI IssueIDs: keywordMatchedIssueIDs, }) if err != nil { - ctx.ServerError("DBIndexer.Search", err) + ctx.ServerErrorAuto(err) return } issueIDs := issue_indexer.SearchResultToIDSlice(searchResult) issues, err = issues_model.GetIssuesByIDs(ctx, issueIDs, true) if err != nil { - ctx.ServerError("GetIssuesByIDs", err) + ctx.ServerErrorAuto(err) return } } approvalCounts, err := issues.GetApprovalCounts(ctx) if err != nil { - ctx.ServerError("ApprovalCounts", err) + ctx.ServerErrorAuto(err) return } if ctx.IsSigned { if err := issues.LoadIsRead(ctx, ctx.Doer.ID); err != nil { - ctx.ServerError("LoadIsRead", err) + ctx.ServerErrorAuto(err) return } } else { @@ -574,12 +574,12 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, ctx.Doer, issues) if err != nil { - ctx.ServerError("GetIssuesAllCommitStatus", err) + ctx.ServerErrorAuto(err) return } if err := issues.LoadAttributes(ctx); err != nil { - ctx.ServerError("issues.LoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -590,7 +590,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI // Get assignees. assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo) if err != nil { - ctx.ServerError("GetRepoAssignees", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers) @@ -624,7 +624,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID int64, projectI pinned, err := issues_model.GetPinnedIssues(ctx, repo.ID, isPullOption.Value()) if err != nil { - ctx.ServerError("GetPinnedIssues", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/issue_lock.go b/routers/web/repo/issue_lock.go index 6e09b576e0e..e5af8f638d7 100644 --- a/routers/web/repo/issue_lock.go +++ b/routers/web/repo/issue_lock.go @@ -30,7 +30,7 @@ func LockIssue(ctx *context.Context) { Issue: issue, Reason: form.Reason, }); err != nil { - ctx.ServerError("LockIssue", err) + ctx.ServerErrorAuto(err) return } @@ -53,7 +53,7 @@ func UnlockIssue(ctx *context.Context) { Doer: ctx.Doer, Issue: issue, }); err != nil { - ctx.ServerError("UnlockIssue", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/issue_new.go b/routers/web/repo/issue_new.go index 936c709fa0a..fdaead59317 100644 --- a/routers/web/repo/issue_new.go +++ b/routers/web/repo/issue_new.go @@ -100,7 +100,7 @@ func NewIssue(ctx *context.Context) { restriction := ctx.Repo.Repository.MustGetUnit(ctx, unit.TypeIssues).IssuesConfig().CreationRestriction err := issue_service.CheckCreationRestriction(ctx.Repo.Permission, unit.TypeIssues, restriction) if err != nil { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -131,7 +131,7 @@ func NewIssue(ctx *context.Context) { tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetTagNamesByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Tags"] = tags @@ -218,7 +218,7 @@ func DeleteIssue(ctx *context.Context) { } if err := issue_service.DeleteIssue(ctx, ctx.Doer, issue); err != nil { - ctx.ServerError("DeleteIssueByID", err) + ctx.ServerErrorAuto(err) return } @@ -256,7 +256,7 @@ func ValidateRepoMetasForCreateIssue(ctx *context.Context, form forms.CreateIssu inputLabelIDs := ctx.FormStringInt64s("label_ids") candidateLabels := toSet(pageMetaData.LabelsData.AllLabels, func(label *issues_model.Label) int64 { return label.ID }) if len(inputLabelIDs) > 0 && !candidateLabels.Contains(inputLabelIDs...) { - ctx.NotFound(nil) + ctx.NotFound() return ret } pageMetaData.LabelsData.SetSelectedLabelIDs(inputLabelIDs) @@ -264,7 +264,7 @@ func ValidateRepoMetasForCreateIssue(ctx *context.Context, form forms.CreateIssu allMilestones := append(slices.Clone(pageMetaData.MilestonesData.OpenMilestones), pageMetaData.MilestonesData.ClosedMilestones...) candidateMilestones := toSet(allMilestones, func(milestone *issues_model.Milestone) int64 { return milestone.ID }) if form.MilestoneID > 0 && !candidateMilestones.Contains(form.MilestoneID) { - ctx.NotFound(nil) + ctx.NotFound() return ret } pageMetaData.MilestonesData.SelectedMilestoneID = form.MilestoneID @@ -273,7 +273,7 @@ func ValidateRepoMetasForCreateIssue(ctx *context.Context, form forms.CreateIssu allProjects := slices.Concat(pageMetaData.ProjectsData.OpenProjects, pageMetaData.ProjectsData.ClosedProjects) candidateProjects := toSet(allProjects, func(project *project_model.Project) int64 { return project.ID }) if len(inputProjectIDs) > 0 && !candidateProjects.Contains(inputProjectIDs...) { - ctx.NotFound(nil) + ctx.NotFound() return ret } pageMetaData.SetSelectedProjectIDs(inputProjectIDs) @@ -306,14 +306,14 @@ func ValidateRepoMetasForCreateIssue(ctx *context.Context, form forms.CreateIssu if rID < 0 { // negative reviewIDs represent team requests team, ok := teamReviewersMap[-rID] if !ok { - ctx.NotFound(nil) + ctx.NotFound() return ret } teamReviewers = append(teamReviewers, team) } else { user, ok := userReviewersMap[rID] if !ok { - ctx.NotFound(nil) + ctx.NotFound() return ret } reviewers = append(reviewers, user) diff --git a/routers/web/repo/issue_page_meta.go b/routers/web/repo/issue_page_meta.go index 36f6353a280..66ede05d7d0 100644 --- a/routers/web/repo/issue_page_meta.go +++ b/routers/web/repo/issue_page_meta.go @@ -229,7 +229,7 @@ func (d *IssuePageMetaData) retrieveMilestonesDataForIssueWriter(ctx *context.Co IsClosed: optional.Some(false), }) if err != nil { - ctx.ServerError("GetMilestones", err) + ctx.ServerErrorAuto(err) return } d.MilestonesData.ClosedMilestones, err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{ @@ -237,7 +237,7 @@ func (d *IssuePageMetaData) retrieveMilestonesDataForIssueWriter(ctx *context.Co IsClosed: optional.Some(true), }) if err != nil { - ctx.ServerError("GetMilestones", err) + ctx.ServerErrorAuto(err) return } } @@ -246,7 +246,7 @@ func (d *IssuePageMetaData) retrieveAssigneesData(ctx *context.Context) { var err error d.AssigneesData.CandidateAssignees, err = repo_model.GetRepoAssignees(ctx, d.Repository) if err != nil { - ctx.ServerError("GetRepoAssignees", err) + ctx.ServerErrorAuto(err) return } d.AssigneesData.CandidateAssignees = shared_user.MakeSelfOnTop(ctx.Doer, d.AssigneesData.CandidateAssignees) @@ -263,14 +263,14 @@ func (d *IssuePageMetaData) retrieveAssigneesData(ctx *context.Context) { func (d *IssuePageMetaData) retrieveProjectCardsForExistingIssue(ctx *context.Context) { if err := d.Issue.LoadProjects(ctx); err != nil { - ctx.ServerError("LoadProjects", err) + ctx.ServerErrorAuto(err) return } // Load column mappings for all projects projectColumnMap, err := d.Issue.ProjectColumnMap(ctx) if err != nil { - ctx.ServerError("ProjectColumnMap", err) + ctx.ServerErrorAuto(err) return } @@ -279,7 +279,7 @@ func (d *IssuePageMetaData) retrieveProjectCardsForExistingIssue(ctx *context.Co for _, project := range d.Issue.Projects { columns, err := project_model.GetColumns(ctx, project.ID, db.ListOptionsAll) if err != nil { - ctx.ServerError("GetColumns", err) + ctx.ServerErrorAuto(err) return } @@ -295,7 +295,7 @@ func (d *IssuePageMetaData) retrieveProjectCardsForExistingIssue(ctx *context.Co if selectedColumn == nil { selectedColumn, err = project.MustDefaultColumn(ctx) if err != nil { - ctx.ServerError("MustDefaultColumn", err) + ctx.ServerErrorAuto(err) return } } @@ -389,7 +389,7 @@ func (d *IssuePageMetaData) retrieveReviewersData(ctx *context.Context) { reviews, data.OriginalReviews, err = issues_model.GetReviewsByIssueID(ctx, d.Issue.ID) if err != nil { - ctx.ServerError("GetReviewersByIssueID", err) + ctx.ServerErrorAuto(err) return } if len(reviews) == 0 && !data.CanChooseReviewer { @@ -409,13 +409,13 @@ func (d *IssuePageMetaData) retrieveReviewersData(ctx *context.Context) { var err error reviewers, err = pull_service.GetReviewers(ctx, repo, ctx.Doer.ID, posterID) if err != nil { - ctx.ServerError("GetReviewers", err) + ctx.ServerErrorAuto(err) return } teamReviewers, err = pull_service.GetReviewerTeams(ctx, repo) if err != nil { - ctx.ServerError("GetReviewerTeams", err) + ctx.ServerErrorAuto(err) return } @@ -459,20 +459,20 @@ func (d *IssuePageMetaData) retrieveReviewersData(ctx *context.Context) { if len(pullReviews) > 0 { if err := reviews.LoadReviewers(ctx); err != nil { - ctx.ServerError("LoadReviewers", err) + ctx.ServerErrorAuto(err) return } currentPullReviewers := make([]*repoReviewerSelection, 0, len(pullReviews)) for _, item := range pullReviews { if item.Review.ReviewerID > 0 { if err := item.Review.LoadReviewer(ctx); err != nil { - ctx.ServerError("LoadReviewer", err) + ctx.ServerErrorAuto(err) return } item.User = item.Review.Reviewer } else if item.Review.ReviewerTeamID > 0 { if err := item.Review.LoadReviewerTeam(ctx); err != nil { - ctx.ServerError("LoadReviewerTeam", err) + ctx.ServerErrorAuto(err) return } item.Team = item.Review.ReviewerTeam @@ -597,7 +597,7 @@ func (d *IssuePageMetaData) retrieveLabelsData(ctx *context.Context) { labels, err := issues_model.GetLabelsByRepoID(ctx, repo.ID, "", db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByRepoID", err) + ctx.ServerErrorAuto(err) return } issues_model.SortLabelsForDisplay(labels) diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go index 04c281908a4..8bbf4bcdf35 100644 --- a/routers/web/repo/issue_pin.go +++ b/routers/web/repo/issue_pin.go @@ -23,14 +23,14 @@ func IssuePinOrUnpin(ctx *context.Context) { // If we don't do this, it will crash when trying to add the pin event to the comment history err := issue.LoadRepo(ctx) if err != nil { - ctx.ServerError("LoadRepo", err) + ctx.ServerErrorAuto(err) return } // PinOrUnpin pins or unpins a Issue _, err = issues_model.GetIssuePin(ctx, issue) if err != nil && !db.IsErrNotExist(err) { - ctx.ServerError("GetIssuePin", err) + ctx.ServerErrorAuto(err) return } @@ -44,7 +44,7 @@ func IssuePinOrUnpin(ctx *context.Context) { if issues_model.IsErrIssueMaxPinReached(err) { ctx.JSONError(ctx.Tr("repo.issues.max_pinned")) } else { - ctx.ServerError("Pin/Unpin failed", err) + ctx.ServerErrorAuto(err) } return } @@ -56,20 +56,20 @@ func IssuePinOrUnpin(ctx *context.Context) { func IssueUnpin(ctx *context.Context) { issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerErrorAuto(err) return } // If we don't do this, it will crash when trying to add the pin event to the comment history err = issue.LoadRepo(ctx) if err != nil { - ctx.ServerError("LoadRepo", err) + ctx.ServerErrorAuto(err) return } err = issues_model.UnpinIssue(ctx, issue, ctx.Doer) if err != nil { - ctx.ServerError("UnpinIssue", err) + ctx.ServerErrorAuto(err) return } @@ -90,13 +90,13 @@ func IssuePinMove(ctx *context.Context) { form := &movePinIssueForm{} if err := json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil { - ctx.ServerError("Decode", err) + ctx.ServerErrorAuto(err) return } issue, err := issues_model.GetIssueByID(ctx, form.ID) if err != nil { - ctx.ServerError("GetIssueByID", err) + ctx.ServerErrorAuto(err) return } @@ -108,7 +108,7 @@ func IssuePinMove(ctx *context.Context) { err = issues_model.MovePin(ctx, issue, form.Position) if err != nil { - ctx.ServerError("MovePin", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/issue_stopwatch.go b/routers/web/repo/issue_stopwatch.go index 14ae07d4563..d60ac187366 100644 --- a/routers/web/repo/issue_stopwatch.go +++ b/routers/web/repo/issue_stopwatch.go @@ -17,12 +17,12 @@ func IssueStartStopwatch(c *context.Context) { } if !c.Repo.CanUseTimetracker(c, issue, c.Doer) { - c.NotFound(nil) + c.NotFound() return } if ok, err := issues_model.CreateIssueStopwatch(c, c.Doer, issue); err != nil { - c.ServerError("CreateIssueStopwatch", err) + c.ServerErrorAuto(err) return } else if !ok { c.Flash.Warning(c.Tr("repo.issues.stopwatch_already_created")) @@ -41,12 +41,12 @@ func IssueStopStopwatch(c *context.Context) { } if !c.Repo.CanUseTimetracker(c, issue, c.Doer) { - c.NotFound(nil) + c.NotFound() return } if ok, err := issues_model.FinishIssueStopwatch(c, c.Doer, issue); err != nil { - c.ServerError("FinishIssueStopwatch", err) + c.ServerErrorAuto(err) return } else if !ok { c.Flash.Warning(c.Tr("repo.issues.stopwatch_already_stopped")) @@ -63,12 +63,12 @@ func CancelStopwatch(c *context.Context) { return } if !c.Repo.CanUseTimetracker(c, issue, c.Doer) { - c.NotFound(nil) + c.NotFound() return } if _, err := issues_model.CancelStopwatch(c, c.Doer, issue); err != nil { - c.ServerError("CancelStopwatch", err) + c.ServerErrorAuto(err) return } diff --git a/routers/web/repo/issue_suggestions.go b/routers/web/repo/issue_suggestions.go index c136bc776a4..fee17e0c7bf 100644 --- a/routers/web/repo/issue_suggestions.go +++ b/routers/web/repo/issue_suggestions.go @@ -23,7 +23,7 @@ func IssueSuggestions(ctx *context.Context) { suggestions, err := issue_service.GetSuggestion(ctx, ctx.Repo.Repository, isPull, keyword) if err != nil { - ctx.ServerError("GetSuggestion", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go index 89df3b80824..f3ccb48f47c 100644 --- a/routers/web/repo/issue_timetrack.go +++ b/routers/web/repo/issue_timetrack.go @@ -25,7 +25,7 @@ func AddTimeManually(c *context.Context) { return } if !c.Repo.CanUseTimetracker(c, issue, c.Doer) { - c.NotFound(nil) + c.NotFound() return } @@ -42,7 +42,7 @@ func AddTimeManually(c *context.Context) { } if _, err := issues_model.AddTime(c, c.Doer, issue, int64(total.Seconds()), time.Now()); err != nil { - c.ServerError("AddTime", err) + c.ServerErrorAuto(err) return } @@ -56,14 +56,14 @@ func DeleteTime(c *context.Context) { return } if !c.Repo.CanUseTimetracker(c, issue, c.Doer) { - c.NotFound(nil) + c.NotFound() return } t, err := issues_model.GetTrackedTimeByID(c, issue.ID, c.PathParamInt64("timeid")) if err != nil { if db.IsErrNotExist(err) { - c.NotFound(err) + c.ServerErrorAuto(err) return } c.HTTPError(http.StatusInternalServerError, "GetTrackedTimeByID", err.Error()) @@ -77,7 +77,7 @@ func DeleteTime(c *context.Context) { } if err = issues_model.DeleteTime(c, t); err != nil { - c.ServerError("DeleteTime", err) + c.ServerErrorAuto(err) return } @@ -111,7 +111,7 @@ func UpdateIssueTimeEstimate(ctx *context.Context) { } if err := issue_service.ChangeTimeEstimate(ctx, issue, ctx.Doer, total); err != nil { - ctx.ServerError("ChangeTimeEstimate", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/issue_view.go b/routers/web/repo/issue_view.go index 86c58d0cde4..4446583c1ea 100644 --- a/routers/web/repo/issue_view.go +++ b/routers/web/repo/issue_view.go @@ -132,7 +132,7 @@ func checkBlockedByIssues(ctx *context.Context, blockers []*issues_model.Depende var err error perm, err = access_model.GetDoerRepoPermission(ctx, &blocker.Repository, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return nil, nil } repoPerms[blocker.RepoID] = perm @@ -268,14 +268,14 @@ func combineLabelComments(issue *issues_model.Issue) { func prepareIssueViewLoad(ctx *context.Context) *issues_model.Issue { issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerErrorAuto(err) return nil } issue.Repo = ctx.Repo.Repository ctx.Data["Issue"] = issue if err = issue.LoadPullRequest(ctx); err != nil { - ctx.ServerError("LoadPullRequest", err) + ctx.ServerErrorAuto(err) return nil } return issue @@ -292,14 +292,14 @@ func handleViewIssueRedirectExternal(ctx *context.Context) { res, err := vars.ExpandCurlyBrace(extIssueUnit.ExternalTrackerConfig().ExternalTrackerFormat, metas) if err != nil { log.Error("unable to expand template vars for issue url. issue: %s, err: %v", metas["index"], err) - ctx.ServerError("Expand", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(res) return } } else if err != nil && !repo_model.IsErrUnitTypeNotExist(err) { - ctx.ServerError("GetUnit", err) + ctx.ServerErrorAuto(err) return } } @@ -347,13 +347,13 @@ func ViewIssue(ctx *context.Context) { upload.AddUploadContext(ctx, "comment") if err := issue.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } var err error if issue.Comments, err = issue_service.FilterReadableComments(ctx, ctx.Doer, ctx.Repo.Permission, issue, issue.Comments); err != nil { - ctx.ServerError("FilterReadableComments", err) + ctx.ServerErrorAuto(err) return } combineXRefComments(issue) @@ -363,7 +363,7 @@ func ViewIssue(ctx *context.Context) { if ctx.IsSigned { // Update issue-user. if err := notifications.SetIssueReadBy(ctx, issue.ID, ctx.Doer.ID); err != nil { - ctx.ServerError("ReadBy", err) + ctx.ServerErrorAuto(err) return } } @@ -416,7 +416,7 @@ func ViewIssue(ctx *context.Context) { tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetTagNamesByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Tags"] = tags @@ -438,7 +438,7 @@ func ViewPullMergeBox(ctx *context.Context) { return } if !issue.IsPull { - ctx.NotFound(nil) + ctx.NotFound() return } prViewInfo := newPullRequestViewInfo() @@ -476,7 +476,7 @@ func prepareIssueViewSidebarDependency(ctx *context.Context, issue *issues_model // Get Dependencies blockedBy, _, err := issue.BlockedByDependencies(ctx, db.ListOptions{}) if err != nil { - ctx.ServerError("BlockedByDependencies", err) + ctx.ServerErrorAuto(err) return } ctx.Data["BlockedByDependencies"], ctx.Data["BlockedByDependenciesNotPermitted"] = checkBlockedByIssues(ctx, blockedBy) @@ -486,7 +486,7 @@ func prepareIssueViewSidebarDependency(ctx *context.Context, issue *issues_model blocking, err := issue.BlockingDependencies(ctx) if err != nil { - ctx.ServerError("BlockingDependencies", err) + ctx.ServerErrorAuto(err) return } @@ -553,7 +553,7 @@ func prepareIssueViewSidebarWatch(ctx *context.Context, issue *issues_model.Issu var err error iw.IsWatching, err = issues_model.CheckIssueWatch(ctx, ctx.Doer, issue) if err != nil { - ctx.ServerError("CheckIssueWatch", err) + ctx.ServerErrorAuto(err) return } } @@ -572,7 +572,7 @@ func prepareIssueViewSidebarTimeTracker(ctx *context.Context, issue *issues_mode if !isStopwatchRunning { exists, _, swIssue, err := issues_model.HasUserStopwatch(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("HasUserStopwatch", err) + ctx.ServerErrorAuto(err) return } ctx.Data["HasUserStopwatch"] = exists @@ -588,7 +588,7 @@ func prepareIssueViewSidebarTimeTracker(ctx *context.Context, issue *issues_mode } var err error if ctx.Data["WorkingUsers"], err = issues_model.TotalTimesForEachUser(ctx, &issues_model.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil { - ctx.ServerError("TotalTimesForEachUser", err) + ctx.ServerErrorAuto(err) return } } @@ -605,7 +605,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBoxDeleteBranch(ctx *context.Cont if isPullBranchDeletable && prInfo.issue.IsClosed { exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pull.HeadRepoID, pull.HeadBranch) if err != nil { - ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err) + ctx.ServerErrorAuto(err) return } @@ -617,14 +617,14 @@ func (prInfo *pullRequestViewInfo) prepareMergeBoxDeleteBranch(ctx *context.Cont func prepareIssueViewSidebarPin(ctx *context.Context, issue *issues_model.Issue) { var pinAllowed bool if err := issue.LoadPinOrder(ctx); err != nil { - ctx.ServerError("LoadPinOrder", err) + ctx.ServerErrorAuto(err) return } if issue.PinOrder == 0 { var err error pinAllowed, err = issues_model.IsNewPinAllowed(ctx, issue.RepoID, issue.IsPull) if err != nil { - ctx.ServerError("IsNewPinAllowed", err) + ctx.ServerErrorAuto(err) return } } else { @@ -652,11 +652,11 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue participants[0] = issue.Poster if err := issue.Comments.LoadAttachmentsByIssue(ctx); err != nil { - ctx.ServerError("LoadAttachmentsByIssue", err) + ctx.ServerErrorAuto(err) return } if err := issue.Comments.LoadPosters(ctx); err != nil { - ctx.ServerError("LoadPosters", err) + ctx.ServerErrorAuto(err) return } @@ -671,7 +671,7 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue }) comment.RenderedContent, err = markdown.RenderString(rctx, comment.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } // Check tag. @@ -683,19 +683,19 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue comment.ShowRole, err = roleDescriptor(ctx, issue.Repo, comment.Poster, permCache, issue, comment.HasOriginalAuthor()) if err != nil { - ctx.ServerError("roleDescriptor", err) + ctx.ServerErrorAuto(err) return } marked[comment.PosterID] = comment.ShowRole participants = addParticipant(comment.Poster, participants) } else if comment.Type == issues_model.CommentTypeLabel { if err = comment.LoadLabel(ctx); err != nil { - ctx.ServerError("LoadLabel", err) + ctx.ServerErrorAuto(err) return } } else if comment.Type == issues_model.CommentTypeMilestone { if err = comment.LoadMilestone(ctx); err != nil { - ctx.ServerError("LoadMilestone", err) + ctx.ServerErrorAuto(err) return } ghostMilestone := &issues_model.Milestone{ @@ -710,7 +710,7 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue } } else if comment.Type == issues_model.CommentTypeProject { if err = comment.LoadProject(ctx); err != nil { - ctx.ServerError("LoadProject", err) + ctx.ServerErrorAuto(err) return } @@ -728,12 +728,12 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue } } else if comment.Type == issues_model.CommentTypeProjectColumn { if err = comment.LoadProject(ctx); err != nil { - ctx.ServerError("LoadProject", err) + ctx.ServerErrorAuto(err) return } } else if comment.Type == issues_model.CommentTypeAssignees || comment.Type == issues_model.CommentTypeReviewRequest { if err = comment.LoadAssigneeUserAndTeam(ctx); err != nil { - ctx.ServerError("LoadAssigneeUserAndTeam", err) + ctx.ServerErrorAuto(err) return } } else if comment.Type.HasContentSupport() { @@ -742,11 +742,11 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue }) comment.RenderedContent, err = markdown.RenderString(rctx, comment.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } if err = comment.LoadReview(ctx); err != nil && !issues_model.IsErrReviewNotExist(err) { - ctx.ServerError("LoadReview", err) + ctx.ServerErrorAuto(err) return } participants = addParticipant(comment.Poster, participants) @@ -757,11 +757,11 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue comment.Review.Reviewer = comment.Poster } if err = comment.Review.LoadAttributes(ctx); err != nil { - ctx.ServerError("Review.LoadAttributes", err) + ctx.ServerErrorAuto(err) return } if err = comment.Review.LoadCodeComments(ctx); err != nil { - ctx.ServerError("Review.LoadCodeComments", err) + ctx.ServerErrorAuto(err) return } for _, codeComments := range comment.Review.CodeComments { @@ -776,7 +776,7 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue c.ShowRole, err = roleDescriptor(ctx, issue.Repo, c.Poster, permCache, issue, c.HasOriginalAuthor()) if err != nil { - ctx.ServerError("roleDescriptor", err) + ctx.ServerErrorAuto(err) return } marked[c.PosterID] = c.ShowRole @@ -785,13 +785,13 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue } } if err = comment.LoadResolveDoer(ctx); err != nil { - ctx.ServerError("LoadResolveDoer", err) + ctx.ServerErrorAuto(err) return } } else if comment.Type == issues_model.CommentTypePullRequestPush { participants = addParticipant(comment.Poster, participants) if err = issue_service.LoadCommentPushCommits(ctx, comment); err != nil { - ctx.ServerError("LoadCommentPushCommits", err) + ctx.ServerErrorAuto(err) return } git_model.SignCommitsApplyDoerPermission(ctx, ctx.Doer, comment.Commits) @@ -830,7 +830,7 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue if ctx.IsSigned { val, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyHiddenCommentTypes) if err != nil { - ctx.ServerError("GetUserSetting", err) + ctx.ServerErrorAuto(err) return } hiddenCommentTypes, _ = new(big.Int).SetString(val, 10) // we can safely ignore the failed conversion here @@ -872,7 +872,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * } else if pull.HeadRepo != nil { perm, err := access_model.GetDoerRepoPermission(ctx, pull.HeadRepo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } if perm.CanWrite(unit.TypeCode) { @@ -895,7 +895,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * } perm, err := access_model.GetDoerRepoPermission(ctx, pull.BaseRepo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } if !canWriteToHeadRepo { // maintainers maybe allowed to push to head repo even if they can't write to it @@ -903,12 +903,12 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * } data.hasPermToMerge, err = pull_service.IsUserAllowedToMerge(ctx, pull, perm, ctx.Doer) if err != nil { - ctx.ServerError("IsUserAllowedToMerge", err) + ctx.ServerErrorAuto(err) return } if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil { - ctx.ServerError("CanMarkConversation", err) + ctx.ServerErrorAuto(err) return } } @@ -978,7 +978,7 @@ func (prInfo *pullRequestViewInfo) preparePullUpdateActions(ctx *context.Context data := prInfo.MergeBoxData userUpdateStyles, err := pull_service.CheckUserAllowedToUpdate(ctx, pull, ctx.Doer) if err != nil { - ctx.ServerError("IsUserAllowedToUpdate", err) + ctx.ServerErrorAuto(err) return } if !userUpdateStyles.MergeAllowed && !userUpdateStyles.RebaseAllowed { @@ -1015,7 +1015,7 @@ func (prInfo *pullRequestViewInfo) preparePullUpdateActions(ctx *context.Context func (prInfo *pullRequestViewInfo) prepareMergeBoxProtectionChecks(ctx *context.Context) { pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, ctx.Repo.Repository.ID, prInfo.issue.PullRequest.BaseBranch) if err != nil { - ctx.ServerError("GetFirstMatchProtectedBranchRule", err) + ctx.ServerErrorAuto(err) return } if pb != nil { @@ -1090,11 +1090,11 @@ func prepareIssueViewContent(ctx *context.Context, issue *issues_model.Issue) { }) issue.RenderedContent, err = markdown.RenderString(rctx, issue.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } if issue.ShowRole, err = roleDescriptor(ctx, issue.Repo, issue.Poster, nil, issue, issue.HasOriginalAuthor()); err != nil { - ctx.ServerError("roleDescriptor", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/issue_watch.go b/routers/web/repo/issue_watch.go index 3194cc33083..123bb9608da 100644 --- a/routers/web/repo/issue_watch.go +++ b/routers/web/repo/issue_watch.go @@ -24,7 +24,7 @@ func IssueWatch(ctx *context.Context) { watch := ctx.FormBool("watch") if err := issues_model.CreateOrUpdateIssueWatch(ctx, ctx.Doer.ID, issue.ID, watch); err != nil { - ctx.ServerError("CreateOrUpdateIssueWatch", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/mention.go b/routers/web/repo/mention.go index ca99d49f6fa..d136cc1b4b0 100644 --- a/routers/web/repo/mention.go +++ b/routers/web/repo/mention.go @@ -23,18 +23,18 @@ func GetMentionsInRepo(ctx *context.Context) { if issueIndex := ctx.FormInt64("issue_index"); issueIndex > 0 { issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, issueIndex) if err != nil && !errors.Is(err, util.ErrNotExist) { - ctx.ServerError("GetIssueByIndex", err) + ctx.ServerErrorAuto(err) return } if issue != nil { userIDs, err := issue.GetParticipantIDsByIssue(ctx) if err != nil { - ctx.ServerError("GetParticipantIDsByIssue", err) + ctx.ServerErrorAuto(err) return } users, err := user_model.GetUsersByIDs(ctx, userIDs) if err != nil { - ctx.ServerError("GetUsersByIDs", err) + ctx.ServerErrorAuto(err) return } c.AddUsers(ctx, users) @@ -44,14 +44,14 @@ func GetMentionsInRepo(ctx *context.Context) { // Get repo assignees assignees, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetRepoAssignees", err) + ctx.ServerErrorAuto(err) return } c.AddUsers(ctx, assignees) // Get mentionable teams for org repos if err := c.AddMentionableTeams(ctx, ctx.Doer, ctx.Repo.Owner); err != nil { - ctx.ServerError("AddMentionableTeams", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index eef2528afee..acfcbada69e 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -235,7 +235,7 @@ func setMigrationContextData(ctx *context.Context, serviceType structs.GitServic func MigrateRetryPost(ctx *context.Context) { if err := task.RetryMigrateTask(ctx, ctx.Repo.Repository.ID); err != nil { log.Error("Retry task failed: %v", err) - ctx.ServerError("task.RetryMigrateTask", err) + ctx.ServerErrorAuto(err) return } ctx.JSONOK() @@ -251,7 +251,7 @@ func MigrateCancelPost(ctx *context.Context) { if migratingTask.Status == structs.TaskStatusRunning { taskUpdate := &admin_model.Task{ID: migratingTask.ID, Status: structs.TaskStatusFailed, Message: "canceled"} if err = taskUpdate.UpdateCols(ctx, "status", "message"); err != nil { - ctx.ServerError("task.UpdateCols", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index ed7714c223e..c21fce7d2b5 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -51,20 +51,20 @@ func Milestones(ctx *context.Context) { Name: keyword, }) if err != nil { - ctx.ServerError("GetMilestones", err) + ctx.ServerErrorAuto(err) return } stats, err := issues_model.GetMilestonesStatsByRepoCondAndKw(ctx, builder.And(builder.Eq{"id": ctx.Repo.Repository.ID}), keyword) if err != nil { - ctx.ServerError("GetMilestoneStats", err) + ctx.ServerErrorAuto(err) return } ctx.Data["OpenCount"] = stats.OpenCount ctx.Data["ClosedCount"] = stats.ClosedCount if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) { if err := issues_model.MilestoneList(miles).LoadTotalTrackedTimes(ctx); err != nil { - ctx.ServerError("LoadTotalTrackedTimes", err) + ctx.ServerErrorAuto(err) return } } @@ -72,7 +72,7 @@ func Milestones(ctx *context.Context) { rctx := renderhelper.NewRenderContextRepoComment(ctx, ctx.Repo.Repository) m.RenderedContent, err = markdown.RenderString(rctx, m.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } } @@ -127,7 +127,7 @@ func NewMilestonePost(ctx *context.Context) { Content: form.Content, DeadlineUnix: deadlineUnix, }); err != nil { - ctx.ServerError("NewMilestone", err) + ctx.ServerErrorAuto(err) return } @@ -143,11 +143,7 @@ func EditMilestone(ctx *context.Context) { m, err := issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id")) if err != nil { - if issues_model.IsErrMilestoneNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetMilestoneByRepoID", err) - } + ctx.ServerErrorAuto(err) return } ctx.Data["title"] = m.Name @@ -179,18 +175,14 @@ func EditMilestonePost(ctx *context.Context) { m, err := issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id")) if err != nil { - if issues_model.IsErrMilestoneNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetMilestoneByRepoID", err) - } + ctx.ServerErrorAuto(err) return } m.Name = form.Title m.Content = form.Content m.DeadlineUnix = deadlineUnix if err = issues_model.UpdateMilestone(ctx, m, m.IsClosed); err != nil { - ctx.ServerError("UpdateMilestone", err) + ctx.ServerErrorAuto(err) return } @@ -213,11 +205,7 @@ func ChangeMilestoneStatus(ctx *context.Context) { id := ctx.PathParamInt64("id") if err := issues_model.ChangeMilestoneStatusByRepoIDAndID(ctx, ctx.Repo.Repository.ID, id, toClose); err != nil { - if issues_model.IsErrMilestoneNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("ChangeMilestoneStatusByIDAndRepoID", err) - } + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(ctx.Repo.RepoLink + "/milestones?state=" + url.QueryEscape(ctx.PathParam("action"))) @@ -240,19 +228,14 @@ func MilestoneIssuesAndPulls(ctx *context.Context) { projectIDs := parseProjectIDsFromQuery(ctx) milestone, err := issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID) if err != nil { - if issues_model.IsErrMilestoneNotExist(err) { - ctx.NotFound(err) - return - } - - ctx.ServerError("GetMilestoneByID", err) + ctx.ServerErrorAuto(err) return } rctx := renderhelper.NewRenderContextRepoComment(ctx, ctx.Repo.Repository) milestone.RenderedContent, err = markdown.RenderString(rctx, milestone.Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 4b73eca1c7d..3b1626435c3 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -37,19 +37,19 @@ func Packages(ctx *context.Context) { IsInternal: optional.Some(false), }) if err != nil { - ctx.ServerError("SearchLatestVersions", err) + ctx.ServerErrorAuto(err) return } pds, err := packages.GetPackageDescriptors(ctx, pvs) if err != nil { - ctx.ServerError("GetPackageDescriptors", err) + ctx.ServerErrorAuto(err) return } hasPackages, err := packages.HasRepositoryPackages(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("HasRepositoryPackages", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 2b66a859ff7..4204f605fcd 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -44,14 +44,14 @@ const ( // MustEnableRepoProjects check if repo projects are enabled in settings func MustEnableRepoProjects(ctx *context.Context) { if unit.TypeProjects.UnitGlobalDisabled() { - ctx.NotFound(nil) + ctx.NotFound() return } if ctx.Repo.Repository != nil { projectsUnit := ctx.Repo.Repository.MustGetUnit(ctx, unit.TypeProjects) if !ctx.Repo.Permission.CanRead(unit.TypeProjects) || !projectsUnit.ProjectsConfig().IsProjectsAllowed(repo_model.ProjectsModeRepo) { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -83,12 +83,12 @@ func Projects(ctx *context.Context) { Title: keyword, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerErrorAuto(err) return } if err := project_service.LoadIssueNumbersForProjects(ctx, projects, ctx.Doer); err != nil { - ctx.ServerError("LoadIssueNumbersForProjects", err) + ctx.ServerErrorAuto(err) return } @@ -96,7 +96,7 @@ func Projects(ctx *context.Context) { rctx := renderhelper.NewRenderContextRepoComment(ctx, repo) projects[i].RenderedContent, err = markdown.RenderString(rctx, projects[i].Description) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } } @@ -150,7 +150,7 @@ func NewProjectPost(ctx *context.Context) { Type: project_model.TypeRepository, } if err := project_model.NewProject(ctx, project); err != nil { - ctx.ServerError("NewProject", err) + ctx.ServerErrorAuto(err) return } audit.Record(ctx, audit_model.ProjectCreate, ctx.Repo.Repository, "project", project.Title, "project_id", project.ID) @@ -174,7 +174,7 @@ func ChangeProjectStatus(ctx *context.Context) { id := ctx.PathParamInt64("id") if err := project_model.ChangeProjectStatusByRepoIDAndID(ctx, ctx.Repo.Repository.ID, id, toClose); err != nil { - ctx.ServerError("ChangeProjectStatusByRepoIDAndID", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(project_model.ProjectLinkForRepo(ctx.Repo.Repository, id)) @@ -184,15 +184,11 @@ func ChangeProjectStatus(ctx *context.Context) { func DeleteProject(ctx *context.Context) { p, err := project_model.GetProjectByID(ctx, ctx.PathParamInt64("id")) if err != nil { - if project_model.IsErrProjectNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetProjectByID", err) - } + ctx.ServerErrorAuto(err) return } if p.RepoID != ctx.Repo.Repository.ID { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -215,15 +211,11 @@ func RenderEditProject(ctx *context.Context) { p, err := project_model.GetProjectByID(ctx, ctx.PathParamInt64("id")) if err != nil { - if project_model.IsErrProjectNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetProjectByID", err) - } + ctx.ServerErrorAuto(err) return } if p.RepoID != ctx.Repo.Repository.ID { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -255,15 +247,11 @@ func EditProjectPost(ctx *context.Context) { p, err := project_model.GetProjectByID(ctx, projectID) if err != nil { - if project_model.IsErrProjectNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetProjectByID", err) - } + ctx.ServerErrorAuto(err) return } if p.RepoID != ctx.Repo.Repository.ID { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -271,7 +259,7 @@ func EditProjectPost(ctx *context.Context) { p.Description = form.Content p.CardType = form.CardType if err = project_model.UpdateProject(ctx, p); err != nil { - ctx.ServerError("UpdateProjects", err) + ctx.ServerErrorAuto(err) return } audit.Record(ctx, audit_model.ProjectUpdate, ctx.Repo.Repository, "project", p.Title, "project_id", p.ID) @@ -288,21 +276,17 @@ func EditProjectPost(ctx *context.Context) { func ViewProject(ctx *context.Context) { project, err := project_model.GetProjectByID(ctx, ctx.PathParamInt64("id")) if err != nil { - if project_model.IsErrProjectNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetProjectByID", err) - } + ctx.ServerErrorAuto(err) return } if project.RepoID != ctx.Repo.Repository.ID { - ctx.NotFound(nil) + ctx.NotFound() return } columns, err := project_model.GetColumns(ctx, project.ID, db.ListOptionsAll) if err != nil { - ctx.ServerError("GetColumns", err) + ctx.ServerErrorAuto(err) return } @@ -328,7 +312,7 @@ func ViewProject(ctx *context.Context) { MilestoneIDs: milestoneIDs, }) if err != nil { - ctx.ServerError("LoadIssuesOfColumns", err) + ctx.ServerErrorAuto(err) return } for _, column := range columns { @@ -349,21 +333,21 @@ func ViewProject(ctx *context.Context) { linkedPrsMap, err := project_service.LoadLinkedPullRequests(ctx, issuesMap, ctx.Doer) if err != nil { - ctx.ServerError("LoadLinkedPullRequests", err) + ctx.ServerErrorAuto(err) return } ctx.Data["LinkedPRs"] = linkedPrsMap labels, err := issues_model.GetLabelsByRepoID(ctx, project.RepoID, "", db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByRepoID", err) + ctx.ServerErrorAuto(err) return } if ctx.Repo.Owner.IsOrganization() { orgLabels, err := issues_model.GetLabelsByOrgID(ctx, ctx.Repo.Owner.ID, "", db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByOrgID", err) + ctx.ServerErrorAuto(err) return } @@ -395,7 +379,7 @@ func ViewProject(ctx *context.Context) { // Get assignees. assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetRepoAssignees", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers) @@ -410,7 +394,7 @@ func ViewProject(ctx *context.Context) { rctx := renderhelper.NewRenderContextRepoComment(ctx, ctx.Repo.Repository) project.RenderedContent, err = markdown.RenderString(rctx, project.Description) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } @@ -438,11 +422,11 @@ func UpdateIssueProject(ctx *context.Context) { } if err := issues.LoadProjects(ctx); err != nil { - ctx.ServerError("LoadProjects", err) + ctx.ServerErrorAuto(err) return } if _, err := issues.LoadRepositories(ctx); err != nil { - ctx.ServerError("LoadProjects", err) + ctx.ServerErrorAuto(err) return } @@ -454,7 +438,7 @@ func UpdateIssueProject(ctx *context.Context) { failedIssues = append(failedIssues, issue.ID) continue } - ctx.ServerError("IssueAssignOrRemoveProject", err) + ctx.ServerErrorAuto(err) return } } @@ -470,32 +454,32 @@ func UpdateIssueProject(ctx *context.Context) { func UpdateIssueProjectColumn(ctx *context.Context) { issue, err := issues_model.GetIssueByRepoID(ctx, ctx.Repo.Repository.ID, ctx.FormInt64("issue_id")) if err != nil { - ctx.ServerError("GetIssueByID", err) + ctx.ServerErrorAuto(err) return } if !ctx.Repo.Permission.CanWriteIssuesOrPulls(issue.IsPull) { - ctx.NotFound(nil) + ctx.NotFound() return } column, err := project_model.GetColumn(ctx, ctx.FormInt64("id")) if err != nil { - ctx.ServerError("GetColumn", err) + ctx.ServerErrorAuto(err) return } if err := issue.LoadProjects(ctx); err != nil { - ctx.ServerError("LoadProjects", err) + ctx.ServerErrorAuto(err) return } // it must make sure the requested column is in this issue's projects if !slices.ContainsFunc(issue.Projects, func(p *project_model.Project) bool { return p.ID == column.ProjectID }) { - ctx.NotFound(nil) + ctx.NotFound() return } if err := project_service.MoveIssueToColumn(ctx, ctx.Doer, issue, column, optional.None[int64]()); err != nil { - ctx.ServerError("MoveIssueToColumn", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 75177fa81f4..322f2de2bf7 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -87,17 +87,13 @@ var pullRequestTemplateCandidates = []string{ func getRepository(ctx *context.Context, repoID int64) *repo_model.Repository { repo, err := repo_model.GetRepositoryByID(ctx, repoID) if err != nil { - if repo_model.IsErrRepoNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetRepositoryByID", err) - } + ctx.ServerErrorAuto(err) return nil } perm, err := access_model.GetDoerRepoPermission(ctx, repo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return nil } @@ -108,7 +104,7 @@ func getRepository(ctx *context.Context, repoID int64) *repo_model.Repository { unit.TypeCode, ctx.Repo, perm) - ctx.NotFound(nil) + ctx.NotFound() return nil } return repo @@ -117,19 +113,15 @@ func getRepository(ctx *context.Context, repoID int64) *repo_model.Repository { func getPullInfo(ctx *context.Context) (issue *issues_model.Issue, ok bool) { issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { - if issues_model.IsErrIssueNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetIssueByIndex", err) - } + ctx.ServerErrorAuto(err) return nil, false } if err = issue.LoadPoster(ctx); err != nil { - ctx.ServerError("LoadPoster", err) + ctx.ServerErrorAuto(err) return nil, false } if err := issue.LoadRepo(ctx); err != nil { - ctx.ServerError("LoadRepo", err) + ctx.ServerErrorAuto(err) return nil, false } ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, emoji.ReplaceAliases(issue.Title)) @@ -141,19 +133,19 @@ func getPullInfo(ctx *context.Context) (issue *issues_model.Issue, ok bool) { } if err = issue.LoadPullRequest(ctx); err != nil { - ctx.ServerError("LoadPullRequest", err) + ctx.ServerErrorAuto(err) return nil, false } if err = issue.PullRequest.LoadHeadRepo(ctx); err != nil { - ctx.ServerError("LoadHeadRepo", err) + ctx.ServerErrorAuto(err) return nil, false } if ctx.IsSigned { // Update issue-user. if err := notifications.SetIssueReadBy(ctx, issue.ID, ctx.Doer.ID); err != nil { - ctx.ServerError("ReadBy", err) + ctx.ServerErrorAuto(err) return nil, false } } @@ -344,12 +336,12 @@ func (prInfo *pullRequestViewInfo) prepareViewInfo(ctx *context.Context, issue * ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes if err := issue.PullRequest.LoadHeadRepo(ctx); err != nil { - ctx.ServerError("LoadHeadRepo", err) + ctx.ServerErrorAuto(err) return } if err := issue.PullRequest.LoadBaseRepo(ctx); err != nil { - ctx.ServerError("LoadBaseRepo", err) + ctx.ServerErrorAuto(err) return } @@ -653,13 +645,13 @@ func ViewPullCommits(ctx *context.Context) { } prCompareInfo := &prViewInfo.CompareInfo if prCompareInfo.HeadCommitID == "" { - ctx.NotFound(nil) + ctx.NotFound() return } commits, err := processGitCommits(ctx, prCompareInfo.Commits) if err != nil { - ctx.ServerError("processGitCommits", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Commits"] = commits @@ -727,7 +719,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { } prCompareInfo := &prViewInfo.CompareInfo if prCompareInfo.HeadCommitID == "" { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -754,7 +746,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { if afterCommit == nil && afterCommitID == headCommitID { afterCommit, err = gitRepo.GetCommit(ctx, afterCommitID) if err != nil { - ctx.ServerError("GetCommit(afterCommitID)", err) + ctx.ServerErrorAuto(err) return } } @@ -763,7 +755,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { return } if afterCommit == nil { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -771,7 +763,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { if isSingleCommit { beforeCommit, err = afterCommit.Parent(ctx, ctx.Repo.GitRepo, 0) if err != nil { - ctx.ServerError("afterCommit.Parent", err) + ctx.ServerErrorAuto(err) return } beforeCommitID = beforeCommit.ID.String() @@ -782,13 +774,13 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { // base commit is not in the list of the pull request commits beforeCommit, err = gitRepo.GetCommit(ctx, beforeCommitID) if err != nil { - ctx.ServerError("GetCommit(beforeCommitID)", err) + ctx.ServerErrorAuto(err) return } } } if beforeCommit == nil { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -823,7 +815,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { diff, err := gitdiff.GetDiffForRender(ctx, ctx.Repo.RepoLink, gitRepo, diffOptions, files...) if err != nil { - ctx.ServerError("GetDiff", err) + ctx.ServerErrorAuto(err) return } @@ -836,7 +828,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { if ctx.IsSigned && isShowAllCommits { reviewState, err = gitdiff.SyncUserSpecificDiff(ctx, ctx.Doer.ID, pull, gitRepo, diff, diffOptions) if err != nil { - ctx.ServerError("SyncUserSpecificDiff", err) + ctx.ServerErrorAuto(err) return } if reviewState != nil { @@ -846,7 +838,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { diffShortStat, err := gitdiff.GetDiffShortStat(ctx, ctx.Repo.GitRepo, &diffCommonOptions) if err != nil { - ctx.ServerError("GetDiffShortStat", err) + ctx.ServerErrorAuto(err) return } ctx.Data["DiffShortStat"] = diffShortStat @@ -858,7 +850,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { } if err = diff.LoadComments(ctx, issue, ctx.Doer, GetShowOutdatedComments(ctx)); err != nil { - ctx.ServerError("LoadComments", err) + ctx.ServerErrorAuto(err) return } @@ -871,7 +863,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { } } if err := allComments.LoadAttachments(ctx); err != nil { - ctx.ServerError("LoadAttachments", err) + ctx.ServerErrorAuto(err) return } @@ -889,7 +881,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { // note: use mergeBase is set to false because we already have the merge base from the pull request info diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, beforeCommitID, afterCommitID) if err != nil { - ctx.ServerError("GetDiffTree", err) + ctx.ServerErrorAuto(err) return } var filesViewedState map[string]pull_model.ViewedState @@ -915,7 +907,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { ctx.Data["ShowDiffSummaryInToolbar"] = diffShortStat.NumFiles != 0 if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil { - ctx.ServerError("CanMarkConversation", err) + ctx.ServerErrorAuto(err) return } @@ -923,7 +915,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetRepoAssignees", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers) @@ -933,7 +925,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { if ctx.Doer != nil { currentPendingReview, err = issues_model.GetCurrentReview(ctx, ctx.Doer, issue) if err != nil && !issues_model.IsErrReviewNotExist(err) { - ctx.ServerError("GetCurrentReview", err) + ctx.ServerErrorAuto(err) return } if currentPendingReview != nil { @@ -943,7 +935,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { IssueID: issue.ID, }) if err != nil { - ctx.ServerError("CountComments", err) + ctx.ServerErrorAuto(err) return } } @@ -968,7 +960,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { } if isShowAllCommits && pull.Flow == issues_model.PullRequestFlowGithub { if err := pull.LoadHeadRepo(ctx); err != nil { - ctx.ServerError("LoadHeadRepo", err) + ctx.ServerErrorAuto(err) return } @@ -976,7 +968,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) { if !pull.HasMerged && ctx.Doer != nil { headPerm, err := access_model.GetDoerRepoPermission(ctx, pull.HeadRepo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } @@ -1015,26 +1007,26 @@ func UpdatePullRequest(ctx *context.Context) { return } if issue.IsClosed { - ctx.NotFound(nil) + ctx.NotFound() return } if issue.PullRequest.HasMerged { - ctx.NotFound(nil) + ctx.NotFound() return } if err := issue.PullRequest.LoadBaseRepo(ctx); err != nil { - ctx.ServerError("LoadBaseRepo", err) + ctx.ServerErrorAuto(err) return } if err := issue.PullRequest.LoadHeadRepo(ctx); err != nil { - ctx.ServerError("LoadHeadRepo", err) + ctx.ServerErrorAuto(err) return } userUpdateStyles, err := pull_service.CheckUserAllowedToUpdate(ctx, issue.PullRequest, ctx.Doer) if err != nil { - ctx.ServerError("IsUserAllowedToMerge", err) + ctx.ServerErrorAuto(err) return } @@ -1055,7 +1047,7 @@ func UpdatePullRequest(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(conflictError.StdErr) + "\n" + utils.EscapeFlashErrorString(conflictError.StdOut), }) if err != nil { - ctx.ServerError("UpdatePullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.JSONError(flashError) @@ -1067,7 +1059,7 @@ func UpdatePullRequest(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(conflictError.StdErr) + "\n" + utils.EscapeFlashErrorString(conflictError.StdOut), }) if err != nil { - ctx.ServerError("UpdatePullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.JSONError(flashError) @@ -1132,7 +1124,7 @@ func MergePullRequest(ctx *context.Context) { case errors.Is(err, pull_service.ErrDependenciesLeft): ctx.JSONError(ctx.Tr("repo.issues.dependency.pr_close_blocked")) default: - ctx.ServerError("WebCheck", err) + ctx.ServerErrorAuto(err) } return @@ -1147,7 +1139,7 @@ func MergePullRequest(ctx *context.Context) { case errors.Is(err, util.ErrInvalidArgument): ctx.JSONError(ctx.Tr("repo.pulls.wrong_commit_id")) default: - ctx.ServerError("MergedManually", err) + ctx.ServerErrorAuto(err) } return @@ -1162,7 +1154,7 @@ func MergePullRequest(ctx *context.Context) { var err error message, _, err = pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pr, repo_model.MergeStyle(form.Do)) if err != nil { - ctx.ServerError("GetDefaultMergeMessage", err) + ctx.ServerErrorAuto(err) return } } @@ -1182,7 +1174,7 @@ func MergePullRequest(ctx *context.Context) { // schedule auto merge scheduled, err := automerge.ScheduleAutoMerge(ctx, ctx.Doer, pr, repo_model.MergeStyle(form.Do), message, deleteBranchAfterMerge) if err != nil { - ctx.ServerError("ScheduleAutoMerge", err) + ctx.ServerErrorAuto(err) return } else if scheduled { // nothing more to do ... @@ -1202,7 +1194,7 @@ func MergePullRequest(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(conflictError.StdErr) + "\n" + utils.EscapeFlashErrorString(conflictError.StdOut), }) if err != nil { - ctx.ServerError("MergePullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Error(flashError) @@ -1214,7 +1206,7 @@ func MergePullRequest(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(conflictError.StdErr) + "\n" + utils.EscapeFlashErrorString(conflictError.StdOut), }) if err != nil { - ctx.ServerError("MergePullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Error(flashError) @@ -1243,14 +1235,14 @@ func MergePullRequest(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(pushrejErr.Message), }) if err != nil { - ctx.ServerError("MergePullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Error(flashError) } ctx.JSONRedirect(issue.Link()) } else { - ctx.ServerError("Merge", err) + ctx.ServerErrorAuto(err) } return } @@ -1260,7 +1252,7 @@ func MergePullRequest(ctx *context.Context) { // 1. the ctx might have been canceled ("Merge" might take a very long time and the user closes their browser) // 2. it is inconsistent with API/AutoMerge which all miss the call if err := stopTimerIfAvailable(ctx, ctx.Doer, issue); err != nil { - ctx.ServerError("stopTimerIfAvailable", err) + ctx.ServerErrorAuto(err) return } @@ -1292,18 +1284,18 @@ func CancelAutoMergePullRequest(ctx *context.Context) { exist, autoMerge, err := pull_model.GetScheduledMergeByPullID(ctx, issue.PullRequest.ID) if err != nil { - ctx.ServerError("GetScheduledMergeByPullID", err) + ctx.ServerErrorAuto(err) return } if !exist { - ctx.NotFound(nil) + ctx.NotFound() return } if ctx.Doer.ID != autoMerge.DoerID { allowed, err := pull_service.IsUserAllowedToMerge(ctx, issue.PullRequest, ctx.Repo.Permission, ctx.Doer) if err != nil { - ctx.ServerError("IsUserAllowedToMerge", err) + ctx.ServerErrorAuto(err) return } if !allowed { @@ -1318,7 +1310,7 @@ func CancelAutoMergePullRequest(ctx *context.Context) { ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index)) return } - ctx.ServerError("RemoveScheduledAutoMerge", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("repo.pulls.auto_merge_canceled_schedule")) @@ -1339,7 +1331,7 @@ func PullsNewRedirect(ctx *context.Context) { baseRepo, headRepo := ctx.Repo.Repository, ctx.Repo.Repository if headRepo.IsFork { if err := headRepo.GetBaseRepo(ctx); err != nil { - ctx.ServerError("GetBaseRepo", err) + ctx.ServerErrorAuto(err) return } baseRepo = headRepo.BaseRepo @@ -1385,7 +1377,7 @@ func CompareAndPullRequestPost(ctx *context.Context) { // Check if a pull request already exists with the same head and base branch. pr, err := issues_model.GetUnmergedPullRequest(ctx, ci.HeadRepo.ID, repo.ID, ci.HeadRef.ShortName(), ci.BaseRef.ShortName(), issues_model.PullRequestFlowGithub) if err != nil && !issues_model.IsErrPullRequestNotExist(err) { - ctx.ServerError("GetUnmergedPullRequest", err) + ctx.ServerErrorAuto(err) return } if pr != nil { @@ -1449,7 +1441,7 @@ func CompareAndPullRequestPost(ctx *context.Context) { "Details": utils.EscapeFlashErrorString(pushrejErr.Message), }) if err != nil { - ctx.ServerError("CompareAndPullRequest.HTMLString", err) + ctx.ServerErrorAuto(err) return } ctx.JSONError(flashError) @@ -1488,18 +1480,14 @@ func DownloadPullPatch(ctx *context.Context) { func DownloadPullDiffOrPatch(ctx *context.Context, patch bool) { pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { - if issues_model.IsErrPullRequestNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetPullRequestByIndex", err) - } + ctx.ServerErrorAuto(err) return } binary := ctx.FormBool("binary") if err := pull_service.DownloadDiffOrPatch(ctx, pr, ctx, patch, binary); err != nil { - ctx.ServerError("DownloadDiffOrPatch", err) + ctx.ServerErrorAuto(err) return } } @@ -1572,7 +1560,7 @@ func UpdatePullRequestTarget(ctx *context.Context) { "user_error": errorMessage, }) default: - ctx.ServerError("UpdatePullRequestTarget", err) + ctx.ServerErrorAuto(err) } return } @@ -1589,11 +1577,7 @@ func SetAllowEdits(ctx *context.Context) { pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index")) if err != nil { - if issues_model.IsErrPullRequestNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetPullRequestByIndex", err) - } + ctx.ServerErrorAuto(err) return } @@ -1602,7 +1586,7 @@ func SetAllowEdits(ctx *context.Context) { ctx.HTTPError(http.StatusForbidden) return } - ctx.ServerError("SetAllowEdits", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/pull_merge_form.go b/routers/web/repo/pull_merge_form.go index 6e57fc04dd5..9be453a171d 100644 --- a/routers/web/repo/pull_merge_form.go +++ b/routers/web/repo/pull_merge_form.go @@ -54,7 +54,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBoxFormProps(ctx *context.Context // Check if there is a pending pr merge hasPendingPullRequestMerge, pendingPullRequestMerge, err := pull_model.GetScheduledMergeByPullID(ctx, pull.ID) if err != nil { - ctx.ServerError("GetScheduledMergeByPullID", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index 83c055dab2b..317a2966770 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -44,7 +44,7 @@ func RenderNewCodeCommentForm(ctx *context.Context) { } currentReview, err := issues_model.GetCurrentReview(ctx, ctx.Doer, issue) if err != nil && !issues_model.IsErrReviewNotExist(err) { - ctx.ServerError("GetCurrentReview", err) + ctx.ServerErrorAuto(err) return } ctx.Data["PageIsPullFiles"] = true @@ -52,7 +52,7 @@ func RenderNewCodeCommentForm(ctx *context.Context) { ctx.Data["CurrentReview"] = currentReview pullHeadCommitID, err := ctx.Repo.GitRepo.GetRefCommitID(ctx, issue.PullRequest.GetGitHeadRefName()) if err != nil { - ctx.ServerError("GetRefCommitID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["AfterCommitID"] = pullHeadCommitID @@ -128,23 +128,23 @@ func UpdateResolveConversation(ctx *context.Context) { comment, err := issues_model.GetCommentByID(ctx, commentID) if err != nil { - ctx.ServerError("GetIssueByID", err) + ctx.ServerErrorAuto(err) return } if err = comment.LoadIssue(ctx); err != nil { - ctx.ServerError("comment.LoadIssue", err) + ctx.ServerErrorAuto(err) return } if comment.Issue.RepoID != ctx.Repo.Repository.ID { - ctx.NotFound(errors.New("comment's repoID is incorrect")) + ctx.NotFound() return } var permResult bool if permResult, err = issues_model.CanMarkConversation(ctx, comment.Issue, ctx.Doer); err != nil { - ctx.ServerError("CanMarkConversation", err) + ctx.ServerErrorAuto(err) return } if !permResult { @@ -160,7 +160,7 @@ func UpdateResolveConversation(ctx *context.Context) { if action == "Resolve" || action == "UnResolve" { err = issues_model.MarkConversation(ctx, comment, ctx.Doer, action == "Resolve") if err != nil { - ctx.ServerError("MarkConversation", err) + ctx.ServerErrorAuto(err) return } } else { @@ -177,7 +177,7 @@ func renderConversation(ctx *context.Context, comment *issues_model.Comment, ori showOutdatedComments := origin == "timeline" || GetShowOutdatedComments(ctx) comments, err := issues_model.FetchCodeCommentsByLine(ctx, comment.Issue, ctx.Doer, comment.TreePath, comment.Line, showOutdatedComments) if err != nil { - ctx.ServerError("FetchCodeCommentsByLine", err) + ctx.ServerErrorAuto(err) return } if len(comments) == 0 { @@ -187,7 +187,7 @@ func renderConversation(ctx *context.Context, comment *issues_model.Comment, ori } if err := comments.LoadAttachments(ctx); err != nil { - ctx.ServerError("LoadAttachments", err) + ctx.ServerErrorAuto(err) return } @@ -196,17 +196,17 @@ func renderConversation(ctx *context.Context, comment *issues_model.Comment, ori ctx.Data["comments"] = comments if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, comment.Issue, ctx.Doer); err != nil { - ctx.ServerError("CanMarkConversation", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Issue"] = comment.Issue if err = comment.Issue.LoadPullRequest(ctx); err != nil { - ctx.ServerError("comment.Issue.LoadPullRequest", err) + ctx.ServerErrorAuto(err) return } pullHeadCommitID, err := ctx.Repo.GitRepo.GetRefCommitID(ctx, comment.Issue.PullRequest.GetGitHeadRefName()) if err != nil { - ctx.ServerError("GetRefCommitID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["AfterCommitID"] = pullHeadCommitID @@ -248,7 +248,7 @@ func SubmitReview(ctx *context.Context) { reviewType := form.ReviewType() switch reviewType { case issues_model.ReviewTypeUnknown: - ctx.ServerError("ReviewType", fmt.Errorf("unknown ReviewType: %s", form.Type)) + ctx.ServerErrorAuto(fmt.Errorf("unknown ReviewType: %s", form.Type)) return // can not approve/reject your own PR @@ -296,7 +296,7 @@ func DismissReview(ctx *context.Context) { ctx.Status(http.StatusForbidden) return } - ctx.ServerError("pull_service.DismissReview", err) + ctx.ServerErrorAuto(err) return } @@ -342,7 +342,7 @@ func UpdateViewedFiles(ctx *context.Context) { } if _, err := pull_model.UpdateReviewState(ctx, ctx.Doer.ID, pull.ID, data.HeadCommitSHA, updatedFiles); err != nil { - ctx.ServerError("UpdateReview", err) + ctx.ServerErrorAuto(err) } } @@ -364,7 +364,7 @@ func UpdatePullReviewRequest(ctx *context.Context) { for _, issue := range issues { if err := issue.LoadRepo(ctx); err != nil { - ctx.ServerError("issue.LoadRepo", err) + ctx.ServerErrorAuto(err) return } @@ -379,7 +379,7 @@ func UpdatePullReviewRequest(ctx *context.Context) { if reviewID < 0 { // negative reviewIDs represent team requests if err := issue.Repo.LoadOwner(ctx); err != nil { - ctx.ServerError("issue.Repo.LoadOwner", err) + ctx.ServerErrorAuto(err) return } @@ -394,7 +394,7 @@ func UpdatePullReviewRequest(ctx *context.Context) { team, err := organization.GetTeamByID(ctx, -reviewID) if err != nil { - ctx.ServerError("GetTeamByID", err) + ctx.ServerErrorAuto(err) return } @@ -417,7 +417,7 @@ func UpdatePullReviewRequest(ctx *context.Context) { ctx.Status(http.StatusForbidden) return } - ctx.ServerError("TeamReviewRequest", err) + ctx.ServerErrorAuto(err) return } continue @@ -434,7 +434,7 @@ func UpdatePullReviewRequest(ctx *context.Context) { ctx.Status(http.StatusForbidden) return } - ctx.ServerError("GetUserByID", err) + ctx.ServerErrorAuto(err) return } @@ -453,7 +453,7 @@ func UpdatePullReviewRequest(ctx *context.Context) { ctx.Status(http.StatusForbidden) return } - ctx.ServerError("ReviewRequest", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index b0d842bc437..fe13dcbb973 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -207,7 +207,7 @@ func Releases(ctx *context.Context) { RepoID: ctx.Repo.Repository.ID, }) if err != nil { - ctx.ServerError("getReleaseInfos", err) + ctx.ServerErrorAuto(err) return } for _, rel := range releases { @@ -256,13 +256,13 @@ func TagsList(ctx *context.Context) { releases, err := db.Find[repo_model.Release](ctx, opts) if err != nil { - ctx.ServerError("GetReleasesByRepoID", err) + ctx.ServerErrorAuto(err) return } count, err := db.Count[repo_model.Release](ctx, opts) if err != nil { - ctx.ServerError("GetReleasesByRepoID", err) + ctx.ServerErrorAuto(err) return } @@ -313,11 +313,11 @@ func SingleRelease(ctx *context.Context) { IncludeTags: true, }) if err != nil { - ctx.ServerError("getReleaseInfos", err) + ctx.ServerErrorAuto(err) return } if len(releases) != 1 { - ctx.NotFound(err) + ctx.NotFound() return } @@ -342,16 +342,12 @@ func SingleRelease(ctx *context.Context) { func LatestRelease(ctx *context.Context) { release, err := repo_model.GetLatestRelease(ctx, ctx.Repo.Repository) if err != nil { - if repo_model.IsErrReleaseNotExist(err) { - ctx.NotFound(err) - return - } - ctx.ServerError("GetLatestRelease", err) + ctx.ServerErrorAuto(err) return } if err := release.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -363,7 +359,7 @@ func newReleaseCommon(ctx *context.Context) { tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetTagNamesByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Tags"] = tags @@ -386,14 +382,14 @@ func NewRelease(ctx *context.Context) { if tagName := ctx.FormString("tag"); tagName != "" { rel, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, tagName) if err != nil && !repo_model.IsErrReleaseNotExist(err) { - ctx.ServerError("GetRelease", err) + ctx.ServerErrorAuto(err) return } if rel != nil { rel.Repo = ctx.Repo.Repository if err = rel.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -444,7 +440,7 @@ func NewReleasePost(ctx *context.Context) { // the logic should be done before the form error check to make the tmpl has correct variables rel, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, form.TagName) if err != nil && !repo_model.IsErrReleaseNotExist(err) { - ctx.ServerError("GetRelease", err) + ctx.ServerErrorAuto(err) return } @@ -481,7 +477,7 @@ func NewReleasePost(ctx *context.Context) { case release_service.IsErrProtectedTagName(err): ctx.JSONError(ctx.Tr("repo.release.tag_name_protected")) default: - ctx.ServerError("handleTagReleaseError", err) + ctx.ServerErrorAuto(err) } } @@ -563,15 +559,11 @@ func EditRelease(ctx *context.Context) { tagName := ctx.PathParam("*") rel, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, tagName) if err != nil { - if repo_model.IsErrReleaseNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetRelease", err) - } + ctx.ServerErrorAuto(err) return } if rel.IsTag { - ctx.NotFound(err) // for a pure tag release, don't allow to edit it as a release + ctx.NotFound() // for a pure tag release, don't allow to edit it as a release return } @@ -586,7 +578,7 @@ func EditRelease(ctx *context.Context) { rel.Repo = ctx.Repo.Repository if err := rel.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } ctx.Data["attachments"] = rel.Attachments @@ -608,7 +600,7 @@ func EditReleasePost(ctx *context.Context) { if repo_model.IsErrReleaseNotExist(err) { ctx.JSONErrorNotFound(err.Error()) } else { - ctx.ServerError("GetRelease", err) + ctx.ServerErrorAuto(err) } return } @@ -680,7 +672,7 @@ func deleteReleaseOrTag(ctx *context.Context, isDelTag bool) { rel, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, ctx.FormInt64("id")) if err != nil { if repo_model.IsErrReleaseNotExist(err) { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) } else { ctx.Flash.Error("DeleteReleaseByID: " + err.Error()) redirect() @@ -718,11 +710,11 @@ func ChangeReleaseReaction(ctx *context.Context) { rel, err := repo_model.GetReleaseForRepoByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id")) if err != nil { - ctx.ServerError("GetReleaseForRepoByID", err) + ctx.ServerErrorAuto(err) return } if rel.IsTag || rel.IsDraft { - ctx.NotFound(nil) + ctx.NotFound() return } rel.Repo = ctx.Repo.Repository @@ -734,26 +726,26 @@ func ChangeReleaseReaction(ctx *context.Context) { ctx.HTTPError(http.StatusForbidden) return } else if err != nil && !errors.Is(err, util.ErrAlreadyExist) { - ctx.ServerError("CreateReleaseReaction", err) + ctx.ServerErrorAuto(err) return } case "unreact": if err = issues_model.DeleteReleaseReaction(ctx, ctx.Doer.ID, rel.ID, form.Content); err != nil { - ctx.ServerError("DeleteReleaseReaction", err) + ctx.ServerErrorAuto(err) return } default: - ctx.NotFound(nil) + ctx.NotFound() return } reactions, err := issues_model.FindReleaseReactions(ctx, rel.ID) if err != nil { - ctx.ServerError("FindReleaseReactions", err) + ctx.ServerErrorAuto(err) return } if _, err = reactions.LoadUsers(ctx, ctx.Repo.Repository); err != nil { - ctx.ServerError("LoadUsers", err) + ctx.ServerErrorAuto(err) return } renderReactions(ctx, fmt.Sprintf("%s/releases/%d/reactions", ctx.Repo.RepoLink, rel.ID), reactions, release_service.AllowedReleaseReactions()) diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go index 011dfd8d49d..70faffaaa05 100644 --- a/routers/web/repo/render.go +++ b/routers/web/repo/render.go @@ -24,17 +24,13 @@ func RenderFile(ctx *context.Context) { blob, err = ctx.Repo.GitRepo.GetBlob(ctx.PathParam("sha")) } if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetBlobByPath", err) - } + ctx.ServerErrorAuto(err) return } blobReader, err := blob.DataAsync(ctx) if err != nil { - ctx.ServerError("DataAsync", err) + ctx.ServerErrorAuto(err) return } defer blobReader.Close() diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 90c489b494e..f29a56a69ab 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -43,14 +43,14 @@ const ( // MustBeNotEmpty render when a repo is a empty git dir func MustBeNotEmpty(ctx *context.Context) { if ctx.Repo.Repository.IsEmpty { - ctx.NotFound(nil) + ctx.NotFound() } } // MustBeEditable check that repo can be edited func MustBeEditable(ctx *context.Context) { if !ctx.Repo.Repository.CanContentChange() { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -58,14 +58,14 @@ func MustBeEditable(ctx *context.Context) { // MustBeAbleToUpload check that repo can be uploaded to func MustBeAbleToUpload(ctx *context.Context) { if !setting.Repository.Upload.Enabled { - ctx.NotFound(nil) + ctx.NotFound() } } func checkContextUser(ctx *context.Context, uid int64) *user_model.User { orgs, err := organization.GetOrgsCanCreateRepoByUserID(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("GetOrgsCanCreateRepoByUserID", err) + ctx.ServerErrorAuto(err) return nil } @@ -88,7 +88,7 @@ func checkContextUser(ctx *context.Context, uid int64) *user_model.User { } if err != nil { - ctx.ServerError("GetUserByID", fmt.Errorf("[%d]: %w", uid, err)) + ctx.ServerErrorAuto(fmt.Errorf("[%d]: %w", uid, err)) return nil } @@ -100,7 +100,7 @@ func checkContextUser(ctx *context.Context, uid int64) *user_model.User { if !ctx.Doer.IsAdmin { canCreate, err := organization.OrgFromUser(org).CanCreateOrgRepo(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("CanCreateOrgRepo", err) + ctx.ServerErrorAuto(err) return nil } else if !canCreate { ctx.HTTPError(http.StatusForbidden) @@ -164,7 +164,7 @@ func Create(ctx *context.Context) { ctx.HTML(http.StatusOK, tplCreate) } -func handleCreateError(ctx *context.Context, owner *user_model.User, err error, name string, tpl templates.TplName, form any) { +func handleCreateError(ctx *context.Context, owner *user_model.User, err error, tpl templates.TplName, form any) { var errNameReserved db.ErrNameReserved var errNamePatternNotAllowed db.ErrNamePatternNotAllowed switch { @@ -185,7 +185,7 @@ func handleCreateError(ctx *context.Context, owner *user_model.User, err error, ctx.Data["Err_RepoName"] = true ctx.RenderWithErrDeprecated(ctx.Tr("repo.form.name_pattern_not_allowed", errNamePatternNotAllowed.Pattern), tpl, form) default: - ctx.ServerError(name, err) + ctx.ServerErrorAuto(err) } } @@ -272,7 +272,7 @@ func CreatePost(ctx *context.Context) { } } - handleCreateError(ctx, ctxUser, err, "CreatePost", tplCreate, &form) + handleCreateError(ctx, ctxUser, err, tplCreate, &form) } func handleRepoActionError(ctx *context.Context, err error) { @@ -286,7 +286,7 @@ func handleRepoActionError(ctx *context.Context, err error) { case errors.Is(err, util.ErrPermissionDenied): ctx.JSONError(ctx.Tr("error.permission_denied")) default: - ctx.ServerError("RepoAction:"+ctx.PathParam("action"), err) + ctx.ServerErrorAuto(err) } } @@ -304,7 +304,7 @@ func RedirectDownload(ctx *context.Context) { TagNames: tagNames, }) if err != nil { - ctx.ServerError("RedirectDownload", err) + ctx.ServerErrorAuto(err) return } if len(releases) == 1 { @@ -352,7 +352,7 @@ func Download(ctx *context.Context) { } else if errors.Is(err, util.ErrNotExist) { ctx.HTTPError(http.StatusNotFound, err.Error()) } else { - ctx.ServerError("archiver_service.NewRequest", err) + ctx.ServerErrorAuto(err) } return } @@ -361,7 +361,7 @@ func Download(ctx *context.Context) { if errors.Is(err, util.ErrInvalidArgument) { ctx.HTTPError(http.StatusBadRequest, err.Error()) } else { - ctx.ServerError("archiver_service.ServeRepoArchive", err) + ctx.ServerErrorAuto(err) } } } @@ -393,12 +393,12 @@ func InitiateDownload(ctx *context.Context) { archiver, err := repo_model.GetRepoArchiver(ctx, aReq.Repo.ID, aReq.Type, aReq.CommitID) if err != nil { - ctx.ServerError("archiver_service.StartArchive", err) + ctx.ServerErrorAuto(err) return } if archiver == nil || archiver.Status != repo_model.ArchiverReady { if err := archiver_service.StartArchive(aReq); err != nil { - ctx.ServerError("archiver_service.StartArchive", err) + ctx.ServerErrorAuto(err) return } } @@ -594,7 +594,7 @@ func PrepareBranchList(ctx *context.Context) { } brs, err := git_model.FindBranchNames(ctx, branchOpts) if err != nil { - ctx.ServerError("GetBranches", err) + ctx.ServerErrorAuto(err) return } // always put default branch on the top if it exists diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 2ef77185f49..f56d4ac7883 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -49,7 +49,7 @@ func Search(ctx *context.Context) { }) if err != nil { if code_indexer.IsAvailable(ctx) { - ctx.ServerError("SearchResults", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CodeIndexerUnavailable"] = true @@ -62,7 +62,7 @@ func Search(ctx *context.Context) { searchRef := git.RefNameFromBranch(ctx.Repo.Repository.DefaultBranch) searchResults, total, err = gitgrep.PerformSearch(ctx, page, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, searchRef, prepareSearch.Keyword, prepareSearch.SearchMode) if err != nil { - ctx.ServerError("gitgrep.PerformSearch", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/setting/actions.go b/routers/web/repo/setting/actions.go index 7c47537232c..5da62cb72a9 100644 --- a/routers/web/repo/setting/actions.go +++ b/routers/web/repo/setting/actions.go @@ -27,7 +27,7 @@ func ActionsGeneralSettings(ctx *context.Context) { actionsUnit, err := ctx.Repo.Repository.GetUnit(ctx, unit_model.TypeActions) if err != nil && !repo_model.IsErrUnitTypeNotExist(err) { - ctx.ServerError("GetUnit", err) + ctx.ServerErrorAuto(err) return } if actionsUnit == nil { // no actions unit @@ -50,7 +50,7 @@ func ActionsGeneralSettings(ctx *context.Context) { } else { ownerActionsConfig, err := actions.GetOwnerActionsConfig(ctx, ctx.Repo.Repository.OwnerID) if err != nil { - ctx.ServerError("GetOwnerActionsConfig", err) + ctx.ServerErrorAuto(err) return } ctx.Data["MaxTokenPermissions"] = ownerActionsConfig.GetMaxTokenPermissions() @@ -62,7 +62,7 @@ func ActionsGeneralSettings(ctx *context.Context) { collaborativeOwnerIDs := actionsCfg.CollaborativeOwnerIDs collaborativeOwners, err := user_model.GetUsersByIDs(ctx, collaborativeOwnerIDs) if err != nil { - ctx.ServerError("GetUsersByIDs", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CollaborativeOwners"] = collaborativeOwners @@ -84,7 +84,7 @@ func ActionsUnitPost(ctx *context.Context) { } if err != nil { - ctx.ServerError("UpdateRepositoryUnits", err) + ctx.ServerErrorAuto(err) return } @@ -98,20 +98,20 @@ func AddCollaborativeOwner(ctx *context.Context) { if errors.Is(err, util.ErrNotExist) { ctx.JSONError(ctx.Tr("form.user_not_exist")) } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) } return } actionsUnit, err := ctx.Repo.Repository.GetUnit(ctx, unit_model.TypeActions) if err != nil { - ctx.ServerError("GetUnit", err) + ctx.ServerErrorAuto(err) return } actionsCfg := actionsUnit.ActionsConfig() actionsCfg.AddCollaborativeOwner(collUser.ID) if err := repo_model.UpdateRepoUnitConfig(ctx, actionsUnit); err != nil { - ctx.ServerError("UpdateRepoUnitConfig", err) + ctx.ServerErrorAuto(err) return } @@ -123,7 +123,7 @@ func DeleteCollaborativeOwner(ctx *context.Context) { actionsUnit, err := ctx.Repo.Repository.GetUnit(ctx, unit_model.TypeActions) if err != nil { - ctx.ServerError("GetUnit", err) + ctx.ServerErrorAuto(err) return } actionsCfg := actionsUnit.ActionsConfig() @@ -134,7 +134,7 @@ func DeleteCollaborativeOwner(ctx *context.Context) { } actionsCfg.RemoveCollaborativeOwner(ownerID) if err := repo_model.UpdateRepoUnitConfig(ctx, actionsUnit); err != nil { - ctx.ServerError("UpdateRepoUnitConfig", err) + ctx.ServerErrorAuto(err) return } @@ -147,7 +147,7 @@ func UpdateTokenPermissions(ctx *context.Context) { actionsUnit, err := ctx.Repo.Repository.GetUnit(ctx, unit_model.TypeActions) if err != nil { - ctx.ServerError("GetUnit", err) + ctx.ServerErrorAuto(err) return } @@ -182,7 +182,7 @@ func UpdateTokenPermissions(ctx *context.Context) { } if err := repo_model.UpdateRepoUnitConfig(ctx, actionsUnit); err != nil { - ctx.ServerError("UpdateRepoUnitConfig", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go index 1a7418ec80a..ad5f0962702 100644 --- a/routers/web/repo/setting/collaboration.go +++ b/routers/web/repo/setting/collaboration.go @@ -28,14 +28,14 @@ func Collaboration(ctx *context.Context) { users, _, err := repo_model.GetCollaborators(ctx, &repo_model.FindCollaborationOptions{RepoID: ctx.Repo.Repository.ID}) if err != nil { - ctx.ServerError("GetCollaborators", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Collaborators"] = users teams, err := organization.GetRepoTeams(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetRepoTeams", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Teams"] = teams @@ -62,7 +62,7 @@ func CollaborationPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("form.user_not_exist")) ctx.Redirect(setting.AppSubURL + ctx.Req.URL.EscapedPath()) } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) } return } @@ -90,7 +90,7 @@ func CollaborationPost(ctx *context.Context) { // check if the user we're trying to add is an owner. if ctx.Repo.Repository.Owner.IsOrganization() { if isOwner, err := organization.IsOrganizationOwner(ctx, ctx.Repo.Repository.Owner.ID, u.ID); err != nil { - ctx.ServerError("IsOrganizationOwner", err) + ctx.ServerErrorAuto(err) return } else if isOwner { ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator_owner")) @@ -104,7 +104,7 @@ func CollaborationPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator.blocked_user")) ctx.Redirect(ctx.Repo.RepoLink + "/settings/collaboration") } else { - ctx.ServerError("AddOrUpdateCollaborator", err) + ctx.ServerErrorAuto(err) } return } @@ -140,7 +140,7 @@ func DeleteCollaboration(ctx *context.Context) { if user_model.IsErrUserNotExist(err) { ctx.Flash.Error(ctx.Tr("form.user_not_exist")) } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) return } } else { @@ -172,7 +172,7 @@ func AddTeamPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("form.team_not_exist")) ctx.Redirect(ctx.Repo.RepoLink + "/settings/collaboration") } else { - ctx.ServerError("GetTeam", err) + ctx.ServerErrorAuto(err) } return } @@ -190,7 +190,7 @@ func AddTeamPost(ctx *context.Context) { } if err = repo_service.TeamAddRepository(ctx, team, ctx.Repo.Repository); err != nil { - ctx.ServerError("TeamAddRepository", err) + ctx.ServerErrorAuto(err) return } @@ -206,12 +206,12 @@ func DeleteTeam(ctx *context.Context) { team, err := organization.GetTeamByID(ctx, ctx.FormInt64("id")) if err != nil { - ctx.ServerError("GetTeamByID", err) + ctx.ServerErrorAuto(err) return } if err = repo_service.RemoveRepositoryFromTeam(ctx, team, ctx.Repo.Repository.ID); err != nil { - ctx.ServerError("team.RemoveRepositories", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/setting/default_branch.go b/routers/web/repo/setting/default_branch.go index 204c4fa3cd8..d7b4b0824ab 100644 --- a/routers/web/repo/setting/default_branch.go +++ b/routers/web/repo/setting/default_branch.go @@ -39,7 +39,7 @@ func SetDefaultBranchPost(ctx *context.Context) { case git_model.IsErrBranchNotExist(err): ctx.Status(http.StatusNotFound) default: - ctx.ServerError("SetDefaultBranch", err) + ctx.ServerErrorAuto(err) } return } @@ -49,6 +49,6 @@ func SetDefaultBranchPost(ctx *context.Context) { ctx.Flash.Success(ctx.Tr("repo.settings.update_settings_success")) ctx.Redirect(setting.AppSubURL + ctx.Req.URL.EscapedPath()) default: - ctx.NotFound(nil) + ctx.NotFound() } } diff --git a/routers/web/repo/setting/deploy_key.go b/routers/web/repo/setting/deploy_key.go index d874bc77fa8..9d0b4c3c3a8 100644 --- a/routers/web/repo/setting/deploy_key.go +++ b/routers/web/repo/setting/deploy_key.go @@ -28,7 +28,7 @@ func DeployKeys(ctx *context.Context) { keys, err := db.Find[deploykey_model.DeployKey](ctx, deploykey_model.ListDeployKeysOptions{RepoID: ctx.Repo.Repository.ID}) if err != nil { - ctx.ServerError("ListDeployKeys", err) + ctx.ServerErrorAuto(err) return } ctx.Data["RepoDeployKeys"] = keys @@ -65,7 +65,7 @@ func DeployKeysPost(ctx *context.Context) { case asymkey_model.IsErrKeyNameAlreadyUsed(err), deploykey_model.IsErrDeployKeyNameAlreadyUsed(err): ctx.JSONErrorWithField(ctx.Tr("repo.settings.key_name_used"), "title") default: - ctx.ServerError("AddDeployKey", err) + ctx.ServerErrorAuto(err) } return } @@ -78,7 +78,7 @@ func DeployKeysPost(ctx *context.Context) { func DeleteDeployKey(ctx *context.Context) { key, err := asymkey_service.DeleteDeployKey(ctx, ctx.Repo.Repository, ctx.FormInt64("id")) if err != nil && !deploykey_model.IsErrDeployKeyNotExist(err) { // a key that is already gone leaves the caller with the state it asked for - ctx.ServerError("DeleteDeployKey", err) + ctx.ServerErrorAuto(err) return } if key != nil { @@ -99,7 +99,7 @@ func DeployKeyGenerateToken(ctx *context.Context) { if deploykey_model.IsErrDeployKeyNameAlreadyUsed(err) { ctx.JSONErrorWithField(ctx.Tr("repo.settings.key_name_used"), "title") } else { - ctx.ServerError("AddDeployToken", err) + ctx.ServerErrorAuto(err) } return } @@ -114,7 +114,7 @@ func DeployKeyRegenerateToken(ctx *context.Context) { if deploykey_model.IsErrDeployKeyNotExist(err) { ctx.JSONErrorNotFound() } else { - ctx.ServerError("RegenerateDeployToken", err) + ctx.ServerErrorAuto(err) } return } diff --git a/routers/web/repo/setting/git_hooks.go b/routers/web/repo/setting/git_hooks.go index 53b7e9e3598..9cbbb8e7ffa 100644 --- a/routers/web/repo/setting/git_hooks.go +++ b/routers/web/repo/setting/git_hooks.go @@ -18,7 +18,7 @@ func GitHooks(ctx *context.Context) { hooks, err := git.ListHooks(ctx.Repo.GitRepo) if err != nil { - ctx.ServerError("Hooks", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Hooks"] = hooks @@ -34,11 +34,7 @@ func GitHooksEdit(ctx *context.Context) { name := ctx.PathParam("name") hook, err := git.GetHook(ctx.Repo.GitRepo, name) if err != nil { - if err == git.ErrNotValidHook { - ctx.NotFound(err) - } else { - ctx.ServerError("GetHook", err) - } + ctx.ServerErrorAuto(err) return } ctx.Data["Hook"] = hook @@ -51,16 +47,12 @@ func GitHooksEditPost(ctx *context.Context) { name := ctx.PathParam("name") hook, err := git.GetHook(ctx.Repo.GitRepo, name) if err != nil { - if err == git.ErrNotValidHook { - ctx.NotFound(err) - } else { - ctx.ServerError("GetHook", err) - } + ctx.ServerErrorAuto(err) return } hook.Content = ctx.FormString("content") if err = hook.Update(); err != nil { - ctx.ServerError("hook.Update", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks/git") diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index e72aef67f1a..641d3db89a4 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -43,13 +43,13 @@ const ( // LFSFiles shows a repository's LFS files func LFSFiles(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } page := max(ctx.FormInt("page"), 1) total, err := git_model.CountLFSMetaObjects(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("LFSFiles", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Total"] = total @@ -59,7 +59,7 @@ func LFSFiles(ctx *context.Context) { ctx.Data["PageIsSettingsLFS"] = true lfsMetaObjects, err := git_model.GetLFSMetaObjects(ctx, ctx.Repo.Repository.ID, pager.Paginator.Current(), setting.UI.ExplorePagingNum) if err != nil { - ctx.ServerError("LFSFiles", err) + ctx.ServerErrorAuto(err) return } ctx.Data["LFSFiles"] = lfsMetaObjects @@ -70,7 +70,7 @@ func LFSFiles(ctx *context.Context) { // LFSLocks shows a repository's LFS locks func LFSLocks(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["LFSFilesLink"] = ctx.Repo.RepoLink + "/settings/lfs" @@ -78,7 +78,7 @@ func LFSLocks(ctx *context.Context) { page := max(ctx.FormInt("page"), 1) total, err := git_model.CountLFSLockByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("LFSLocks", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Total"] = total @@ -88,11 +88,11 @@ func LFSLocks(ctx *context.Context) { ctx.Data["PageIsSettingsLFS"] = true lfsLocks, err := git_model.GetLFSLockByRepoID(ctx, ctx.Repo.Repository.ID, pager.Paginator.Current(), setting.UI.ExplorePagingNum) if err != nil { - ctx.ServerError("LFSLocks", err) + ctx.ServerErrorAuto(err) return } if err := lfsLocks.LoadAttributes(ctx); err != nil { - ctx.ServerError("LFSLocks", err) + ctx.ServerErrorAuto(err) return } @@ -108,7 +108,7 @@ func LFSLocks(ctx *context.Context) { tmpBasePath, _, cleanup, err := repo_module.CreateTemporaryGitRepo("locks") if err != nil { log.Error("Failed to create temporary path: %v", err) - ctx.ServerError("LFSLocks", err) + ctx.ServerErrorAuto(err) return } defer cleanup() @@ -118,14 +118,14 @@ func LFSLocks(ctx *context.Context) { Shared: true, }); err != nil { log.Error("Failed to clone repository: %s (%v)", ctx.Repo.Repository.FullName(), err) - ctx.ServerError("LFSLocks", fmt.Errorf("failed to clone repository: %s (%w)", ctx.Repo.Repository.FullName(), err)) + ctx.ServerErrorAuto(fmt.Errorf("failed to clone repository: %s (%w)", ctx.Repo.Repository.FullName(), err)) return } gitRepo, err := git.OpenRepositoryLocal(ctx, tmpBasePath) if err != nil { log.Error("Unable to open temporary repository: %s (%v)", tmpBasePath, err) - ctx.ServerError("LFSLocks", fmt.Errorf("failed to open new temporary repository in: %s %w", tmpBasePath, err)) + ctx.ServerErrorAuto(fmt.Errorf("failed to open new temporary repository in: %s %w", tmpBasePath, err)) return } defer gitRepo.Close() @@ -133,7 +133,7 @@ func LFSLocks(ctx *context.Context) { checker, err := attribute.NewBatchChecker(ctx, gitRepo, ctx.Repo.Repository.DefaultBranch, []string{attribute.Lockable}) if err != nil { log.Error("Unable to check attributes in %s (%v)", tmpBasePath, err) - ctx.ServerError("LFSLocks", err) + ctx.ServerErrorAuto(err) return } defer checker.Close() @@ -154,7 +154,7 @@ func LFSLocks(ctx *context.Context) { filelist, err := gitRepo.LsFiles(ctx, filenames...) if err != nil { log.Error("Unable to lsfiles in %s (%v)", tmpBasePath, err) - ctx.ServerError("LFSLocks", err) + ctx.ServerErrorAuto(err) return } @@ -174,7 +174,7 @@ func LFSLocks(ctx *context.Context) { // LFSLockFile locks a file func LFSLockFile(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } originalPath := ctx.FormString("path") @@ -206,7 +206,7 @@ func LFSLockFile(ctx *context.Context) { ctx.Redirect(ctx.Repo.RepoLink + "/settings/lfs/locks") return } - ctx.ServerError("LFSLockFile", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(ctx.Repo.RepoLink + "/settings/lfs/locks") @@ -215,12 +215,12 @@ func LFSLockFile(ctx *context.Context) { // LFSUnlock forcibly unlocks an LFS lock func LFSUnlock(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } _, err := git_model.DeleteLFSLockByID(ctx, ctx.PathParamInt64("lid"), ctx.Repo.Repository, ctx.Doer, true) if err != nil { - ctx.ServerError("LFSUnlock", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(ctx.Repo.RepoLink + "/settings/lfs/locks") @@ -229,7 +229,7 @@ func LFSUnlock(ctx *context.Context) { // LFSFileGet serves a single LFS file func LFSFileGet(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["LFSFilesLink"] = ctx.Repo.RepoLink + "/settings/lfs" @@ -237,7 +237,7 @@ func LFSFileGet(ctx *context.Context) { p := lfs.Pointer{Oid: oid} if !p.IsValid() { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -245,24 +245,20 @@ func LFSFileGet(ctx *context.Context) { ctx.Data["PageIsSettingsLFS"] = true meta, err := git_model.GetLFSMetaObjectByOid(ctx, ctx.Repo.Repository.ID, oid) if err != nil { - if err == git_model.ErrLFSObjectNotExist { - ctx.NotFound(nil) - return - } - ctx.ServerError("LFSFileGet", err) + ctx.ServerErrorAuto(err) return } ctx.Data["LFSFile"] = meta dataRc, err := lfs.ReadMetaObject(meta.Pointer) if err != nil { - ctx.ServerError("LFSFileGet", err) + ctx.ServerErrorAuto(err) return } defer dataRc.Close() buf := make([]byte, 1024) n, err := util.ReadAtMost(dataRc, buf) if err != nil { - ctx.ServerError("Data", err) + ctx.ServerErrorAuto(err) return } buf = buf[:n] @@ -317,19 +313,19 @@ func LFSFileGet(ctx *context.Context) { // LFSDelete disassociates the provided oid from the repository and if the lfs file is no longer associated with any repositories - deletes it func LFSDelete(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } oid := ctx.PathParam("oid") p := lfs.Pointer{Oid: oid} if !p.IsValid() { - ctx.NotFound(nil) + ctx.NotFound() return } count, err := git_model.RemoveLFSMetaObjectByOid(ctx, ctx.Repo.Repository.ID, oid) if err != nil { - ctx.ServerError("LFSDelete", err) + ctx.ServerErrorAuto(err) return } // FIXME: Warning: the LFS store is not locked - and can't be locked - there could be a race condition here @@ -338,7 +334,7 @@ func LFSDelete(ctx *context.Context) { oidPath := path.Join(oid[0:2], oid[2:4], oid[4:]) err = storage.LFS.Delete(oidPath) if err != nil { - ctx.ServerError("LFSDelete", err) + ctx.ServerErrorAuto(err) return } } @@ -348,13 +344,13 @@ func LFSDelete(ctx *context.Context) { // LFSFileFind guesses a sha for the provided oid (or uses the provided sha) and then finds the commits that contain this sha func LFSFileFind(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } oid := ctx.FormString("oid") size := ctx.FormInt64("size") if len(oid) == 0 || size == 0 { - ctx.NotFound(nil) + ctx.NotFound() return } sha := ctx.FormString("sha") @@ -377,7 +373,7 @@ func LFSFileFind(ctx *context.Context) { results, err := pipeline.FindLFSFile(ctx, ctx.Repo.GitRepo, objectID) if err != nil && err != io.EOF { log.Error("Failure in FindLFSFile: %v", err) - ctx.ServerError("LFSFind: FindLFSFile.", err) + ctx.ServerErrorAuto(err) return } @@ -388,7 +384,7 @@ func LFSFileFind(ctx *context.Context) { // LFSPointerFiles will search the repository for pointer files and report which are missing LFS files in the content store func LFSPointerFiles(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["PageIsSettingsLFS"] = true @@ -487,7 +483,7 @@ func LFSPointerFiles(ctx *context.Context) { return err }() if err != nil { - ctx.ServerError("LFSPointerFiles", err) + ctx.ServerErrorAuto(err) return } @@ -497,7 +493,7 @@ func LFSPointerFiles(ctx *context.Context) { // LFSAutoAssociate auto associates accessible lfs files func LFSAutoAssociate(ctx *context.Context) { if !setting.LFS.StartServer { - ctx.NotFound(nil) + ctx.NotFound() return } oids := ctx.FormStrings("oid") @@ -505,21 +501,21 @@ func LFSAutoAssociate(ctx *context.Context) { for i, oid := range oids { idx := strings.IndexRune(oid, ' ') if idx < 0 || idx+1 > len(oid) { - ctx.ServerError("LFSAutoAssociate", fmt.Errorf("illegal oid input: %s", oid)) + ctx.ServerErrorAuto(fmt.Errorf("illegal oid input: %s", oid)) return } var err error metas[i] = &git_model.LFSMetaObject{} metas[i].Size, err = strconv.ParseInt(oid[idx+1:], 10, 64) if err != nil { - ctx.ServerError("LFSAutoAssociate", fmt.Errorf("illegal oid input: %s %w", oid, err)) + ctx.ServerErrorAuto(fmt.Errorf("illegal oid input: %s %w", oid, err)) return } metas[i].Oid = oid[:idx] // metas[i].RepositoryID = ctx.Repo.Repository.ID } if err := git_model.LFSAutoAssociate(ctx, metas, ctx.Doer, ctx.Repo.Repository.ID); err != nil { - ctx.ServerError("LFSAutoAssociate", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(ctx.Repo.RepoLink + "/settings/lfs") diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go index 7eb16a47a7a..6d4da26cd15 100644 --- a/routers/web/repo/setting/protected_branch.go +++ b/routers/web/repo/setting/protected_branch.go @@ -42,7 +42,7 @@ func ProtectedBranchRules(ctx *context.Context) { rules, err := git_model.FindRepoProtectedBranchRules(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetProtectedBranches", err) + ctx.ServerErrorAuto(err) return } ctx.Data["ProtectedBranches"] = rules @@ -63,7 +63,7 @@ func SettingsProtectedBranch(c *context.Context) { var err error rule, err = git_model.GetProtectedBranchRuleByName(c, c.Repo.Repository.ID, ruleName) if err != nil { - c.ServerError("GetProtectBranchOfRepoByName", err) + c.ServerErrorAuto(err) return } } @@ -78,7 +78,7 @@ func SettingsProtectedBranch(c *context.Context) { repoUsers, err := access_model.GetUsersWithAnyUnitAccess(c, c.Repo.Repository, perm.AccessModeRead, unit.TypeCode, unit.TypePullRequests) if err != nil { - c.ServerError("GetUsersWithUnitAccess", err) + c.ServerErrorAuto(err) return } @@ -104,7 +104,7 @@ func SettingsProtectedBranch(c *context.Context) { if c.Repo.Owner.IsOrganization() { teams, err := organization.GetTeamsWithAccessToAnyRepoUnit(c, c.Repo.Owner.ID, c.Repo.Repository.ID, perm.AccessModeRead, unit.TypeCode, unit.TypePullRequests) if err != nil { - c.ServerError("Repo.Owner.TeamsWithAccessToRepo", err) + c.ServerErrorAuto(err) return } c.Data["Teams"] = teams @@ -136,7 +136,7 @@ func SettingsProtectedBranchPost(ctx *context.Context) { // If the RuleID isn't 0, it must be an edit operation. So we get rule by id. protectBranch, err = git_model.GetProtectedBranchRuleByID(ctx, ctx.Repo.Repository.ID, f.RuleID) if err != nil { - ctx.ServerError("GetProtectBranchOfRepoByID", err) + ctx.ServerErrorAuto(err) return } if protectBranch != nil && protectBranch.RuleName != f.RuleName { @@ -144,7 +144,7 @@ func SettingsProtectedBranchPost(ctx *context.Context) { // If a rule with the same name exists, an error should be returned. sameNameProtectBranch, err := git_model.GetProtectedBranchRuleByName(ctx, ctx.Repo.Repository.ID, f.RuleName) if err != nil { - ctx.ServerError("GetProtectBranchOfRepoByName", err) + ctx.ServerErrorAuto(err) return } if sameNameProtectBranch != nil { @@ -158,7 +158,7 @@ func SettingsProtectedBranchPost(ctx *context.Context) { // But we cannot modify this logic now because many unit tests rely on it. protectBranch, err = git_model.GetProtectedBranchRuleByName(ctx, ctx.Repo.Repository.ID, f.RuleName) if err != nil { - ctx.ServerError("GetProtectBranchOfRepoByName", err) + ctx.ServerErrorAuto(err) return } } @@ -314,7 +314,7 @@ func SettingsProtectedBranchPost(ctx *context.Context) { BypassUserIDs: bypassAllowlistUsers, BypassTeamIDs: bypassAllowlistTeams, }); err != nil { - ctx.ServerError("CreateOrUpdateProtectedBranch", err) + ctx.ServerErrorAuto(err) return } @@ -371,7 +371,7 @@ func UpdateBranchProtectionPriories(ctx *context.Context) { return } if err := git_model.UpdateProtectBranchPriorities(ctx, ctx.Repo.Repository, form.IDs); err != nil { - ctx.ServerError("UpdateProtectBranchPriorities", err) + ctx.ServerErrorAuto(err) return } } @@ -381,7 +381,7 @@ func RenameBranchPost(ctx *context.Context) { form := web.GetForm[*forms.RenameBranchForm](ctx) if !ctx.Repo.CanCreateBranch() { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -404,7 +404,7 @@ func RenameBranchPost(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("repo.branch.rename_protected_branch_failed")) ctx.Redirect(ctx.Repo.RepoLink + "/branches") default: - ctx.ServerError("RenameBranch", err) + ctx.ServerErrorAuto(err) } return } diff --git a/routers/web/repo/setting/protected_tag.go b/routers/web/repo/setting/protected_tag.go index c4312eb96a6..4d7dcb25a9e 100644 --- a/routers/web/repo/setting/protected_tag.go +++ b/routers/web/repo/setting/protected_tag.go @@ -4,7 +4,6 @@ package setting import ( - "fmt" "net/http" "strings" @@ -64,7 +63,7 @@ func NewProtectedTagPost(ctx *context.Context) { } if err := git_model.InsertProtectedTag(ctx, pt); err != nil { - ctx.ServerError("InsertProtectedTag", err) + ctx.ServerErrorAuto(err) return } @@ -119,7 +118,7 @@ func EditProtectedTagPost(ctx *context.Context) { pt.AllowlistTeamIDs, _ = base.StringsToInt64s(strings.Split(form.AllowlistTeams, ",")) if err := git_model.UpdateProtectedTag(ctx, pt); err != nil { - ctx.ServerError("UpdateProtectedTag", err) + ctx.ServerErrorAuto(err) return } @@ -137,7 +136,7 @@ func DeleteProtectedTagPost(ctx *context.Context) { } if err := git_model.DeleteProtectedTag(ctx, pt); err != nil { - ctx.ServerError("DeleteProtectedTag", err) + ctx.ServerErrorAuto(err) return } @@ -153,14 +152,14 @@ func setTagsContext(ctx *context.Context) error { protectedTags, err := git_model.GetProtectedTags(ctx, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetProtectedTags", err) + ctx.ServerErrorAuto(err) return err } ctx.Data["ProtectedTags"] = protectedTags repoUsers, err := access_model.GetUsersWithAnyUnitAccess(ctx, ctx.Repo.Repository, perm.AccessModeRead, unit.TypeCode, unit.TypePullRequests) if err != nil { - ctx.ServerError("GetUsersWithUnitAccess", err) + ctx.ServerErrorAuto(err) return err } users := []*user_model.User{user_model.NewActionsUser(), user_model.NewDeployKeyUser()} @@ -169,7 +168,7 @@ func setTagsContext(ctx *context.Context) error { if ctx.Repo.Owner.IsOrganization() { teams, err := organization.GetTeamsWithAccessToAnyRepoUnit(ctx, ctx.Repo.Owner.ID, ctx.Repo.Repository.ID, perm.AccessModeRead, unit.TypeCode, unit.TypePullRequests) if err != nil { - ctx.ServerError("Repo.Owner.TeamsWithAccessToRepo", err) + ctx.ServerErrorAuto(err) return err } ctx.Data["PushTeams"] = teams @@ -186,7 +185,7 @@ func selectProtectedTagByContext(ctx *context.Context) *git_model.ProtectedTag { tag, err := git_model.GetProtectedTagByID(ctx, id) if err != nil { - ctx.ServerError("GetProtectedTagByID", err) + ctx.ServerErrorAuto(err) return nil } @@ -194,7 +193,7 @@ func selectProtectedTagByContext(ctx *context.Context) *git_model.ProtectedTag { return tag } - ctx.NotFound(fmt.Errorf("ProtectedTag[%v] not associated to repository %v", id, ctx.Repo.Repository)) + ctx.NotFound() return nil } diff --git a/routers/web/repo/setting/public_access.go b/routers/web/repo/setting/public_access.go index 15886b43548..4ff49e747e2 100644 --- a/routers/web/repo/setting/public_access.go +++ b/routers/web/repo/setting/public_access.go @@ -146,7 +146,7 @@ func PublicAccessPost(ctx *context.Context) { EveryoneAccessMode: parsed.EveryoneAccessMode, }) if err != nil { - ctx.ServerError("UpdateRepoUnitPublicAccess", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index e7175783270..d9c6f4c4c5b 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -48,7 +48,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { if ctx.Data["PageIsOrgSettings"] == true { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return nil, nil //nolint:nilnil // error is already handled by ctx.ServerError } return &secretsCtx{ @@ -80,7 +80,7 @@ func Secrets(ctx *context.Context) { sCtx, err := getSecretsCtx(ctx) if err != nil { - ctx.ServerError("getSecretsCtx", err) + ctx.ServerErrorAuto(err) return } @@ -98,7 +98,7 @@ func Secrets(ctx *context.Context) { func SecretsPost(ctx *context.Context) { sCtx, err := getSecretsCtx(ctx) if err != nil { - ctx.ServerError("getSecretsCtx", err) + ctx.ServerErrorAuto(err) return } @@ -119,7 +119,7 @@ func SecretsPost(ctx *context.Context) { func SecretsDelete(ctx *context.Context) { sCtx, err := getSecretsCtx(ctx) if err != nil { - ctx.ServerError("getSecretsCtx", err) + ctx.ServerErrorAuto(err) return } shared.PerformSecretsDelete( diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 124ac9d8d15..7e01f5fe1a4 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -91,21 +91,21 @@ func SettingsCtxData(ctx *context.Context) { if setting.Indexer.RepoIndexerEnabled { status, err := repo_model.GetIndexerStatus(ctx, ctx.Repo.Repository, repo_model.RepoIndexerTypeCode) if err != nil { - ctx.ServerError("repo.indexer_status", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CodeIndexerStatus"] = status } status, err := repo_model.GetIndexerStatus(ctx, ctx.Repo.Repository, repo_model.RepoIndexerTypeStats) if err != nil { - ctx.ServerError("repo.indexer_status", err) + ctx.ServerErrorAuto(err) return } ctx.Data["StatsIndexerStatus"] = status } pushMirrors, _, err := repo_model.GetPushMirrorsByRepoID(ctx, ctx.Repo.Repository.ID, db.ListOptions{}) if err != nil { - ctx.ServerError("GetPushMirrorsByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["PushMirrors"] = pushMirrors @@ -206,7 +206,7 @@ func SettingsPost(ctx *context.Context) { case "visibility": handleSettingsPostVisibility(ctx) default: - ctx.NotFound(nil) + ctx.NotFound() } } @@ -241,7 +241,7 @@ func handleSettingsPostUpdate(ctx *context.Context) { case errors.As(err, &errNamePatternNotAllowed): ctx.RenderWithErrDeprecated(ctx.Tr("repo.form.name_pattern_not_allowed", errNamePatternNotAllowed.Pattern), tplSettingsOptions, &form) default: - ctx.ServerError("ChangeRepositoryName", err) + ctx.ServerErrorAuto(err) } return } @@ -256,7 +256,7 @@ func handleSettingsPostUpdate(ctx *context.Context) { repo.IsTemplate = form.Template if err := repo_service.UpdateRepository(ctx, repo, false); err != nil { - ctx.ServerError("UpdateRepository", err) + ctx.ServerErrorAuto(err) return } log.Trace("Repository basic settings updated: %s/%s", ctx.Repo.Owner.Name, repo.Name) @@ -269,17 +269,13 @@ func handleSettingsPostMirror(ctx *context.Context) { form := web.GetForm[*forms.RepoSettingForm](ctx) repo := ctx.Repo.Repository if !setting.Mirror.Enabled || !repo.IsMirror || repo.IsArchived { - ctx.NotFound(nil) + ctx.NotFound() return } pullMirror, err := repo_model.GetMirrorByRepoID(ctx, ctx.Repo.Repository.ID) - if err == repo_model.ErrMirrorNotExist { - ctx.NotFound(nil) - return - } if err != nil { - ctx.ServerError("GetMirrorByRepoID", err) + ctx.ServerErrorAuto(err) return } // This section doesn't require repo_name/RepoName to be set in the form, don't show it @@ -297,7 +293,7 @@ func handleSettingsPostMirror(ctx *context.Context) { pullMirror.Interval = interval pullMirror.ScheduleNextUpdate() if err := repo_model.UpdateMirror(ctx, pullMirror); err != nil { - ctx.ServerError("UpdateMirror", err) + ctx.ServerErrorAuto(err) return } @@ -330,7 +326,7 @@ func handleSettingsPostMirror(ctx *context.Context) { } if err := mirror_service.UpdateAddress(ctx, pullMirror, address); err != nil { - ctx.ServerError("UpdateAddress", err) + ctx.ServerErrorAuto(err) return } @@ -362,7 +358,7 @@ func handleSettingsPostMirror(ctx *context.Context) { pullMirror.LFS = form.LFS pullMirror.LFSEndpoint = form.LFSEndpoint if err := repo_model.UpdateMirror(ctx, pullMirror); err != nil { - ctx.ServerError("UpdateMirror", err) + ctx.ServerErrorAuto(err) return } @@ -373,7 +369,7 @@ func handleSettingsPostMirror(ctx *context.Context) { func handleSettingsPostMirrorSync(ctx *context.Context) { repo := ctx.Repo.Repository if !setting.Mirror.Enabled || !repo.IsMirror || repo.IsArchived { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -388,13 +384,13 @@ func handleSettingsPostPushMirrorSync(ctx *context.Context) { repo := ctx.Repo.Repository if !setting.Mirror.Enabled { - ctx.NotFound(nil) + ctx.NotFound() return } m, err := repo_model.GetPushMirrorByRepoID(ctx, repo.ID, form.PushMirrorID) if err != nil { - ctx.ServerError("GetPushMirrorByRepoID", err) + ctx.ServerErrorAuto(err) return } @@ -409,7 +405,7 @@ func handleSettingsPostPushMirrorUpdate(ctx *context.Context) { repo := ctx.Repo.Repository if !setting.Mirror.Enabled || repo.IsArchived { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -425,13 +421,13 @@ func handleSettingsPostPushMirrorUpdate(ctx *context.Context) { m, err := repo_model.GetPushMirrorByRepoID(ctx, repo.ID, form.PushMirrorID) if err != nil { - ctx.ServerError("GetPushMirrorByRepoID", err) + ctx.ServerErrorAuto(err) return } m.Interval = interval if err := repo_model.UpdatePushMirrorInterval(ctx, m); err != nil { - ctx.ServerError("UpdatePushMirrorInterval", err) + ctx.ServerErrorAuto(err) return } // Background why we are adding it to Queue @@ -451,18 +447,18 @@ func handleSettingsPostPushMirrorRemove(ctx *context.Context) { repo := ctx.Repo.Repository if !setting.Mirror.Enabled || repo.IsArchived { - ctx.NotFound(nil) + ctx.NotFound() return } m, err := repo_model.GetPushMirrorByRepoID(ctx, repo.ID, form.PushMirrorID) if err != nil { - ctx.ServerError("GetPushMirrorByRepoID", err) + ctx.ServerErrorAuto(err) return } if err := mirror_service.DeleteRepoPushMirrorByID(ctx, repo.ID, m.ID); err != nil { - ctx.ServerError("DeleteRepoPushMirrorByID", err) + ctx.ServerErrorAuto(err) return } @@ -475,7 +471,7 @@ func handleSettingsPostPushMirrorAdd(ctx *context.Context) { repo := ctx.Repo.Repository if setting.Mirror.DisableNewPush || repo.IsArchived { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -518,12 +514,12 @@ func handleSettingsPostPushMirrorAdd(ctx *context.Context) { RemoteAddress: remoteAddress, } if err := db.Insert(ctx, m); err != nil { - ctx.ServerError("InsertPushMirror", err) + ctx.ServerErrorAuto(err) return } if err := mirror_service.AddPushMirrorRemote(ctx, m, address); err != nil { - ctx.ServerError("AddPushMirrorRemote", err) + ctx.ServerErrorAuto(err) return } @@ -685,12 +681,12 @@ func handleSettingsPostAdvanced(ctx *context.Context) { } if err := repo_service.UpdateRepositoryUnits(ctx, repo, units, deleteUnitTypes); err != nil { - ctx.ServerError("UpdateRepositoryUnits", err) + ctx.ServerErrorAuto(err) return } if repoChanged { if err := repo_service.UpdateRepository(ctx, repo, false); err != nil { - ctx.ServerError("UpdateRepository", err) + ctx.ServerErrorAuto(err) return } } @@ -706,7 +702,7 @@ func handleSettingsPostSigning(ctx *context.Context) { if trustModel != repo.TrustModel { repo.TrustModel = trustModel if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "trust_model"); err != nil { - ctx.ServerError("UpdateRepositoryColsNoAutoTime", err) + ctx.ServerErrorAuto(err) return } @@ -730,7 +726,7 @@ func handleSettingsPostAdmin(ctx *context.Context) { if repo.IsFsckEnabled != form.EnableHealthCheck { repo.IsFsckEnabled = form.EnableHealthCheck if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_fsck_enabled"); err != nil { - ctx.ServerError("UpdateRepositoryColsNoAutoTime", err) + ctx.ServerErrorAuto(err) return } log.Trace("Repository admin settings updated: %s/%s", ctx.Repo.Owner.Name, repo.Name) @@ -751,7 +747,7 @@ func handleSettingsPostAdminIndex(ctx *context.Context) { switch form.RequestReindexType { case "stats": if err := stats.UpdateRepoIndexer(ctx.Repo.Repository); err != nil { - ctx.ServerError("UpdateStatsRepondexer", err) + ctx.ServerErrorAuto(err) return } case "code": @@ -761,7 +757,7 @@ func handleSettingsPostAdminIndex(ctx *context.Context) { } code.UpdateRepoIndexer(ctx.Repo.Repository) default: - ctx.NotFound(nil) + ctx.NotFound() return } @@ -790,10 +786,10 @@ func handleSettingsPostConvert(ctx *context.Context) { repo.IsMirror = false if _, err := repo_service.CleanUpMigrateInfo(ctx, repo); err != nil { - ctx.ServerError("CleanUpMigrateInfo", err) + ctx.ServerErrorAuto(err) return } else if err = repo_model.DeleteRepoPullMirror(ctx, ctx.Repo.Repository.ID); err != nil { - ctx.ServerError("DeleteMirrorByRepoID", err) + ctx.ServerErrorAuto(err) return } @@ -812,7 +808,7 @@ func handleSettingsPostConvertFork(ctx *context.Context) { form := web.GetForm[*forms.RepoSettingForm](ctx) repo := ctx.Repo.Repository if err := repo.LoadOwner(ctx); err != nil { - ctx.ServerError("Convert Fork", err) + ctx.ServerErrorAuto(err) return } if repo.FullName() != form.RepoName { @@ -835,7 +831,7 @@ func handleSettingsPostConvertFork(ctx *context.Context) { if err := repo_service.ConvertForkToNormalRepository(ctx, repo); err != nil { log.Error("Unable to convert repository %-v from fork. Error: %v", repo, err) - ctx.ServerError("Convert Fork", err) + ctx.ServerErrorAuto(err) return } @@ -862,7 +858,7 @@ func handleSettingsPostTransfer(ctx *context.Context) { ctx.JSONError(ctx.Tr("form.enterred_invalid_owner_name")) return } - ctx.ServerError("IsUserExist", err) + ctx.ServerErrorAuto(err) return } @@ -892,7 +888,7 @@ func handleSettingsPostTransfer(ctx *context.Context) { } else if errors.Is(err, user_model.ErrBlockedUser) { ctx.JSONError(ctx.Tr("repo.settings.transfer.blocked_user")) } else { - ctx.ServerError("TransferOwnership", err) + ctx.ServerErrorAuto(err) } return @@ -920,13 +916,13 @@ func handleSettingsPostCancelTransfer(ctx *context.Context) { ctx.Flash.Error("repo.settings.transfer_abort_invalid") ctx.Redirect(repo.Link() + "/settings") } else { - ctx.ServerError("GetPendingRepositoryTransfer", err) + ctx.ServerErrorAuto(err) } return } if err := repo_service.CancelRepositoryTransfer(ctx, repoTransfer, ctx.Doer); err != nil { - ctx.ServerError("CancelRepositoryTransfer", err) + ctx.ServerErrorAuto(err) return } @@ -953,7 +949,7 @@ func handleSettingsPostDelete(ctx *context.Context) { } if err := repo_service.DeleteRepository(ctx, ctx.Doer, ctx.Repo.Repository, true); err != nil { - ctx.ServerError("DeleteRepository", err) + ctx.ServerErrorAuto(err) return } log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, repo.Name) @@ -1097,7 +1093,7 @@ func handleSettingRemoteAddrError(ctx *context.Context, err error, form *forms.R case addrErr.IsInvalidPath: ctx.RenderWithErrDeprecated(ctx.Tr("repo.migrate.invalid_local_path"), tplSettingsOptions, form) default: - ctx.ServerError("Unknown error", err) + ctx.ServerErrorAuto(err) } return } diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index 7fc8a4b6dcb..215f96d4fec 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -51,7 +51,7 @@ func Webhooks(ctx *context.Context) { ws, err := db.Find[webhook.Webhook](ctx, webhook.ListWebhookOptions{RepoID: ctx.Repo.Repository.ID}) if err != nil { - ctx.ServerError("GetWebhooksByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Webhooks"] = ws @@ -127,7 +127,7 @@ func (orCtx *ownerRepoCtx) recordWebhookAudit(ctx *context.Context, actions audi func checkHookType(ctx *context.Context) string { hookType := strings.ToLower(ctx.PathParam("type")) if !util.SliceContainsString(setting.Webhook.Types, hookType, true) { - ctx.NotFound(nil) + ctx.NotFound() return "" } return hookType @@ -140,7 +140,7 @@ func WebhooksNew(ctx *context.Context) { orCtx, err := getOwnerRepoCtx(ctx) if err != nil { - ctx.ServerError("getOwnerRepoCtx", err) + ctx.ServerErrorAuto(err) return } @@ -227,7 +227,7 @@ func createWebhook(ctx *context.Context, params webhookParams) { orCtx, err := getOwnerRepoCtx(ctx) if err != nil { - ctx.ServerError("getOwnerRepoCtx", err) + ctx.ServerErrorAuto(err) return } ctx.Data["BaseLink"] = orCtx.LinkNew @@ -241,7 +241,7 @@ func createWebhook(ctx *context.Context, params webhookParams) { if params.Meta != nil { meta, err = json.Marshal(params.Meta) if err != nil { - ctx.ServerError("Marshal", err) + ctx.ServerErrorAuto(err) return } } @@ -262,14 +262,14 @@ func createWebhook(ctx *context.Context, params webhookParams) { } err = w.SetHeaderAuthorization(params.WebhookForm.AuthorizationHeader) if err != nil { - ctx.ServerError("SetHeaderAuthorization", err) + ctx.ServerErrorAuto(err) return } if err := w.UpdateEvent(); err != nil { - ctx.ServerError("UpdateEvent", err) + ctx.ServerErrorAuto(err) return } else if err := webhook.CreateWebhook(ctx, w); err != nil { - ctx.ServerError("CreateWebhook", err) + ctx.ServerErrorAuto(err) return } @@ -300,7 +300,7 @@ func editWebhook(ctx *context.Context, params webhookParams) { if params.Meta != nil { meta, err = json.Marshal(params.Meta) if err != nil { - ctx.ServerError("Marshal", err) + ctx.ServerErrorAuto(err) return } } @@ -316,15 +316,15 @@ func editWebhook(ctx *context.Context, params webhookParams) { err = w.SetHeaderAuthorization(params.WebhookForm.AuthorizationHeader) if err != nil { - ctx.ServerError("SetHeaderAuthorization", err) + ctx.ServerErrorAuto(err) return } if err := w.UpdateEvent(); err != nil { - ctx.ServerError("UpdateEvent", err) + ctx.ServerErrorAuto(err) return } else if err := webhook.UpdateWebhook(ctx, w); err != nil { - ctx.ServerError("UpdateWebhook", err) + ctx.ServerErrorAuto(err) return } @@ -614,7 +614,7 @@ func packagistHookParams(ctx *context.Context) webhookParams { func checkWebhook(ctx *context.Context) (*ownerRepoCtx, *webhook.Webhook) { orCtx, err := getOwnerRepoCtx(ctx) if err != nil { - ctx.ServerError("getOwnerRepoCtx", err) + ctx.ServerErrorAuto(err) return nil, nil } ctx.Data["BaseLink"] = orCtx.Link @@ -629,11 +629,7 @@ func checkWebhook(ctx *context.Context) (*ownerRepoCtx, *webhook.Webhook) { w, err = webhook.GetSystemOrDefaultWebhook(ctx, ctx.PathParamInt64("id")) } if err != nil || w == nil { - if webhook.IsErrWebhookNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("GetWebhookByID", err) - } + ctx.ServerErrorAuto(err) return nil, nil } @@ -653,7 +649,7 @@ func checkWebhook(ctx *context.Context) (*ownerRepoCtx, *webhook.Webhook) { ctx.Data["History"], err = w.History(ctx, 1) if err != nil { - ctx.ServerError("History", err) + ctx.ServerErrorAuto(err) } return orCtx, w } @@ -741,11 +737,7 @@ func ReplayWebhook(ctx *context.Context) { } if err := webhook_service.ReplayHookTask(ctx, w, hookTaskUUID); err != nil { - if webhook.IsErrHookTaskNotExist(err) { - ctx.NotFound(nil) - } else { - ctx.ServerError("ReplayHookTask", err) - } + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/star.go b/routers/web/repo/star.go index 46c969d021f..26b5bf5800b 100644 --- a/routers/web/repo/star.go +++ b/routers/web/repo/star.go @@ -23,7 +23,7 @@ func ActionStar(ctx *context.Context) { ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID) ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.Name) if err != nil { - ctx.ServerError("GetRepositoryByName", err) + ctx.ServerErrorAuto(err) return } ctx.HTML(http.StatusOK, tplStarUnstar) diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go index dda100f699a..ab0f0900f8d 100644 --- a/routers/web/repo/treelist.go +++ b/routers/web/repo/treelist.go @@ -24,13 +24,13 @@ import ( func TreeList(ctx *context.Context) { tree, err := ctx.Repo.Commit.SubTree(ctx, ctx.Repo.GitRepo, "/") if err != nil { - ctx.ServerError("Repo.Commit.SubTree", err) + ctx.ServerErrorAuto(err) return } entries, err := tree.ListEntriesRecursiveFast(ctx, ctx.Repo.GitRepo) if err != nil { - ctx.ServerError("ListEntriesRecursiveFast", err) + ctx.ServerErrorAuto(err) return } entries.CustomSort(base.NaturalSortCompare) @@ -148,7 +148,7 @@ func TreeViewNodes(ctx *context.Context) { renderedIconPool := fileicon.NewRenderedIconPool() results, err := files_service.GetTreeViewNodes(ctx, ctx.Repo.RepoLink, renderedIconPool, ctx.Repo.GitRepo, ctx.Repo.Commit, ctx.Repo.TreePath, ctx.FormString("sub_path")) if err != nil { - ctx.ServerError("GetTreeViewNodes", err) + ctx.ServerErrorAuto(err) return } ctx.JSON(http.StatusOK, map[string]any{"fileTreeNodes": results, "renderedIconPool": renderedIconPool.IconSVGs}) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index bd2e867746c..04e1d7cdd39 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -6,7 +6,6 @@ package repo import ( gocontext "context" - "errors" "fmt" "html/template" "io" @@ -130,7 +129,7 @@ func loadLatestCommitData(ctx *context.Context, latestCommit *git.Commit) bool { if err := asymkey_model.CalculateTrustStatus(verification, ctx.Repo.Repository.GetTrustModel(), func(user *user_model.User) (bool, error) { return repo_model.HasAccessToRepoCodeUnit(ctx, ctx.Repo.Repository, user.ID) }, nil); err != nil { - ctx.ServerError("CalculateTrustStatus", err) + ctx.ServerErrorAuto(err) return false } @@ -175,12 +174,12 @@ func checkHomeCodeViewable(ctx *context.Context) { ctx.HTML(http.StatusOK, tplMigrating) return } - ctx.ServerError("models.GetMigratingTask", err) + ctx.ServerErrorAuto(err) return } cfg, err := task.MigrateConfig() if err != nil { - ctx.ServerError("task.MigrateConfig", err) + ctx.ServerErrorAuto(err) return } @@ -194,7 +193,7 @@ func checkHomeCodeViewable(ctx *context.Context) { if ctx.IsSigned { // Set repo notification-status read if unread if err := activities_model.SetRepoReadBy(ctx, ctx.Repo.Repository.ID, ctx.Doer.ID); err != nil { - ctx.ServerError("ReadBy", err) + ctx.ServerErrorAuto(err) return } } @@ -218,7 +217,7 @@ func checkHomeCodeViewable(ctx *context.Context) { } } - ctx.NotFound(errors.New(ctx.Locale.TrString("units.error.no_unit_allowed_repo"))) + ctx.NotFound() } // LastCommit returns lastCommit data for the provided branch/tag/commit and directory (in url) and filenames in body @@ -258,7 +257,7 @@ func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) { func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) (*git.TreeEntry, git.Entries) { tree, err := ctx.Repo.Commit.SubTree(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - HandleGitError(ctx, "Repo.Commit.SubTree", err) + HandleGitError(ctx, err) return nil, nil } @@ -269,25 +268,25 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) (*git.Tre // Get current entry user currently looking at. entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - HandleGitError(ctx, "Repo.Commit.GetTreeEntryByPath", err) + HandleGitError(ctx, err) return nil, nil } if !entry.IsDir() { - HandleGitError(ctx, "Repo.Commit.GetTreeEntryByPath", err) + HandleGitError(ctx, err) return nil, nil } subEntries, err := tree.ListEntries(ctx, ctx.Repo.GitRepo) if err != nil { - ctx.ServerError("ListEntries", err) + ctx.ServerErrorAuto(err) return nil, nil } subEntries.CustomSort(base.NaturalSortCompare) files, latestCommit, err := subEntries.GetCommitsInfo(ctx, timeout, ctx.Repo.RepoLink, ctx.Repo.GitRepo, ctx.Repo.Commit, ctx.Repo.TreePath) if err != nil { - ctx.ServerError("GetCommitsInfo", err) + ctx.ServerErrorAuto(err) return nil, nil } @@ -339,7 +338,7 @@ func RenderUserCards(ctx *context.Context, total int, getter func(opts db.ListOp PageSize: setting.ItemsPerPage, }) if err != nil { - ctx.ServerError("getter", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Cards"] = items @@ -380,12 +379,12 @@ func Forks(ctx *context.Context) { PageSize: pageSize, }) if err != nil { - ctx.ServerError("FindForks", err) + ctx.ServerErrorAuto(err) return } if err := repo_model.RepositoryList(forks).LoadOwners(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/repo/view_file.go b/routers/web/repo/view_file.go index 398c4ad8cd9..8466df472e2 100644 --- a/routers/web/repo/view_file.go +++ b/routers/web/repo/view_file.go @@ -33,7 +33,7 @@ import ( func prepareLatestCommitInfo(ctx *context.Context) bool { commit, err := ctx.Repo.Commit.GetCommitByPath(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - ctx.ServerError("GetCommitByPath", err) + ctx.ServerErrorAuto(err) return false } @@ -46,7 +46,7 @@ func prepareFileViewLfsAttrs(ctx *context.Context) (*attribute.Attributes, bool) Attributes: []string{attribute.LinguistGenerated, attribute.LinguistVendored, attribute.LinguistLanguage, attribute.GitlabLanguage}, }) if err != nil { - ctx.ServerError("attribute.CheckAttributes", err) + ctx.ServerErrorAuto(err) return nil, false } attrs := attrsMap[ctx.Repo.TreePath] @@ -82,7 +82,7 @@ func handleFileViewRenderMarkup(ctx *context.Context, prefetchBuf []byte, utf8Re var err error ctx.Data["EscapeStatus"], ctx.Data["FileContent"], err = markupRenderToHTML(ctx, rctx, renderer, utf8Reader) if err != nil { - ctx.ServerError("Render", err) + ctx.ServerErrorAuto(err) return true } @@ -248,7 +248,7 @@ func prepareFileView(ctx *context.Context, entry *git.TreeEntry) { // avoid creating an unnecessary temporary cat file. buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, blob) if err != nil { - ctx.ServerError("getFileReader", err) + ctx.ServerErrorAuto(err) return } defer dataRc.Close() @@ -323,13 +323,13 @@ func prepareFileViewEditorButtons(ctx *context.Context) bool { lfsLock, err := git_model.GetTreePathLock(ctx, ctx.Repo.Repository.ID, ctx.Repo.TreePath) ctx.Data["LFSLock"] = lfsLock if err != nil { - ctx.ServerError("GetTreePathLock", err) + ctx.ServerErrorAuto(err) return false } if lfsLock != nil { u, err := user_model.GetUserByID(ctx, lfsLock.OwnerID) if err != nil { - ctx.ServerError("GetTreePathLock", err) + ctx.ServerErrorAuto(err) return false } ctx.Data["LFSLockOwner"] = u.Name diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go index 4e4037d667c..f174d895737 100644 --- a/routers/web/repo/view_home.go +++ b/routers/web/repo/view_home.go @@ -55,7 +55,7 @@ func prepareHomeSidebarRepoTopics(ctx *context.Context) { RepoID: ctx.Repo.Repository.ID, }) if err != nil { - ctx.ServerError("models.FindTopics", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Topics"] = topics @@ -98,7 +98,7 @@ func prepareClonePanel(ctx *context.Context) { func prepareHomeSidebarCitationFile(ctx *context.Context) { allEntries, err := ctx.Repo.Commit.Tree().ListEntries(ctx, ctx.Repo.GitRepo) if err != nil { - ctx.ServerError("ListEntries", err) + ctx.ServerErrorAuto(err) return } isBlobSupported := func(entry *git.TreeEntry) bool { @@ -147,7 +147,7 @@ type licenseGroup struct { func prepareHomeSidebarLicenses(ctx *context.Context) { repoLicenses, err := repo_model.GetUniqueRepoLicenses(ctx, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetRepoLicenses", err) + ctx.ServerErrorAuto(err) return } if len(repoLicenses) == 0 { @@ -184,7 +184,7 @@ func prepareToRenderDirectory(ctx *context.Context) { subfolder, readmeFile, err := findReadmeFileInRepoTree(ctx, ctx.Repo.TreePath, treeEntry, subEntries) if err != nil { - ctx.ServerError("findReadmeFileInRepo", err) + ctx.ServerErrorAuto(err) return } prepareToRenderReadmeFile(ctx, subfolder, readmeFile) @@ -193,7 +193,7 @@ func prepareToRenderDirectory(ctx *context.Context) { func prepareHomeSidebarLanguageStats(ctx *context.Context) { langs, err := repo_model.GetTopLanguageStats(ctx, ctx.Repo.Repository, 5) if err != nil { - ctx.ServerError("Repo.GetTopLanguageStats", err) + ctx.ServerErrorAuto(err) return } @@ -207,13 +207,13 @@ func prepareHomeSidebarLatestRelease(ctx *context.Context) { release, err := repo_model.GetLatestRelease(ctx, ctx.Repo.Repository) if err != nil && !repo_model.IsErrReleaseNotExist(err) { - ctx.ServerError("GetLatestRelease", err) + ctx.ServerErrorAuto(err) return } if release != nil { if err = release.LoadAttributes(ctx); err != nil { - ctx.ServerError("release.LoadAttributes", err) + ctx.ServerErrorAuto(err) return } ctx.Data["LatestRelease"] = release @@ -240,7 +240,7 @@ func updateContextRepoEmptyAndStatus(ctx *context.Context, empty bool, status re ctx.Repo.Repository.Status = status // only handle ready and broken status, leave other status as-is } if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, ctx.Repo.Repository, "is_empty", "status"); err != nil { - ctx.ServerError("updateContextRepoEmptyAndStatus: UpdateRepositoryCols", err) + ctx.ServerErrorAuto(err) return } } @@ -282,7 +282,7 @@ func handleRepoEmptyOrBroken(ctx *context.Context) { // 2) the user replaces an empty git repo manually. updateContextRepoEmptyAndStatus(ctx, false, repo_model.RepositoryReady) if err := repo_module.UpdateRepoSize(ctx, ctx.Repo.Repository); err != nil { - ctx.ServerError("UpdateRepoSize", err) + ctx.ServerErrorAuto(err) return } @@ -302,7 +302,7 @@ func handleRepoViewSubmodule(ctx *context.Context, commitSubmoduleFile *git.Comm submoduleWebLink := commitSubmoduleFile.SubmoduleWebLinkTree(ctx) if submoduleWebLink == nil { ctx.Data["NotFoundPrompt"] = ctx.Repo.TreePath - ctx.NotFound(nil) + ctx.NotFound() return } @@ -313,7 +313,7 @@ func handleRepoViewSubmodule(ctx *context.Context, commitSubmoduleFile *git.Comm } else if !httplib.IsCurrentGiteaSiteURL(ctx, redirectLink) { // don't auto-redirect to external URL, to avoid open redirect or phishing ctx.Data["NotFoundPrompt"] = redirectLink - ctx.NotFound(nil) + ctx.NotFound() } else { ctx.RedirectToCurrentSite(redirectLink) } @@ -324,7 +324,7 @@ func prepareToRenderDirOrFile(entry *git.TreeEntry) func(ctx *context.Context) { if entry.IsSubModule() { commitSubmoduleFile, err := git.GetCommitInfoSubmoduleFile(ctx, ctx.Repo.RepoLink, ctx.Repo.TreePath, ctx.Repo.GitRepo, ctx.Repo.Commit, entry.ID) if err != nil { - HandleGitError(ctx, "prepareToRenderDirOrFile: GetCommitInfoSubmoduleFile", err) + HandleGitError(ctx, err) return } handleRepoViewSubmodule(ctx, commitSubmoduleFile) @@ -349,7 +349,7 @@ func handleRepoHomeFeed(ctx *context.Context) bool { } else if !ctx.Repo.Permission.CanRead(unit_model.TypeCode) && !ctx.Repo.CanWriteToBranch(ctx, ctx.Doer, ctx.Repo.BranchName) { // the branch and file feeds list commits, so gate them like RequireUnitReader(TypeCode) on "/rss/branch/*", // which also admits maintainers of a PR allowing maintainer edits, who can push to its head branch without code read access - ctx.NotFound(nil) + ctx.NotFound() } else { feed.RenderBranchFeed(ctx, showFeedType) } @@ -462,7 +462,7 @@ func Home(ctx *context.Context) { // get the current git entry which doer user is currently looking at. entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx, ctx.Repo.GitRepo, ctx.Repo.TreePath) if err != nil { - HandleGitError(ctx, "Repo.Commit.GetTreeEntryByPath", err) + HandleGitError(ctx, err) return } diff --git a/routers/web/repo/view_readme.go b/routers/web/repo/view_readme.go index 3341c3b1388..2afb5d88e84 100644 --- a/routers/web/repo/view_readme.go +++ b/routers/web/repo/view_readme.go @@ -168,7 +168,7 @@ func prepareToRenderReadmeFile(ctx *context.Context, subfolder string, readmeFil buf, dataRc, fInfo, err := getFileReader(ctx, ctx.Repo.Repository.ID, readmeTargetEntry.Blob(ctx.Repo.GitRepo)) if err != nil { - ctx.ServerError("getFileReader", err) + ctx.ServerErrorAuto(err) return } defer dataRc.Close() diff --git a/routers/web/repo/watch.go b/routers/web/repo/watch.go index 92a9fe9ed3b..1176104b3cd 100644 --- a/routers/web/repo/watch.go +++ b/routers/web/repo/watch.go @@ -33,14 +33,14 @@ func ActionWatch(ctx *context.Context) { watch, err := repo_model.GetWatch(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID) if err != nil { - ctx.ServerError("GetWatch", err) + ctx.ServerErrorAuto(err) return } ctx.Data["RepoWatch"] = watch ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.Name) if err != nil { - ctx.ServerError("GetRepositoryByName", err) + ctx.ServerErrorAuto(err) return } ctx.HTML(http.StatusOK, tplWatch) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index dd6c514fff3..181cecd7709 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -56,7 +56,7 @@ func MustEnableWiki(ctx *context.Context) { ctx.Repo.Repository, ctx.Repo.Permission) } - ctx.NotFound(nil) + ctx.NotFound() return } @@ -96,7 +96,7 @@ func findEntryForFile(ctx gocontext.Context, wikiRepo *git.Repository, commit *g func findWikiRepoCommit(ctx *context.Context) (*git.Repository, *git.Commit, error) { wikiGitRepo, errGitRepo := git.RepositoryFromRequestContextOrOpen(ctx, ctx.Repo.Repository.WikiStorageRepo()) if errGitRepo != nil { - ctx.ServerError("OpenRepository", errGitRepo) + ctx.ServerErrorAuto(errGitRepo) return nil, nil, errGitRepo } @@ -127,13 +127,13 @@ func findWikiRepoCommit(ctx *context.Context) (*git.Repository, *git.Commit, err func wikiContentsByEntry(ctx *context.Context, wikiRepo *git.Repository, entry *git.TreeEntry) []byte { reader, err := entry.Blob(wikiRepo).DataAsync(ctx) if err != nil { - ctx.ServerError("Blob.Data", err) + ctx.ServerErrorAuto(err) return nil } defer reader.Close() content, err := util.ReadWithLimit(reader, 5*1024*1024) // 5MB should be enough for a wiki page if err != nil { - ctx.ServerError("ReadAll", err) + ctx.ServerErrorAuto(err) return nil } return content @@ -147,7 +147,7 @@ func wikiEntryByName(ctx *context.Context, wikiRepo *git.Repository, commit *git gitFilename := wiki_service.WebPathToGitPath(wikiName) entry, err := findEntryForFile(ctx, wikiRepo, commit, gitFilename) if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findEntryForFile", err) + ctx.ServerErrorAuto(err) return nil, "", false, false } if entry == nil { @@ -155,7 +155,7 @@ func wikiEntryByName(ctx *context.Context, wikiRepo *git.Repository, commit *git gitFilename := strings.TrimSuffix(gitFilename, ".md") entry, err = findEntryForFile(ctx, wikiRepo, commit, gitFilename) if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findEntryForFile", err) + ctx.ServerErrorAuto(err) return nil, "", false, false } isRaw = true @@ -180,7 +180,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { wikiGitRepo, commit, err := findWikiRepoCommit(ctx) if err != nil { if !git.IsErrNotExist(err) { - ctx.ServerError("GetBranchCommit", err) + ctx.ServerErrorAuto(err) } return nil, nil } @@ -188,7 +188,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { // get the wiki pages list. entries, err := commit.Tree().ListEntries(ctx, wikiGitRepo) if err != nil { - ctx.ServerError("ListEntries", err) + ctx.ServerErrorAuto(err) return nil, nil } pages := make([]PageMeta, 0, len(entries)) @@ -201,7 +201,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { if repo_model.IsErrWikiInvalidFileName(err) { continue } - ctx.ServerError("WikiFilenameToName", err) + ctx.ServerErrorAuto(err) return nil, nil } else if wikiName == "_Sidebar" || wikiName == "_Footer" { continue @@ -256,7 +256,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { ctx.Data["EscapeStatus"], ctx.Data["WikiContentHTML"], err = renderFn(data) if err != nil { - ctx.ServerError("Render", err) + ctx.ServerErrorAuto(err) return nil, nil } @@ -273,7 +273,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { } ctx.Data["WikiSidebarEscapeStatus"], ctx.Data["WikiSidebarHTML"], err = renderFn(sidebarContent) if err != nil { - ctx.ServerError("Render", err) + ctx.ServerErrorAuto(err) return nil, nil } } @@ -285,7 +285,7 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { } ctx.Data["WikiFooterEscapeStatus"], ctx.Data["WikiFooterHTML"], err = renderFn(footerContent) if err != nil { - ctx.ServerError("Render", err) + ctx.ServerErrorAuto(err) return nil, nil } } @@ -301,7 +301,7 @@ func renderRevisionPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) wikiGitRepo, commit, err := findWikiRepoCommit(ctx) if err != nil { if !git.IsErrNotExist(err) { - ctx.ServerError("GetBranchCommit", err) + ctx.ServerErrorAuto(err) } return nil, nil } @@ -342,12 +342,12 @@ func renderRevisionPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) Page: page, }) if err != nil { - ctx.ServerError("CommitsByFileAndRange", err) + ctx.ServerErrorAuto(err) return nil, nil } ctx.Data["Commits"], err = git_service.ConvertFromGitCommit(ctx, commitsHistory, ctx.Repo.Repository, "") // no current ref sub path for wiki commit list if err != nil { - ctx.ServerError("ConvertFromGitCommit", err) + ctx.ServerErrorAuto(err) return nil, nil } @@ -361,7 +361,7 @@ func renderEditPage(ctx *context.Context) { wikiGitRepo, commit, err := findWikiRepoCommit(ctx) if err != nil { if !git.IsErrNotExist(err) { - ctx.ServerError("GetBranchCommit", err) + ctx.ServerErrorAuto(err) } return } @@ -404,14 +404,14 @@ func WikiPost(ctx *context.Context) { switch ctx.FormString("action") { case "_new": if !ctx.Repo.Permission.CanWrite(unit.TypeWiki) { - ctx.NotFound(nil) + ctx.NotFound() return } NewWikiPost(ctx) return case "_delete": if !ctx.Repo.Permission.CanWrite(unit.TypeWiki) { - ctx.NotFound(nil) + ctx.NotFound() return } DeleteWikiPagePost(ctx) @@ -419,7 +419,7 @@ func WikiPost(ctx *context.Context) { } if !ctx.Repo.Permission.CanWrite(unit.TypeWiki) { - ctx.NotFound(nil) + ctx.NotFound() return } EditWikiPost(ctx) @@ -438,14 +438,14 @@ func Wiki(ctx *context.Context) { return case "_edit": if !ctx.Repo.Permission.CanWrite(unit.TypeWiki) { - ctx.NotFound(nil) + ctx.NotFound() return } EditWiki(ctx) return case "_new": if !ctx.Repo.Permission.CanWrite(unit.TypeWiki) { - ctx.NotFound(nil) + ctx.NotFound() return } NewWiki(ctx) @@ -476,7 +476,7 @@ func Wiki(ctx *context.Context) { // Get last change information. lastCommit, err := wikiGitRepo.GetCommitByPath(ctx, wikiPath) if err != nil { - ctx.ServerError("GetCommitByPath", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Committer"] = lastCommit.Committer @@ -508,7 +508,7 @@ func WikiRevision(ctx *context.Context) { wikiPath := entry.Name() lastCommit, err := wikiGitRepo.GetCommitByPath(ctx, wikiPath) if err != nil { - ctx.ServerError("GetCommitByPath", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Committer"] = lastCommit.Committer @@ -535,20 +535,20 @@ func WikiPages(ctx *context.Context) { treePath := "" // To support list sub folders' pages in the future tree, err := commit.SubTree(ctx, wikiGitRepo, treePath) if err != nil { - ctx.ServerError("SubTree", err) + ctx.ServerErrorAuto(err) return } allEntries, err := tree.ListEntries(ctx, wikiGitRepo) if err != nil { - ctx.ServerError("ListEntries", err) + ctx.ServerErrorAuto(err) return } allEntries.CustomSort(base.NaturalSortCompare) entries, _, err := allEntries.GetCommitsInfo(ctx, 0, ctx.Repo.RepoLink, wikiGitRepo, commit, treePath) if err != nil { - ctx.ServerError("GetCommitsInfo", err) + ctx.ServerErrorAuto(err) return } @@ -562,7 +562,7 @@ func WikiPages(ctx *context.Context) { if repo_model.IsErrWikiInvalidFileName(err) { continue } - ctx.ServerError("WikiFilenameToName", err) + ctx.ServerErrorAuto(err) return } _, displayName := wiki_service.WebPathToUserTitle(wikiName) @@ -582,11 +582,7 @@ func WikiPages(ctx *context.Context) { func WikiRaw(ctx *context.Context) { wikiGitRepo, commit, err := findWikiRepoCommit(ctx) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(nil) - return - } - ctx.ServerError("findEntryForfile", err) + ctx.ServerErrorAuto(err) return } @@ -597,7 +593,7 @@ func WikiRaw(ctx *context.Context) { // Try to find a file with that name entry, err = findEntryForFile(ctx, wikiGitRepo, commit, providedGitPath) if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findFile", err) + ctx.ServerErrorAuto(err) return } @@ -606,7 +602,7 @@ func WikiRaw(ctx *context.Context) { providedGitPath = strings.TrimSuffix(providedGitPath, ".md") entry, err = findEntryForFile(ctx, wikiGitRepo, commit, providedGitPath) if err != nil && !git.IsErrNotExist(err) { - ctx.ServerError("findFile", err) + ctx.ServerErrorAuto(err) return } } @@ -614,12 +610,12 @@ func WikiRaw(ctx *context.Context) { if entry != nil { if err = common.ServeBlob(ctx.Base, ctx.Repo.Repository, ctx.Repo.TreePath, entry.Blob(wikiGitRepo), nil); err != nil { - ctx.ServerError("ServeBlob", err) + ctx.ServerErrorAuto(err) } return } - ctx.NotFound(nil) + ctx.NotFound() } func wikiHandleEditError(ctx *context.Context, wikiName wiki_service.WebPath, err error) { @@ -628,7 +624,7 @@ func wikiHandleEditError(ctx *context.Context, wikiName wiki_service.WebPath, er } else if repo_model.IsErrWikiAlreadyExist(err) { ctx.JSONErrorWithField(ctx.Tr("repo.wiki.page_already_exists"), "title") } else { - ctx.ServerError("EditWiki", err) + ctx.ServerErrorAuto(err) } } @@ -714,7 +710,7 @@ func DeleteWikiPagePost(ctx *context.Context) { wikiName := wiki_service.WebPathFromRequest(ctx.PathParamRaw("*")) wikiName = util.IfZero(wikiName, "Home") if err := wiki_service.DeleteWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, wikiName); err != nil { - ctx.ServerError("DeleteWikiPage", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/actions/general.go b/routers/web/shared/actions/general.go index f1188d20791..b82933d32b5 100644 --- a/routers/web/shared/actions/general.go +++ b/routers/web/shared/actions/general.go @@ -49,7 +49,7 @@ func GeneralSettings(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -60,14 +60,14 @@ func GeneralSettings(ctx *context.Context) { ctx.Data["PageIsUserSettings"] = true ctx.Data["PageIsUserSettingsActionsGeneral"] = true } else { - ctx.NotFound(nil) + ctx.NotFound() return } // Load User/Org Actions Config actionsCfg, err := actions_model.GetOwnerActionsConfig(ctx, rCtx.OwnerID) if err != nil { - ctx.ServerError("GetOwnerActionsConfig", err) + ctx.ServerErrorAuto(err) return } @@ -83,7 +83,7 @@ func GeneralSettings(ctx *context.Context) { // Load Allowed Repositories allowedRepos, err := repo_model.GetOwnerRepositoriesByIDs(ctx, rCtx.OwnerID, actionsCfg.AllowedCrossRepoIDs) if err != nil { - ctx.ServerError("GetOwnerRepositoriesByIDs", err) + ctx.ServerErrorAuto(err) return } @@ -101,18 +101,18 @@ func GeneralSettings(ctx *context.Context) { func UpdateGeneralSettings(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } if !rCtx.IsOrg && !rCtx.IsUser { - ctx.NotFound(nil) + ctx.NotFound() return } actionsCfg, err := actions_model.GetOwnerActionsConfig(ctx, rCtx.OwnerID) if err != nil { - ctx.ServerError("GetOwnerActionsConfig", err) + ctx.ServerErrorAuto(err) return } @@ -125,7 +125,7 @@ func UpdateGeneralSettings(ctx *context.Context) { ctx.JSONError("Repository doesn't exist") return } - ctx.ServerError("GetRepositoryByName", err) + ctx.ServerErrorAuto(err) return } if !slices.Contains(actionsCfg.AllowedCrossRepoIDs, targetRepo.ID) { @@ -152,7 +152,7 @@ func UpdateGeneralSettings(ctx *context.Context) { } if err := actions_model.SetOwnerActionsConfig(ctx, rCtx.OwnerID, actionsCfg); err != nil { - ctx.ServerError("SetOwnerActionsConfig", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/actions/job_queue.go b/routers/web/shared/actions/job_queue.go index a0710983e46..dd78779c033 100644 --- a/routers/web/shared/actions/job_queue.go +++ b/routers/web/shared/actions/job_queue.go @@ -58,7 +58,7 @@ func RenderJobQueue(ctx *context.Context, repoID int64, fullTemplate templates.T if repoID == 0 { var err error if filterOwnerID, filterRepoID, err = renderJobQueueFilterOptions(ctx); err != nil { - ctx.ServerError("renderJobQueueFilterOptions", err) + ctx.ServerErrorAuto(err) return } } @@ -70,11 +70,11 @@ func RenderJobQueue(ctx *context.Context, repoID int64, fullTemplate templates.T Status: status, }, page, jobQueuePageSize) if err != nil { - ctx.ServerError("FindJobQueueJobs", err) + ctx.ServerErrorAuto(err) return } if err := actions_model.ActionJobList(jobs).LoadAttributes(ctx, true); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -82,7 +82,7 @@ func RenderJobQueue(ctx *context.Context, repoID int64, fullTemplate templates.T return job.TaskID, job.TaskID > 0 })) if err != nil { - ctx.ServerError("GetTaskRunnerNames", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index d199ffc43b4..a0e694788bc 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -15,7 +15,6 @@ import ( "gitea.dev/modules/log" "gitea.dev/modules/setting" "gitea.dev/modules/templates" - "gitea.dev/modules/util" "gitea.dev/modules/web" shared_user "gitea.dev/routers/web/shared/user" "gitea.dev/services/context" @@ -105,7 +104,7 @@ func Runners(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -129,19 +128,19 @@ func Runners(ctx *context.Context) { runners, count, err := db.FindAndCount[actions_model.ActionRunner](ctx, opts) if err != nil { - ctx.ServerError("CountRunners", err) + ctx.ServerErrorAuto(err) return } if err := actions_model.RunnerList(runners).LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } // ownid=0,repo_id=0,means this token is used for global token, err := actions_model.GetOrCreateActiveRunnerToken(ctx, opts.OwnerID, opts.RepoID) if err != nil { - ctx.ServerError("GetOrCreateActiveRunnerToken", err) + ctx.ServerErrorAuto(err) return } @@ -167,7 +166,7 @@ func RunnersEdit(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -179,16 +178,15 @@ func RunnersEdit(ctx *context.Context) { runner, err := actions_model.GetRunnerByID(ctx, runnerID) if err != nil { - ctx.ServerError("GetRunnerByID", err) + ctx.ServerErrorAuto(err) return } if err := runner.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } if !runner.EditableInContext(ownerID, repoID) { - err = errors.New("no permission to edit this runner") - ctx.NotFound(err) + ctx.NotFound() return } @@ -205,12 +203,12 @@ func RunnersEdit(ctx *context.Context) { tasks, count, err := db.FindAndCount[actions_model.ActionTask](ctx, opts) if err != nil { - ctx.ServerError("CountTasks", err) + ctx.ServerErrorAuto(err) return } if err = actions_model.TaskList(tasks).LoadAttributes(ctx); err != nil { - ctx.ServerError("TasksLoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -224,7 +222,7 @@ func RunnersEdit(ctx *context.Context) { func RunnersEditPost(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -236,11 +234,11 @@ func RunnersEditPost(ctx *context.Context) { runner, err := actions_model.GetRunnerByID(ctx, runnerID) if err != nil { log.Warn("RunnerDetailsEditPost.GetRunnerByID failed: %v, url: %s", err, ctx.Req.URL) - ctx.ServerError("RunnerDetailsEditPost.GetRunnerByID", err) + ctx.ServerErrorAuto(err) return } if !runner.EditableInContext(ownerID, repoID) { - ctx.NotFound(util.NewPermissionDeniedErrorf("no permission to edit this runner")) + ctx.NotFound() return } @@ -264,7 +262,7 @@ func RunnersEditPost(ctx *context.Context) { func ResetRunnerRegistrationToken(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -273,7 +271,7 @@ func ResetRunnerRegistrationToken(ctx *context.Context) { redirectTo := rCtx.RedirectLink if _, err := actions_model.NewRunnerToken(ctx, ownerID, repoID); err != nil { - ctx.ServerError("ResetRunnerRegistrationToken", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("actions.runners.reset_registration_token_success")) @@ -284,7 +282,7 @@ func ResetRunnerRegistrationToken(ctx *context.Context) { func RunnerDeletePost(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -294,7 +292,7 @@ func RunnerDeletePost(ctx *context.Context) { } if !runner.EditableInContext(rCtx.OwnerID, rCtx.RepoID) { - ctx.NotFound(util.NewPermissionDeniedErrorf("no permission to delete this runner")) + ctx.NotFound() return } @@ -319,7 +317,7 @@ func RunnerDeletePost(ctx *context.Context) { func RunnerUpdatePost(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -329,7 +327,7 @@ func RunnerUpdatePost(ctx *context.Context) { } if !runner.EditableInContext(rCtx.OwnerID, rCtx.RepoID) { - ctx.NotFound(util.NewPermissionDeniedErrorf("no permission to edit this runner")) + ctx.NotFound() return } @@ -362,7 +360,7 @@ func RunnerUpdatePost(ctx *context.Context) { func RunnerBulkActionPost(ctx *context.Context) { rCtx, err := getRunnersCtx(ctx) if err != nil { - ctx.ServerError("getRunnersCtx", err) + ctx.ServerErrorAuto(err) return } @@ -395,7 +393,7 @@ func RunnerBulkActionPost(ctx *context.Context) { runners, err := db.Find[actions_model.ActionRunner](ctx, &actions_model.FindRunnerOptions{IDs: runnerIDs}) if err != nil { - ctx.ServerError("FindRunners", err) + ctx.ServerErrorAuto(err) return } @@ -453,10 +451,10 @@ func findActionsRunner(ctx *context.Context, rCtx *runnersCtx) *actions_model.Ac got, err := db.Find[actions_model.ActionRunner](ctx, opts) if err != nil { - ctx.ServerError("FindRunner", err) + ctx.ServerErrorAuto(err) return nil } else if len(got) == 0 { - ctx.NotFound(errors.New("runner not found")) + ctx.NotFound() return nil } diff --git a/routers/web/shared/actions/scoped_workflows.go b/routers/web/shared/actions/scoped_workflows.go index c1af3c26b05..d2c7410a51b 100644 --- a/routers/web/shared/actions/scoped_workflows.go +++ b/routers/web/shared/actions/scoped_workflows.go @@ -44,7 +44,7 @@ type scopedWorkflowsCtx struct { func getScopedWorkflowsCtx(ctx *context.Context) (*scopedWorkflowsCtx, error) { if ctx.Data["PageIsOrgSettings"] == true { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return nil, nil //nolint:nilnil // error is already handled by ctx.ServerError } return &scopedWorkflowsCtx{ @@ -102,7 +102,7 @@ func ScopedWorkflows(ctx *context.Context) { swCtx, err := getScopedWorkflowsCtx(ctx) if err != nil { - ctx.ServerError("getScopedWorkflowsCtx", err) + ctx.ServerErrorAuto(err) return } if ctx.Written() { @@ -120,7 +120,7 @@ func ScopedWorkflows(ctx *context.Context) { sources, err := actions_model.GetScopedWorkflowSourcesByOwner(ctx, swCtx.OwnerID) if err != nil { - ctx.ServerError("GetScopedWorkflowSourcesByOwner", err) + ctx.ServerErrorAuto(err) return } @@ -233,7 +233,7 @@ func listSourceScopedWorkflowFiles(ctx *context.Context, repo *repo_model.Reposi func ScopedWorkflowAdd(ctx *context.Context) { swCtx, err := getScopedWorkflowsCtx(ctx) if err != nil { - ctx.ServerError("getScopedWorkflowsCtx", err) + ctx.ServerErrorAuto(err) return } if ctx.Written() { @@ -260,7 +260,7 @@ func ScopedWorkflowAdd(ctx *context.Context) { } if err := actions_model.AddScopedWorkflowSource(ctx, swCtx.OwnerID, repo.ID); err != nil { - ctx.ServerError("AddScopedWorkflowSource", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("actions.scoped_workflows.source.add_success")) @@ -270,7 +270,7 @@ func ScopedWorkflowAdd(ctx *context.Context) { func ScopedWorkflowSetRequired(ctx *context.Context) { swCtx, err := getScopedWorkflowsCtx(ctx) if err != nil { - ctx.ServerError("getScopedWorkflowsCtx", err) + ctx.ServerErrorAuto(err) return } if ctx.Written() { @@ -284,7 +284,7 @@ func ScopedWorkflowSetRequired(ctx *context.Context) { if errors.Is(err, util.ErrNotExist) { ctx.JSONError(ctx.Tr("actions.scoped_workflows.source.not_found")) } else { - ctx.ServerError("GetScopedWorkflowSource", err) + ctx.ServerErrorAuto(err) } return } @@ -292,14 +292,14 @@ func ScopedWorkflowSetRequired(ctx *context.Context) { // Live workflow entry names on the source default branch, used to distinguish orphan configs (whose workflow file no longer exists) from live ones. sourceRepo, err := repo_model.GetRepositoryByID(ctx, repoID) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } liveSet := make(container.Set[string]) if !sourceRepo.IsEmpty { // an empty source has no live workflows _, parsed, err := actions_service.LoadParsedScopedWorkflows(ctx, sourceRepo) if err != nil { - ctx.ServerError("LoadParsedScopedWorkflows", err) + ctx.ServerErrorAuto(err) return } for _, p := range parsed { @@ -329,7 +329,7 @@ func ScopedWorkflowSetRequired(ctx *context.Context) { } } if err := actions_model.SetScopedWorkflowSourceConfigs(ctx, swCtx.OwnerID, repoID, configs); err != nil { - ctx.ServerError("SetScopedWorkflowSourceConfigs", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("actions.scoped_workflows.required.update_success")) @@ -339,7 +339,7 @@ func ScopedWorkflowSetRequired(ctx *context.Context) { func ScopedWorkflowRemove(ctx *context.Context) { swCtx, err := getScopedWorkflowsCtx(ctx) if err != nil { - ctx.ServerError("getScopedWorkflowsCtx", err) + ctx.ServerErrorAuto(err) return } if ctx.Written() { @@ -348,7 +348,7 @@ func ScopedWorkflowRemove(ctx *context.Context) { repoID := ctx.FormInt64("repo_id") if err := actions_model.RemoveScopedWorkflowSource(ctx, swCtx.OwnerID, repoID); err != nil { - ctx.ServerError("RemoveScopedWorkflowSource", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("actions.scoped_workflows.source.remove_success")) diff --git a/routers/web/shared/actions/variables.go b/routers/web/shared/actions/variables.go index fb45af5aa33..4d1de919c48 100644 --- a/routers/web/shared/actions/variables.go +++ b/routers/web/shared/actions/variables.go @@ -48,7 +48,7 @@ func getVariablesCtx(ctx *context.Context) (*variablesCtx, error) { if ctx.Data["PageIsOrgSettings"] == true { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return nil, nil //nolint:nilnil // error is already handled by ctx.ServerError } return &variablesCtx{ @@ -87,7 +87,7 @@ func Variables(ctx *context.Context) { vCtx, err := getVariablesCtx(ctx) if err != nil { - ctx.ServerError("getVariablesCtx", err) + ctx.ServerErrorAuto(err) return } @@ -95,7 +95,7 @@ func Variables(ctx *context.Context) { BelongingScope: vCtx.BelongingScope, }) if err != nil { - ctx.ServerError("FindVariables", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Variables"] = variables @@ -107,7 +107,7 @@ func Variables(ctx *context.Context) { func VariableCreate(ctx *context.Context) { vCtx, err := getVariablesCtx(ctx) if err != nil { - ctx.ServerError("getVariablesCtx", err) + ctx.ServerErrorAuto(err) return } @@ -131,7 +131,7 @@ func VariableCreate(ctx *context.Context) { func VariableUpdate(ctx *context.Context) { vCtx, err := getVariablesCtx(ctx) if err != nil { - ctx.ServerError("getVariablesCtx", err) + ctx.ServerErrorAuto(err) return } @@ -167,10 +167,10 @@ func findActionsVariable(ctx *context.Context, id int64, vCtx *variablesCtx) *ac } got, err := actions_model.FindVariables(ctx, opts) if err != nil { - ctx.ServerError("FindVariables", err) + ctx.ServerErrorAuto(err) return nil } else if len(got) == 0 { - ctx.NotFound(nil) + ctx.NotFound() return nil } return got[0] @@ -179,7 +179,7 @@ func findActionsVariable(ctx *context.Context, id int64, vCtx *variablesCtx) *ac func VariableDelete(ctx *context.Context) { vCtx, err := getVariablesCtx(ctx) if err != nil { - ctx.ServerError("getVariablesCtx", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/audit/audit.go b/routers/web/shared/audit/audit.go index 3d1045442ce..e12d43ed87a 100644 --- a/routers/web/shared/audit/audit.go +++ b/routers/web/shared/audit/audit.go @@ -93,7 +93,7 @@ func View(ctx *context.Context, opts ViewOptions) { evs, total, err := audit.FindEvents(ctx, searchOpts) if err != nil { - ctx.ServerError("FindEvents", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/issue/issue_label.go b/routers/web/shared/issue/issue_label.go index 7aefa435d37..5315626c9d4 100644 --- a/routers/web/shared/issue/issue_label.go +++ b/routers/web/shared/issue/issue_label.go @@ -35,7 +35,7 @@ func PrepareFilterIssueLabels(ctx *context.Context, repoID int64, owner *user_mo if repoID != 0 { repoLabels, err := issues_model.GetLabelsByRepoID(ctx, repoID, "", db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByRepoID", err) + ctx.ServerErrorAuto(err) return ret } issues_model.SortLabelsForDisplay(repoLabels) @@ -45,7 +45,7 @@ func PrepareFilterIssueLabels(ctx *context.Context, repoID int64, owner *user_mo if owner != nil && owner.IsOrganization() { orgLabels, err := issues_model.GetLabelsByOrgID(ctx, owner.ID, "", db.ListOptions{}) if err != nil { - ctx.ServerError("GetLabelsByOrgID", err) + ctx.ServerErrorAuto(err) return ret } issues_model.SortLabelsForDisplay(orgLabels) diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index d88d0be637b..11bd32443c8 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -23,7 +23,7 @@ import ( func SetPackagesContext(ctx *context.Context, owner *user_model.User) { pcrs, err := packages_model.GetCleanupRulesByOwner(ctx, owner.ID) if err != nil { - ctx.ServerError("GetCleanupRulesByOwner", err) + ctx.ServerErrorAuto(err) return } @@ -67,7 +67,7 @@ func PerformRuleEditPost(ctx *context.Context, owner *user_model.User, redirectU if form.Action == "remove" { if err := packages_model.DeleteCleanupRuleByID(ctx, pcr.ID); err != nil { - ctx.ServerError("DeleteCleanupRuleByID", err) + ctx.ServerErrorAuto(err) return } @@ -106,14 +106,14 @@ func performRuleEditPost(ctx *context.Context, owner *user_model.User, pcr *pack if isEditRule { if err := packages_model.UpdateCleanupRule(ctx, pcr); err != nil { - ctx.ServerError("UpdateCleanupRule", err) + ctx.ServerErrorAuto(err) return } } else { pcr.Type = packages_model.Type(form.Type) if has, err := packages_model.HasOwnerCleanupRuleForPackageType(ctx, owner.ID, pcr.Type); err != nil { - ctx.ServerError("HasOwnerCleanupRuleForPackageType", err) + ctx.ServerErrorAuto(err) return } else if has { ctx.Data["Err_Type"] = true @@ -124,7 +124,7 @@ func performRuleEditPost(ctx *context.Context, owner *user_model.User, pcr *pack var err error if pcr, err = packages_model.InsertCleanupRule(ctx, pcr); err != nil { - ctx.ServerError("InsertCleanupRule", err) + ctx.ServerErrorAuto(err) return } } @@ -140,7 +140,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) { } if err := pcr.CompiledPattern(); err != nil { - ctx.ServerError("CompiledPattern", err) + ctx.ServerErrorAuto(err) return } @@ -148,7 +148,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) { packages, err := packages_model.GetPackagesByType(ctx, pcr.OwnerID, pcr.Type) if err != nil { - ctx.ServerError("GetPackagesByType", err) + ctx.ServerErrorAuto(err) return } @@ -161,7 +161,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) { Sort: packages_model.SortCreatedDesc, }) if err != nil { - ctx.ServerError("SearchVersions", err) + ctx.ServerErrorAuto(err) return } if pcr.KeepCount > 0 { @@ -173,7 +173,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) { } for _, pv := range pvs { if skip, err := container_service.ShouldBeSkipped(ctx, pcr, p, pv); err != nil { - ctx.ServerError("ShouldBeSkipped", err) + ctx.ServerErrorAuto(err) return } else if skip { continue @@ -195,7 +195,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) { pd, err := packages_model.GetPackageDescriptor(ctx, pv) if err != nil { - ctx.ServerError("GetPackageDescriptor", err) + ctx.ServerErrorAuto(err) return } versionsToRemove = append(versionsToRemove, pd) @@ -214,11 +214,7 @@ func getCleanupRuleByContext(ctx *context.Context, owner *user_model.User) *pack pcr, err := packages_model.GetCleanupRuleByID(ctx, id) if err != nil { - if err == packages_model.ErrPackageCleanupRuleNotExist { - ctx.NotFound(err) - } else { - ctx.ServerError("GetCleanupRuleByID", err) - } + ctx.ServerErrorAuto(err) return nil } @@ -226,7 +222,7 @@ func getCleanupRuleByContext(ctx *context.Context, owner *user_model.User) *pack return pcr } - ctx.NotFound(fmt.Errorf("PackageCleanupRule[%v] not associated to owner %v", id, owner)) + ctx.NotFound() return nil } diff --git a/routers/web/shared/project/project.go b/routers/web/shared/project/project.go index 29d6d75b2f4..9eb38f8a524 100644 --- a/routers/web/shared/project/project.go +++ b/routers/web/shared/project/project.go @@ -26,7 +26,7 @@ func findProject(ctx *context.Context) *project_model.Project { project, err = project_model.GetProjectByIDAndOwner(ctx, ctx.PathParamInt64("id"), ctx.ContextUser.ID) } if err != nil { - ctx.ServerError("GetProject", err) + ctx.ServerErrorAuto(err) return nil } return project @@ -39,7 +39,7 @@ func findColumn(ctx *context.Context) (*project_model.Project, *project_model.Co } column, err := project_model.GetColumnByIDAndProjectID(ctx, ctx.PathParamInt64("columnID"), project.ID) if err != nil { - ctx.ServerError("GetColumnByIDAndProjectID", err) + ctx.ServerErrorAuto(err) return nil, nil } return project, column @@ -60,7 +60,7 @@ func MoveColumns(ctx *context.Context) { form := &movedColumnsForm{} if err := json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil { - ctx.ServerError("DecodeMovedColumnsForm", err) + ctx.ServerErrorAuto(err) return } @@ -70,7 +70,7 @@ func MoveColumns(ctx *context.Context) { } if err := project_model.MoveColumnsOnProject(ctx, project, sortedColumnIDs); err != nil { - ctx.ServerError("MoveColumnsOnProject", err) + ctx.ServerErrorAuto(err) return } @@ -127,7 +127,7 @@ func DeleteProjectColumn(ctx *context.Context) { } if err := project_model.DeleteColumnByID(ctx, column.ID); err != nil { - ctx.ServerError("DeleteProjectColumnByID", err) + ctx.ServerErrorAuto(err) return } @@ -141,7 +141,7 @@ func SetDefaultProjectColumn(ctx *context.Context) { } if err := project_model.SetDefaultColumn(ctx, project.ID, column.ID); err != nil { - ctx.ServerError("SetDefaultColumn", err) + ctx.ServerErrorAuto(err) return } @@ -159,25 +159,25 @@ func MoveIssues(ctx *context.Context) { PrevIssueID int64 `json:"prevIssueID"` }{} if err := json.NewDecoder(ctx.Req.Body).Decode(form); err != nil { - ctx.ServerError("DecodeMovedIssueForm", err) + ctx.ServerErrorAuto(err) return } issue, err := issues_model.GetIssueByID(ctx, form.IssueID) if err != nil { - ctx.ServerError("GetIssueByID", err) + ctx.ServerErrorAuto(err) return } if err = issue.LoadRepo(ctx); err != nil { - ctx.ServerError("LoadRepo", err) + ctx.ServerErrorAuto(err) return } if !project.CanBeAccessedByOwnerRepo(issue.Repo.OwnerID, issue.Repo) { - ctx.ServerError("Some issue's repoID is not equal to project's repoID", errors.New("Some issue's repoID is not equal to project's repoID")) + ctx.ServerErrorAuto(errors.New("Some issue's repoID is not equal to project's repoID")) return } if err = project_service.MoveIssueAfter(ctx, ctx.Doer, column, issue, form.PrevIssueID); err != nil { - ctx.ServerError("MoveIssueAfter", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/project/workflow.go b/routers/web/shared/project/workflow.go index 045d71c5bf9..dd0a4c63839 100644 --- a/routers/web/shared/project/workflow.go +++ b/routers/web/shared/project/workflow.go @@ -27,37 +27,37 @@ func RenderWorkflows(ctx *context.Context, canWrite bool, tpl templates.TplName) if canWrite { var err error if canWrite, err = project_service.CanManageWorkflows(ctx, ctx.Doer, project); err != nil { - ctx.ServerError("CanManageWorkflows", err) + ctx.ServerErrorAuto(err) return } } workflows, err := db.Find[project_model.Workflow](ctx, project_model.FindWorkflowsOptions{ListOptions: db.ListOptionsAll, ProjectIDs: []int64{project.ID}}) if err != nil { - ctx.ServerError("FindWorkflows", err) + ctx.ServerErrorAuto(err) return } var workflowID int64 if param := ctx.PathParam("workflow_id"); param != "" { id, err := strconv.ParseInt(param, 10, 64) if err != nil || !slices.ContainsFunc(workflows, func(workflow *project_model.Workflow) bool { return workflow.ID == id }) { - ctx.NotFound(nil) + ctx.NotFound() return } workflowID = id } event := ctx.FormString("event") if event != "" && !project_model.WorkflowEvent(event).IsValid() { - ctx.NotFound(nil) + ctx.NotFound() return } columns, err := project_model.GetColumns(ctx, project.ID, db.ListOptionsAll) if err != nil { - ctx.ServerError("GetColumns", err) + ctx.ServerErrorAuto(err) return } labels, err := project_service.GetProjectLabels(ctx, project) if err != nil { - ctx.ServerError("GetProjectLabels", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/secrets/secrets.go b/routers/web/shared/secrets/secrets.go index 93a9057551c..2d743b3ab8e 100644 --- a/routers/web/shared/secrets/secrets.go +++ b/routers/web/shared/secrets/secrets.go @@ -21,7 +21,7 @@ import ( func SetSecretsContext(ctx *context.Context, scope actions_model.BelongingScope) { secrets, err := db.Find[secret_model.Secret](ctx, secret_model.FindSecretsOptions{BelongingScope: scope}) if err != nil { - ctx.ServerError("FindSecrets", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/shared/user/block.go b/routers/web/shared/user/block.go index 92354f1cd39..5302762ccdc 100644 --- a/routers/web/shared/user/block.go +++ b/routers/web/shared/user/block.go @@ -20,11 +20,11 @@ func BlockedUsers(ctx *context.Context, blocker *user_model.User) { BlockerID: blocker.ID, }) if err != nil { - ctx.ServerError("FindBlockings", err) + ctx.ServerErrorAuto(err) return } if err := user_model.BlockingList(blocks).LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } ctx.Data["UserBlocks"] = blocks diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index b620c9f1874..76b5ab97767 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -34,7 +34,7 @@ func prepareContextForProfileBigAvatar(ctx *context.Context) { if len(ctx.ContextUser.Description) != 0 { content, err := markdown.RenderString(markup.NewRenderContext(ctx).WithMetas(markup.ComposeSimpleDocumentMetas()), ctx.ContextUser.Description) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } ctx.Data["RenderedDescription"] = content @@ -50,7 +50,7 @@ func prepareContextForProfileBigAvatar(ctx *context.Context) { }, }) if err != nil { - ctx.ServerError("FindOrgs", err) + ctx.ServerErrorAuto(err) return } if len(orgs) > setting.UI.User.OrgPagingNum { @@ -62,7 +62,7 @@ func prepareContextForProfileBigAvatar(ctx *context.Context) { badges, _, err := user_model.GetUserBadges(ctx, ctx.ContextUser) if err != nil { - ctx.ServerError("GetUserBadges", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Badges"] = badges @@ -78,7 +78,7 @@ func prepareContextForProfileBigAvatar(ctx *context.Context) { if ctx.Doer != nil { ctx.Data["UserBlocking"], err = user_model.GetBlocking(ctx, ctx.Doer.ID, ctx.ContextUser.ID) if err != nil && !errors.Is(err, util.ErrNotExist) { - ctx.ServerError("GetBlocking", err) + ctx.ServerErrorAuto(err) } } } diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go index 080413744a4..d8bafb7181d 100644 --- a/routers/web/user/avatar.go +++ b/routers/web/user/avatar.go @@ -27,7 +27,7 @@ func AvatarByUsernameSize(ctx *context.Context) { if user == nil { var err error if user, err = user_model.GetUserByName(ctx, username); err != nil { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) return } } @@ -39,7 +39,7 @@ func AvatarByEmailHash(ctx *context.Context) { hash := ctx.PathParam("hash") email, err := avatars.GetEmailForHash(ctx, hash) if err != nil { - ctx.ServerError("invalid avatar hash: "+hash, err) + ctx.ServerErrorAuto(err) return } size := ctx.FormInt("size") diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 0c794c3ec09..b20625dabf7 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -28,7 +28,7 @@ func CodeSearch(ctx *context.Context) { return } if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -54,7 +54,7 @@ func CodeSearch(ctx *context.Context) { repoIDs, err = repo_model.FindUserCodeAccessibleOwnerRepoIDs(ctx, ctx.ContextUser.ID, ctx.Doer) if err != nil { - ctx.ServerError("FindUserCodeAccessibleOwnerRepoIDs", err) + ctx.ServerErrorAuto(err) return } @@ -77,7 +77,7 @@ func CodeSearch(ctx *context.Context) { }) if err != nil { if code_indexer.IsAvailable(ctx) { - ctx.ServerError("SearchResults", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CodeIndexerUnavailable"] = true @@ -94,7 +94,7 @@ func CodeSearch(ctx *context.Context) { repoMaps, err := repo_model.GetRepositoriesMapByIDs(ctx, loadRepoIDs) if err != nil { - ctx.ServerError("GetRepositoriesMapByIDs", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/user/heatmap.go b/routers/web/user/heatmap.go index a9e7ac86ccf..ce1b7944a36 100644 --- a/routers/web/user/heatmap.go +++ b/routers/web/user/heatmap.go @@ -48,7 +48,7 @@ func writeHeatmapJSON(ctx *context.Context, hdata []*activities_model.UserHeatma // DashboardHeatmap returns heatmap data as JSON, for the individual user, organization or team dashboard. func DashboardHeatmap(ctx *context.Context) { if !setting.Service.EnableUserHeatmap { - ctx.NotFound(nil) + ctx.NotFound() return } var data []*activities_model.UserHeatmapData @@ -59,7 +59,7 @@ func DashboardHeatmap(ctx *context.Context) { data, err = activities_model.GetUserHeatmapDataByOrgTeam(ctx, ctx.Org.Organization, ctx.Org.Team, ctx.Doer) } if err != nil { - ctx.ServerError("GetUserHeatmapData", err) + ctx.ServerErrorAuto(err) return } writeHeatmapJSON(ctx, data) diff --git a/routers/web/user/home.go b/routers/web/user/home.go index ac0e0027374..5282a7c7240 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -67,7 +67,7 @@ func prepareDashboardContextUserOrgTeams(ctx *context.Context) *user_model.User orgs, err := organization.GetUserOrgsList(ctx, ctx.Doer) if err != nil { - ctx.ServerError("GetUserOrgsList", err) + ctx.ServerErrorAuto(err) return nil } ctx.Data["Orgs"] = orgs @@ -124,7 +124,7 @@ func Dashboard(ctx *context.Context) { ListOptions: db.ListOptions{Page: page, PageSize: pageSize}, }) if err != nil { - ctx.ServerError("GetFeeds", err) + ctx.ServerErrorAuto(err) return } @@ -215,7 +215,7 @@ func Milestones(ctx *context.Context) { IsClosed: optional.Some(isShowClosed), }) if err != nil { - ctx.ServerError("CountMilestonesByRepoIDs", err) + ctx.ServerErrorAuto(err) return } @@ -230,13 +230,13 @@ func Milestones(ctx *context.Context) { Name: keyword, }) if err != nil { - ctx.ServerError("SearchMilestones", err) + ctx.ServerErrorAuto(err) return } showRepos, _, err := repo_model.SearchRepositoryByCondition(ctx, repoOpts, userRepoCond, false) if err != nil { - ctx.ServerError("SearchRepositoryByCondition", err) + ctx.ServerErrorAuto(err) return } sort.Sort(showRepos) @@ -257,14 +257,14 @@ func Milestones(ctx *context.Context) { rctx := renderhelper.NewRenderContextRepoComment(ctx, milestones[i].Repo) milestones[i].RenderedContent, err = markdown.RenderString(rctx, milestones[i].Content) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } if milestones[i].Repo.IsTimetrackerEnabled(ctx) { err := milestones[i].LoadTotalTrackedTime(ctx) if err != nil { - ctx.ServerError("LoadTotalTrackedTime", err) + ctx.ServerErrorAuto(err) return } } @@ -273,7 +273,7 @@ func Milestones(ctx *context.Context) { milestoneStats, err := issues_model.GetMilestonesStatsByRepoCondAndKw(ctx, repoCond, keyword) if err != nil { - ctx.ServerError("GetMilestoneStats", err) + ctx.ServerErrorAuto(err) return } @@ -283,7 +283,7 @@ func Milestones(ctx *context.Context) { } else { totalMilestoneStats, err = issues_model.GetMilestonesStatsByRepoCondAndKw(ctx, userRepoCond, keyword) if err != nil { - ctx.ServerError("GetMilestoneStats", err) + ctx.ServerErrorAuto(err) return } } @@ -471,7 +471,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { { ids, _, err := repo_model.SearchRepositoryIDs(ctx, repoOpts) if err != nil { - ctx.ServerError("SearchRepositoryIDs", err) + ctx.ServerErrorAuto(err) return } accessibleRepos.AddMultiple(ids...) @@ -544,19 +544,19 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { }, )) if err != nil { - ctx.ServerError("issueIDsFromSearch", err) + ctx.ServerErrorAuto(err) return } issues, err = issues_model.GetIssuesByIDs(ctx, issueIDs, true) if err != nil { - ctx.ServerError("GetIssuesByIDs", err) + ctx.ServerErrorAuto(err) return } } commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, ctx.Doer, issues) if err != nil { - ctx.ServerError("GetIssuesLastCommitStatus", err) + ctx.ServerErrorAuto(err) return } @@ -569,7 +569,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { }, )) if err != nil { - ctx.ServerError("getUserIssueStats", err) + ctx.ServerErrorAuto(err) return } @@ -586,14 +586,14 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, ctx.FormString("RepoLink")) if err := issues.LoadAttributes(ctx); err != nil { - ctx.ServerError("issues.LoadAttributes", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Issues"] = issues approvalCounts, err := issues.GetApprovalCounts(ctx) if err != nil { - ctx.ServerError("ApprovalCounts", err) + ctx.ServerErrorAuto(err) return } ctx.Data["ApprovalCounts"] = func(issueID int64, typ string) int64 { @@ -642,7 +642,7 @@ func ShowSSHKeys(ctx *context.Context) { OwnerID: ctx.ContextUser.ID, }) if err != nil { - ctx.ServerError("ListPublicKeys", err) + ctx.ServerErrorAuto(err) return } @@ -666,7 +666,7 @@ func ShowGPGKeys(ctx *context.Context) { OwnerID: ctx.ContextUser.ID, }) if err != nil { - ctx.ServerError("ListGPGKeys", err) + ctx.ServerErrorAuto(err) return } @@ -679,7 +679,7 @@ func ShowGPGKeys(ctx *context.Context) { failedEntitiesID = append(failedEntitiesID, k.KeyID) continue // Skip previous import without backup of imported armored key } - ctx.ServerError("ShowGPGKeys", err) + ctx.ServerErrorAuto(err) return } entities = append(entities, e) @@ -698,7 +698,7 @@ func ShowGPGKeys(ctx *context.Context) { for _, e := range entities { err = e.Serialize(writer) // TODO find why key are exported with a different cipherTypeByte as original (should not be blocking but strange) if err != nil { - ctx.ServerError("ShowGPGKeys", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index aa6ffab0335..c5ddaaccc56 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -59,7 +59,7 @@ func prepareUserNotificationsData(ctx *context.Context) { Status: []activities_model.NotificationStatus{queryStatus}, }) if err != nil { - ctx.ServerError("ErrGetNotificationCount", err) + ctx.ServerErrorAuto(err) return } @@ -80,7 +80,7 @@ func prepareUserNotificationsData(ctx *context.Context) { Status: statuses, }) if err != nil { - ctx.ServerError("db.Find[activities_model.Notification]", err) + ctx.ServerErrorAuto(err) return } @@ -90,30 +90,30 @@ func prepareUserNotificationsData(ctx *context.Context) { repos, failures, err := notifications.LoadRepos(ctx) if err != nil { - ctx.ServerError("LoadRepos", err) + ctx.ServerErrorAuto(err) return } notifications = notifications.Without(failures) if err := repos.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } failCount += len(failures) notifications, failures, err = filterNotificationsByRepoAccess(ctx, ctx.Doer, notifications) if err != nil { - ctx.ServerError("filterNotificationsByRepoAccess", err) + ctx.ServerErrorAuto(err) return } failCount += len(failures) failures, err = notifications.LoadIssues(ctx) if err != nil { - ctx.ServerError("LoadIssues", err) + ctx.ServerErrorAuto(err) return } if err = notifications.LoadIssuePullRequests(ctx); err != nil { - ctx.ServerError("LoadIssuePullRequests", err) + ctx.ServerErrorAuto(err) return } @@ -122,7 +122,7 @@ func prepareUserNotificationsData(ctx *context.Context) { failures, err = notifications.LoadComments(ctx) if err != nil { - ctx.ServerError("LoadComments", err) + ctx.ServerErrorAuto(err) return } notifications = notifications.Without(failures) @@ -183,7 +183,7 @@ func NotificationStatusPost(ctx *context.Context) { return // ignore user's invalid input } if _, err := notifications.SetNotificationStatus(ctx, notificationID, ctx.Doer, newStatus); err != nil { - ctx.ServerError("SetNotificationStatus", err) + ctx.ServerErrorAuto(err) return } @@ -197,7 +197,7 @@ func NotificationStatusPost(ctx *context.Context) { // NotificationPurgePost is a route for 'purging' the list of notifications - marking all unread as read func NotificationPurgePost(ctx *context.Context) { if err := notifications.MarkAllRead(ctx, ctx.Doer); err != nil { - ctx.ServerError("MarkAllRead", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect(setting.AppSubURL + "/notifications") @@ -207,12 +207,12 @@ func NotificationPurgePost(ctx *context.Context) { func NotificationPurgePagePost(ctx *context.Context) { nl, err := activities_model.GetNotificationsByIDs(ctx, ctx.FormStringInt64s("ids"), ctx.Doer.ID) if err != nil { - ctx.ServerError("GetNotificationsByIDs", err) + ctx.ServerErrorAuto(err) return } _, err = notifications.SetManyNotificationStatuses(ctx, nl, ctx.Doer, activities_model.NotificationStatusRead) if err != nil { - ctx.ServerError("SetManyNotificationStatuses", err) + ctx.ServerErrorAuto(err) return } ctx.JSONRedirect("") @@ -269,7 +269,7 @@ func NotificationSubscriptions(ctx *context.Context) { LabelIDs: labelIDs, }) if err != nil { - ctx.ServerError("CountIssues", err) + ctx.ServerErrorAuto(err) return } issues, err := issues_model.Issues(ctx, &issues_model.IssuesOptions{ @@ -284,13 +284,13 @@ func NotificationSubscriptions(ctx *context.Context) { LabelIDs: labelIDs, }) if err != nil { - ctx.ServerError("Issues", err) + ctx.ServerErrorAuto(err) return } commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, ctx.Doer, issues) if err != nil { - ctx.ServerError("GetIssuesAllCommitStatus", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CommitLastStatus"] = lastStatus @@ -300,7 +300,7 @@ func NotificationSubscriptions(ctx *context.Context) { approvalCounts, err := issues.GetApprovalCounts(ctx) if err != nil { - ctx.ServerError("ApprovalCounts", err) + ctx.ServerErrorAuto(err) return } ctx.Data["ApprovalCounts"] = func(issueID int64, typ string) int64 { @@ -407,7 +407,7 @@ func NotificationWatching(ctx *context.Context) { IsPrivate: private, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Total"] = count @@ -415,7 +415,7 @@ func NotificationWatching(ctx *context.Context) { watches, err := repo_model.GetUserWatches(ctx, ctx.Doer.ID, repos.IDs()) if err != nil { - ctx.ServerError("GetUserWatches", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Watches"] = watches diff --git a/routers/web/user/package.go b/routers/web/user/package.go index ffd9ff7cc52..37630cc0437 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -5,7 +5,6 @@ package user import ( gocontext "context" - "errors" "net/http" "net/url" "time" @@ -49,7 +48,7 @@ const ( // ListPackages displays a list of all packages of the context user func ListPackages(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } page := max(ctx.FormInt("page"), 1) @@ -67,13 +66,13 @@ func ListPackages(ctx *context.Context) { IsInternal: optional.Some(false), }) if err != nil { - ctx.ServerError("SearchLatestVersions", err) + ctx.ServerErrorAuto(err) return } pds, err := packages_model.GetPackageDescriptors(ctx, pvs) if err != nil { - ctx.ServerError("GetPackageDescriptors", err) + ctx.ServerErrorAuto(err) return } @@ -88,7 +87,7 @@ func ListPackages(ctx *context.Context) { permission, err := access_model.GetDoerRepoPermission(ctx, pd.Repository, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } repositoryAccessMap[pd.Repository.ID] = permission.HasAnyUnitAccess() @@ -96,7 +95,7 @@ func ListPackages(ctx *context.Context) { hasPackages, err := packages_model.HasOwnerPackages(ctx, ctx.ContextUser.ID) if err != nil { - ctx.ServerError("HasOwnerPackages", err) + ctx.ServerErrorAuto(err) return } @@ -111,7 +110,7 @@ func ListPackages(ctx *context.Context) { ctx.Data["RepositoryAccessMap"] = repositoryAccessMap if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -138,11 +137,7 @@ func ListPackages(ctx *context.Context) { func RedirectToLastVersion(ctx *context.Context) { p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.Type(ctx.PathParam("type")), ctx.PathParam("name")) if err != nil { - if err == packages_model.ErrPackageNotExist { - ctx.NotFound(err) - } else { - ctx.ServerError("GetPackageByName", err) - } + ctx.ServerErrorAuto(err) return } @@ -151,17 +146,17 @@ func RedirectToLastVersion(ctx *context.Context) { IsInternal: optional.Some(false), }) if err != nil { - ctx.ServerError("GetPackageByName", err) + ctx.ServerErrorAuto(err) return } if len(pvs) == 0 { - ctx.NotFound(err) + ctx.NotFound() return } pd, err := packages_model.GetPackageDescriptor(ctx, pvs[0]) if err != nil { - ctx.ServerError("GetPackageDescriptor", err) + ctx.ServerErrorAuto(err) return } ctx.Redirect(pd.VersionWebLink()) @@ -188,7 +183,7 @@ func viewPackageContainerImage(ctx gocontext.Context, pd *packages_model.Package // ViewPackageVersion displays a single package version func ViewPackageVersion(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -207,7 +202,7 @@ func ViewPackageVersion(ctx *context.Context) { if submodule := ctx.PathParam("submodule"); submodule != "" { metadata, ok := pd.Metadata.(*tfmod.Metadata) // the route is shared by all package types if !ok || metadata.Submodules[submodule] == nil { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["PackageSubmodule"] = submodule @@ -274,11 +269,8 @@ func ViewPackageVersion(ctx *context.Context) { imageMetadata := pd.Metadata if versionSub != "" { imageMetadata, err = viewPackageContainerImage(ctx, pd, versionSub) - if errors.Is(err, util.ErrNotExist) { - ctx.NotFound(nil) - return - } else if err != nil { - ctx.ServerError("viewPackageContainerImage", err) + if err != nil { + ctx.ServerErrorAuto(err) return } } @@ -300,7 +292,7 @@ func ViewPackageVersion(ctx *context.Context) { }) } if err != nil { - ctx.ServerError("", err) + ctx.ServerErrorAuto(err) return } ctx.Data["LatestVersions"] = pvs @@ -308,7 +300,7 @@ func ViewPackageVersion(ctx *context.Context) { pkgSpec := packages_service.GetSpecManager().Get(pd.Package.Type) viewData, err := pkgSpec.GetViewPackageVersionData(ctx, pd) if err != nil { - ctx.ServerError("GetViewPackageVersionData", err) + ctx.ServerErrorAuto(err) return } @@ -320,7 +312,7 @@ func ViewPackageVersion(ctx *context.Context) { if pd.Repository != nil { permission, err := access_model.GetDoerRepoPermission(ctx, pd.Repository, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } hasRepositoryAccess = permission.HasAnyUnitAccess() @@ -332,17 +324,13 @@ func ViewPackageVersion(ctx *context.Context) { // ListPackageVersions lists all versions of a package func ListPackageVersions(ctx *context.Context) { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.Type(ctx.PathParam("type")), ctx.PathParam("name")) if err != nil { - if err == packages_model.ErrPackageNotExist { - ctx.NotFound(err) - } else { - ctx.ServerError("GetPackageByName", err) - } + ctx.ServerErrorAuto(err) return } @@ -382,7 +370,7 @@ func ListPackageVersions(ctx *context.Context) { Sort: sort, }) if err != nil { - ctx.ServerError("SearchImageTags", err) + ctx.ServerErrorAuto(err) return } default: @@ -397,14 +385,14 @@ func ListPackageVersions(ctx *context.Context) { Sort: sort, }) if err != nil { - ctx.ServerError("SearchVersions", err) + ctx.ServerErrorAuto(err) return } } ctx.Data["PackageDescriptors"], err = packages_model.GetPackageDescriptors(ctx, pvs) if err != nil { - ctx.ServerError("GetPackageDescriptors", err) + ctx.ServerErrorAuto(err) return } @@ -421,7 +409,7 @@ func PackageSettings(ctx *context.Context) { pd := ctx.Package.Descriptor if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -433,7 +421,7 @@ func PackageSettings(ctx *context.Context) { if pd.Package.RepoID > 0 { repo, err := repo_model.GetRepositoryByID(ctx, pd.Package.RepoID) if err != nil { - ctx.ServerError("GetRepositoryByID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["LinkedRepoName"] = repo.Name @@ -451,7 +439,7 @@ func PackageSettingsPost(ctx *context.Context) { case "delete": packageSettingsPostActionDelete(ctx) default: - ctx.NotFound(nil) + ctx.NotFound() } } @@ -473,7 +461,7 @@ func packageSettingsPostActionLink(ctx *context.Context, form *forms.PackageSett if repo_model.IsErrRepoNotExist(err) { ctx.JSONError(ctx.Tr("packages.settings.link.repo_not_found", form.RepoName)) } else { - ctx.ServerError("GetRepositoryByOwnerAndName", err) + ctx.ServerErrorAuto(err) } return } @@ -509,7 +497,7 @@ func packageSettingsPostActionDelete(ctx *context.Context) { func PackageVersionDelete(ctx *context.Context) { pd := ctx.Package.Descriptor if pd.Version == nil { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -532,17 +520,13 @@ func PackageVersionDelete(ctx *context.Context) { func DownloadPackageFile(ctx *context.Context) { pf, err := packages_model.GetFileForVersionByID(ctx, ctx.Package.Descriptor.Version.ID, ctx.PathParamInt64("fileid")) if err != nil { - if errors.Is(err, packages_model.ErrPackageFileNotExist) { - ctx.NotFound(err) - } else { - ctx.ServerError("GetFileForVersionByID", err) - } + ctx.ServerErrorAuto(err) return } s, u, _, err := packages_service.OpenFileForDownload(ctx, pf, ctx.Req.Method) if err != nil { - ctx.ServerError("OpenFileForDownload", err) + ctx.ServerErrorAuto(err) return } @@ -557,13 +541,13 @@ func DownloadPackageFile(ctx *context.Context) { func ActionPackageTerraformLock(ctx *context.Context) { pd := ctx.Package.Descriptor if pd.Package.Type != packages_model.TypeTerraformState { - ctx.NotFound(nil) + ctx.NotFound() return } existingLock, err := terraform_module.GetLock(ctx, pd.Package.ID) if err != nil { - ctx.ServerError("GetLock", err) + ctx.ServerErrorAuto(err) return } if existingLock.IsLocked() { @@ -581,7 +565,7 @@ func ActionPackageTerraformLock(ctx *context.Context) { } if err := terraform_module.SetLock(ctx, pd.Package.ID, lockInfo); err != nil { - ctx.ServerError("SetLock", err) + ctx.ServerErrorAuto(err) return } @@ -593,12 +577,12 @@ func ActionPackageTerraformLock(ctx *context.Context) { func ActionPackageTerraformUnlock(ctx *context.Context) { pd := ctx.Package.Descriptor if pd.Package.Type != packages_model.TypeTerraformState { - ctx.NotFound(nil) + ctx.NotFound() return } if err := terraform_module.RemoveLock(ctx, pd.Package.ID); err != nil { - ctx.ServerError("RemoveLock", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index c6e6b4063d9..10d7d5653ce 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -53,7 +53,7 @@ func userProfile(ctx *context.Context) { // and the "profile readme" related logic also duplicates in both of FindOwnerProfileReadme and RenderUserOrgHeader // TODO: it is a bad design and should be refactored later, if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } ctx.HTML(http.StatusOK, tplProfile) @@ -106,7 +106,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R Page: page, }) if err != nil { - ctx.ServerError("GetUserFollowers", err) + ctx.ServerErrorAuto(err) return } ctx.Data["NumFollowers"] = numFollowers @@ -115,7 +115,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R Page: page, }) if err != nil { - ctx.ServerError("GetUserFollowing", err) + ctx.ServerErrorAuto(err) return } ctx.Data["NumFollowing"] = numFollowing @@ -164,7 +164,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R }, }) if err != nil { - ctx.ServerError("GetFeeds", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Feeds"] = items @@ -195,7 +195,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R IsPrivate: private, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } @@ -222,7 +222,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R IsPrivate: private, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } @@ -250,7 +250,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R }, }) if err != nil { - ctx.ServerError("GetUserOrganizations", err) + ctx.ServerErrorAuto(err) return } cards := make([]*user_model.User, 0, len(orgs)) @@ -281,7 +281,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R IsPrivate: private, }) if err != nil { - ctx.ServerError("SearchRepository", err) + ctx.ServerErrorAuto(err) return } @@ -291,7 +291,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R ctx.Data["Total"] = total if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } @@ -313,12 +313,12 @@ func ActionUserFollow(ctx *context.Context) { err = user_model.UnfollowUser(ctx, ctx.Doer.ID, ctx.ContextUser.ID) } if err != nil { - ctx.ServerError("ActionUserFollow", err) + ctx.ServerErrorAuto(err) return } if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/user/search.go b/routers/web/user/search.go index 467333a6b57..2f1009eb0d0 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -28,7 +28,7 @@ func SearchCandidates(ctx *context.Context) { ListOptions: db.ListOptions{PageSize: setting.UI.MembersPagingNum}, }) if err != nil { - ctx.ServerError("Unable to search users", err) + ctx.ServerErrorAuto(err) return } ctx.JSON(http.StatusOK, map[string]any{"data": convert.ToUsers(ctx, ctx.Doer, users)}) diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index 4d610ac8f1d..51505cf8636 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -37,7 +37,7 @@ const ( // Account renders change user's password, user's email and user suicide page func Account(ctx *context.Context) { if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageCredentials, setting.UserFeatureDeletion) { - ctx.NotFound(errors.New("account setting are not allowed to be changed")) + ctx.NotFound() return } @@ -53,7 +53,7 @@ func Account(ctx *context.Context) { // AccountPost response for change user's password func AccountPost(ctx *context.Context) { if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageCredentials) { - ctx.NotFound(errors.New("password setting is not allowed to be changed")) + ctx.NotFound() return } @@ -89,7 +89,7 @@ func AccountPost(ctx *context.Context) { case password.IsErrIsPwnedRequest(err): ctx.Flash.Error(ctx.Tr("auth.password_pwned_err")) default: - ctx.ServerError("UpdateAuth", err) + ctx.ServerErrorAuto(err) return } } else { @@ -103,7 +103,7 @@ func AccountPost(ctx *context.Context) { // EmailPost response for change user's email func EmailPost(ctx *context.Context) { if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageCredentials) { - ctx.NotFound(errors.New("emails are not allowed to be changed")) + ctx.NotFound() return } @@ -120,7 +120,7 @@ func EmailPost(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/account") return } - ctx.ServerError("MakeEmailPrimary", err) + ctx.ServerErrorAuto(err) return } @@ -193,7 +193,7 @@ func EmailPost(ctx *context.Context) { ctx.RenderWithErrDeprecated(ctx.Tr("form.email_invalid"), tplSettingsAccount, &form) } else { - ctx.ServerError("AddEmailAddresses", err) + ctx.ServerErrorAuto(err) } return } @@ -217,17 +217,17 @@ func EmailPost(ctx *context.Context) { // DeleteEmail response for delete user's email func DeleteEmail(ctx *context.Context) { if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageCredentials) { - ctx.NotFound(errors.New("emails are not allowed to be changed")) + ctx.NotFound() return } email, err := user_model.GetEmailAddressByID(ctx, ctx.Doer.ID, ctx.FormInt64("id")) if err != nil || email == nil { - ctx.ServerError("GetEmailAddressByID", err) + ctx.ServerErrorAuto(err) return } if err := user.DeleteEmailAddresses(ctx, ctx.Doer, []string{email.Email}); err != nil { - ctx.ServerError("DeleteEmailAddresses", err) + ctx.ServerErrorAuto(err) return } log.Trace("Email address deleted: %s", ctx.Doer.Name) @@ -254,7 +254,7 @@ func DeleteAccount(ctx *context.Context) { case errors.As(err, &db.ErrUserPasswordInvalid{}): ctx.JSONError(ctx.Tr("form.enterred_invalid_password")) default: - ctx.ServerError("UserSignIn", err) + ctx.ServerErrorAuto(err) } return } @@ -276,7 +276,7 @@ func DeleteAccount(ctx *context.Context) { case user_model.IsErrDeleteLastAdminUser(err): ctx.JSONError(ctx.Tr("auth.last_admin")) default: - ctx.ServerError("DeleteUser", err) + ctx.ServerErrorAuto(err) } return } @@ -287,7 +287,7 @@ func DeleteAccount(ctx *context.Context) { func loadAccountData(ctx *context.Context) { emlist, err := user_model.GetEmailAddresses(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("GetEmailAddresses", err) + ctx.ServerErrorAuto(err) return } type UserEmail struct { diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index 11be9c358ff..512cd69c6b3 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -47,7 +47,7 @@ type AccessTokensPanel struct { func NewAccessTokensPanel(ctx *context.Context, owner *user_model.User, link string) *AccessTokensPanel { tokens, err := db.Find[auth_model.AccessToken](ctx, auth_model.ListAccessTokensOptions{UserID: owner.ID}) if err != nil { - ctx.ServerError("ListAccessTokens", err) + ctx.ServerErrorAuto(err) return nil } panel := &AccessTokensPanel{ @@ -81,7 +81,7 @@ func CreateAccessToken(ctx *context.Context, owner *user_model.User) { scope, err := auth_model.AccessTokenScope(strings.Join(scopeNames, ",")).Normalize() if err != nil { - ctx.ServerError("GetScope", err) + ctx.ServerErrorAuto(err) return } if !scope.HasPermissionScope() { @@ -97,7 +97,7 @@ func CreateAccessToken(ctx *context.Context, owner *user_model.User) { exist, err := auth_model.AccessTokenByNameExists(ctx, t) if err != nil { - ctx.ServerError("AccessTokenByNameExists", err) + ctx.ServerErrorAuto(err) return } if exist { @@ -112,7 +112,7 @@ func CreateAccessToken(ctx *context.Context, owner *user_model.User) { if hasApiTokenScope { hasScope, err := apiTokenScope.CanCreateChildScope(t.Scope) if err != nil { - ctx.ServerError("CanCreateChildScope", err) + ctx.ServerErrorAuto(err) return } if !hasScope { @@ -120,13 +120,13 @@ func CreateAccessToken(ctx *context.Context, owner *user_model.User) { return } if t.Scope, err = t.Scope.EnforcePublicOnlyFrom(apiTokenScope); err != nil { - ctx.ServerError("EnforcePublicOnlyFrom", err) + ctx.ServerErrorAuto(err) return } } if err := auth_model.NewAccessToken(ctx, t); err != nil { - ctx.ServerError("NewAccessToken", err) + ctx.ServerErrorAuto(err) return } @@ -138,7 +138,7 @@ func CreateAccessToken(ctx *context.Context, owner *user_model.User) { } panel.NewTokenValue = t.Token if err := ctx.Render.HTML(ctx.Resp, http.StatusOK, tplAccessTokens, panel, ctx.TemplateContext); err != nil { - ctx.ServerError("Render", err) + ctx.ServerErrorAuto(err) } } @@ -176,7 +176,7 @@ func ApplicationsRegenerateToken(ctx *context.Context) { func RegenerateAccessToken(ctx *context.Context, owner *user_model.User) { t, err := auth_model.RegenerateAccessToken(ctx, ctx.FormInt64("id"), owner.ID) if err != nil { - ctx.ServerError("RegenerateAccessToken", err) + ctx.ServerErrorAuto(err) return } audit.Record(ctx, audit_model.UserAccessTokenRegenerate, owner, "token", t.Name) @@ -199,12 +199,12 @@ func loadApplicationsData(ctx *context.Context) { OwnerID: ctx.Doer.ID, }) if err != nil { - ctx.ServerError("GetOAuth2ApplicationsByUserID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Grants"], err = auth_model.GetOAuth2GrantsByUserID(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("GetOAuth2GrantsByUserID", err) + ctx.ServerErrorAuto(err) return } } diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 98d88eb154f..f73cc7721c3 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -28,7 +28,7 @@ const ( // Keys render user's SSH/GPG public keys page func Keys(ctx *context.Context) { if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys, setting.UserFeatureManageGPGKeys) { - ctx.NotFound(errors.New("keys setting is not allowed to be changed")) + ctx.NotFound() return } @@ -80,7 +80,7 @@ func KeysPost(ctx *context.Context) { ctx.Data["Err_Content"] = true ctx.RenderWithErrDeprecated(ctx.Tr("settings.ssh_principal_been_used"), tplSettingsKeys, &form) default: - ctx.ServerError("AddPrincipalKey", err) + ctx.ServerErrorAuto(err) } return } @@ -91,7 +91,7 @@ func KeysPost(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/keys") case "gpg": if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageGPGKeys) { - ctx.NotFound(errors.New("gpg keys setting is not allowed to be visited")) + ctx.NotFound() return } @@ -133,7 +133,7 @@ func KeysPost(ctx *context.Context) { ctx.Data["PaddedKeyID"] = asymkey_model.PaddedKeyID(keyID) ctx.RenderWithErrDeprecated(ctx.Tr("settings.gpg_no_key_email_found"), tplSettingsKeys, &form) default: - ctx.ServerError("AddPublicKey", err) + ctx.ServerErrorAuto(err) } return } @@ -170,7 +170,7 @@ func KeysPost(ctx *context.Context) { ctx.Data["PaddedKeyID"] = asymkey_model.PaddedKeyID(keyID) ctx.RenderWithErrDeprecated(ctx.Tr("settings.gpg_invalid_token_signature"), tplSettingsKeys, &form) default: - ctx.ServerError("VerifyGPG", err) + ctx.ServerErrorAuto(err) } return } @@ -178,7 +178,7 @@ func KeysPost(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/keys") case "ssh": if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) { - ctx.NotFound(errors.New("ssh keys setting is not allowed to be visited")) + ctx.NotFound() return } @@ -215,7 +215,7 @@ func KeysPost(ctx *context.Context) { ctx.Flash.Info(ctx.Tr("form.unable_verify_ssh_key")) ctx.Redirect(setting.AppSubURL + "/user/settings/keys") default: - ctx.ServerError("AddPublicKey", err) + ctx.ServerErrorAuto(err) } return } @@ -226,7 +226,7 @@ func KeysPost(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/keys") case "verify_ssh": if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) { - ctx.NotFound(errors.New("ssh keys setting is not allowed to be visited")) + ctx.NotFound() return } @@ -247,7 +247,7 @@ func KeysPost(ctx *context.Context) { ctx.Data["Fingerprint"] = errInvalidTokenSignature.Fingerprint ctx.RenderWithErrDeprecated(ctx.Tr("settings.ssh_invalid_token_signature"), tplSettingsKeys, &form) default: - ctx.ServerError("VerifySSH", err) + ctx.ServerErrorAuto(err) } return } @@ -270,7 +270,7 @@ func DeleteKey(ctx *context.Context) { } key, err := asymkey_model.GetGPGKeyForUserByID(ctx, ctx.Doer.ID, ctx.FormInt64("id")) if err != nil && !asymkey_model.IsErrGPGKeyNotExist(err) { - ctx.ServerError("GetGPGKeyForUserByID", err) + ctx.ServerErrorAuto(err) return } if err := asymkey_model.DeleteGPGKey(ctx, ctx.Doer, ctx.FormInt64("id")); err != nil { @@ -290,7 +290,7 @@ func DeleteKey(ctx *context.Context) { keyID := ctx.FormInt64("id") external, err := asymkey_model.PublicKeyIsExternallyManaged(ctx, keyID) if err != nil { - ctx.ServerError("sshKeysExternalManaged", err) + ctx.ServerErrorAuto(err) return } if external { @@ -321,14 +321,14 @@ func loadKeysData(ctx *context.Context) { NotKeytype: asymkey_model.KeyTypePrincipal, }) if err != nil { - ctx.ServerError("ListPublicKeys", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Keys"] = keys externalKeys, err := asymkey_model.PublicKeysAreExternallyManaged(ctx, keys) if err != nil { - ctx.ServerError("ListPublicKeys", err) + ctx.ServerErrorAuto(err) return } ctx.Data["ExternalKeys"] = externalKeys @@ -338,11 +338,11 @@ func loadKeysData(ctx *context.Context) { OwnerID: ctx.Doer.ID, }) if err != nil { - ctx.ServerError("ListGPGKeys", err) + ctx.ServerErrorAuto(err) return } if err := asymkey_model.GPGKeyList(gpgkeys).LoadSubKeys(ctx); err != nil { - ctx.ServerError("LoadSubKeys", err) + ctx.ServerErrorAuto(err) return } ctx.Data["GPGKeys"] = gpgkeys @@ -357,7 +357,7 @@ func loadKeysData(ctx *context.Context) { KeyTypes: []asymkey_model.KeyType{asymkey_model.KeyTypePrincipal}, }) if err != nil { - ctx.ServerError("ListPrincipalKeys", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Principals"] = principals diff --git a/routers/web/user/setting/notifications.go b/routers/web/user/setting/notifications.go index ea206be55ee..528e70da002 100644 --- a/routers/web/user/setting/notifications.go +++ b/routers/web/user/setting/notifications.go @@ -20,7 +20,7 @@ const tplSettingsNotifications templates.TplName = "user/settings/notifications" // Notifications render user's notifications settings func Notifications(ctx *context.Context) { if !setting.Service.EnableNotifyMail { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -30,7 +30,7 @@ func Notifications(ctx *context.Context) { actionsEmailPref, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyEmailNotificationGiteaActions, user_model.SettingEmailNotificationGiteaActionsFailureOnly) if err != nil { - ctx.ServerError("GetUserSetting", err) + ctx.ServerErrorAuto(err) return } ctx.Data["ActionsEmailNotificationsPreference"] = actionsEmailPref @@ -41,7 +41,7 @@ func Notifications(ctx *context.Context) { // NotificationsEmailPost set user's email notification preference func NotificationsEmailPost(ctx *context.Context) { if !setting.Service.EnableNotifyMail { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -58,7 +58,7 @@ func NotificationsEmailPost(ctx *context.Context) { EmailNotificationsPreference: optional.Some(preference), } if err := user.UpdateUser(ctx, ctx.Doer, opts); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("settings.email_preference_set_success")) @@ -68,7 +68,7 @@ func NotificationsEmailPost(ctx *context.Context) { // NotificationsActionsEmailPost set user's email notification preference on Gitea Actions func NotificationsActionsEmailPost(ctx *context.Context) { if !setting.Actions.Enabled || unit.TypeActions.UnitGlobalDisabled() { - ctx.NotFound(nil) + ctx.NotFound() return } @@ -81,7 +81,7 @@ func NotificationsActionsEmailPost(ctx *context.Context) { return } if err := user_model.SetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyEmailNotificationGiteaActions, preference); err != nil { - ctx.ServerError("SetUserSetting", err) + ctx.ServerErrorAuto(err) return } ctx.Flash.Success(ctx.Tr("settings.email_preference_set_success")) diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go index a882b8b93fe..3f2290b28cd 100644 --- a/routers/web/user/setting/oauth2_common.go +++ b/routers/web/user/setting/oauth2_common.go @@ -44,7 +44,7 @@ func (oa *OAuth2CommonHandlers) renderEditPage(ctx *context.Context, app *auth.O if ctx.ContextUser != nil && ctx.ContextUser.IsOrganization() { if _, err := shared_user.RenderUserOrgHeader(ctx); err != nil { - ctx.ServerError("RenderUserOrgHeader", err) + ctx.ServerErrorAuto(err) return } } @@ -70,7 +70,7 @@ func (oa *OAuth2CommonHandlers) AddApp(ctx *context.Context) { SkipSecondaryAuthorization: form.SkipSecondaryAuthorization, }) if err != nil { - ctx.ServerError("CreateOAuth2Application", err) + ctx.ServerErrorAuto(err) return } @@ -80,7 +80,7 @@ func (oa *OAuth2CommonHandlers) AddApp(ctx *context.Context) { ctx.Flash.Success(ctx.Tr("settings.create_oauth2_application_success"), true) ctx.Data["ClientSecret"], err = app.GenerateClientSecret(ctx) if err != nil { - ctx.ServerError("GenerateClientSecret", err) + ctx.ServerErrorAuto(err) return } @@ -91,15 +91,11 @@ func (oa *OAuth2CommonHandlers) AddApp(ctx *context.Context) { func (oa *OAuth2CommonHandlers) EditShow(ctx *context.Context) { app, err := auth.GetOAuth2ApplicationByID(ctx, ctx.PathParamInt64("id")) if err != nil { - if auth.IsErrOAuthApplicationNotFound(err) { - ctx.NotFound(err) - return - } - ctx.ServerError("GetOAuth2ApplicationByID", err) + ctx.ServerErrorAuto(err) return } if app.UID != oa.ownerID() { - ctx.NotFound(nil) + ctx.NotFound() return } oa.renderEditPage(ctx, app) @@ -112,15 +108,11 @@ func (oa *OAuth2CommonHandlers) EditSave(ctx *context.Context) { if ctx.HasError() { app, err := auth.GetOAuth2ApplicationByID(ctx, ctx.PathParamInt64("id")) if err != nil { - if auth.IsErrOAuthApplicationNotFound(err) { - ctx.NotFound(err) - return - } - ctx.ServerError("GetOAuth2ApplicationByID", err) + ctx.ServerErrorAuto(err) return } if app.UID != oa.ownerID() { - ctx.NotFound(nil) + ctx.NotFound() return } oa.renderEditPage(ctx, app) @@ -136,7 +128,7 @@ func (oa *OAuth2CommonHandlers) EditSave(ctx *context.Context) { SkipSecondaryAuthorization: form.SkipSecondaryAuthorization, }) if err != nil { - ctx.ServerError("UpdateOAuth2Application", err) + ctx.ServerErrorAuto(err) return } @@ -150,20 +142,16 @@ func (oa *OAuth2CommonHandlers) EditSave(ctx *context.Context) { func (oa *OAuth2CommonHandlers) RegenerateSecret(ctx *context.Context) { app, err := auth.GetOAuth2ApplicationByID(ctx, ctx.PathParamInt64("id")) if err != nil { - if auth.IsErrOAuthApplicationNotFound(err) { - ctx.NotFound(err) - return - } - ctx.ServerError("GetOAuth2ApplicationByID", err) + ctx.ServerErrorAuto(err) return } if app.UID != oa.ownerID() { - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["ClientSecret"], err = app.GenerateClientSecret(ctx) if err != nil { - ctx.ServerError("GenerateClientSecret", err) + ctx.ServerErrorAuto(err) return } @@ -177,12 +165,12 @@ func (oa *OAuth2CommonHandlers) RegenerateSecret(ctx *context.Context) { func (oa *OAuth2CommonHandlers) DeleteApp(ctx *context.Context) { app, err := auth.GetOAuth2ApplicationByID(ctx, ctx.PathParamInt64("id")) if err != nil { - ctx.ServerError("GetOAuth2ApplicationByID", err) + ctx.ServerErrorAuto(err) return } if err := auth.DeleteOAuth2Application(ctx, app.ID, oa.ownerID()); err != nil { - ctx.ServerError("DeleteOAuth2Application", err) + ctx.ServerErrorAuto(err) return } @@ -196,24 +184,24 @@ func (oa *OAuth2CommonHandlers) DeleteApp(ctx *context.Context) { func (oa *OAuth2CommonHandlers) RevokeGrant(ctx *context.Context) { grant, err := auth.GetOAuth2GrantByID(ctx, ctx.PathParamInt64("grantId")) if err != nil { - ctx.ServerError("GetOAuth2GrantByID", err) + ctx.ServerErrorAuto(err) return } // grants belong to individual users, so this also rejects the instance-wide // (owner nil, ID 0) and organization handlers without assuming who routes here if grant == nil || oa.Owner == nil || grant.UserID != oa.Owner.ID { - ctx.NotFound(nil) + ctx.NotFound() return } app, err := auth.GetOAuth2ApplicationByID(ctx, grant.ApplicationID) if err != nil { - ctx.ServerError("GetOAuth2ApplicationByID", err) + ctx.ServerErrorAuto(err) return } if err := auth.RevokeOAuth2Grant(ctx, grant.ID, oa.ownerID()); err != nil { - ctx.ServerError("RevokeOAuth2Grant", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/user/setting/packages.go b/routers/web/user/setting/packages.go index 68491a39ffc..2d9209b41e5 100644 --- a/routers/web/user/setting/packages.go +++ b/routers/web/user/setting/packages.go @@ -103,12 +103,12 @@ func RebuildCargoIndex(ctx *context.Context) { func RegenerateChefKeyPair(ctx *context.Context) { priv, pub, err := util.GenerateKeyPair(chef_module.KeyBits) if err != nil { - ctx.ServerError("GenerateKeyPair", err) + ctx.ServerErrorAuto(err) return } if err := user_model.SetUserSetting(ctx, ctx.Doer.ID, chef_module.SettingPublicPem, pub); err != nil { - ctx.ServerError("SetUserSetting", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 512e6238e23..6eef38eabd9 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -189,7 +189,7 @@ func Organization(ctx *context.Context) { orgs, total, err := db.FindAndCount[organization.Organization](ctx, opts) if err != nil { - ctx.ServerError("FindOrgs", err) + ctx.ServerErrorAuto(err) return } @@ -213,13 +213,13 @@ func Repos(ctx *context.Context) { } repos, count, err := repo_model.GetUserRepositories(ctx, repo_model.SearchRepoOptions{OwnerID: ctx.Doer.ID, Private: true, ListOptions: opts}) if err != nil { - ctx.ServerError("GetUserRepositories", err) + ctx.ServerErrorAuto(err) return } for i := range repos { if repos[i].IsFork { if err := repos[i].GetBaseRepo(ctx); err != nil { - ctx.ServerError("GetBaseRepo", err) + ctx.ServerErrorAuto(err) return } } @@ -240,7 +240,7 @@ func Appearance(ctx *context.Context) { var hiddenCommentTypes *big.Int val, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyHiddenCommentTypes) if err != nil { - ctx.ServerError("GetUserSetting", err) + ctx.ServerErrorAuto(err) return } hiddenCommentTypes, _ = new(big.Int).SetString(val, 10) // we can safely ignore the failed conversion here @@ -300,7 +300,7 @@ func UpdateUserLang(ctx *context.Context) { Language: optional.Some(form.Language), } if err := user_service.UpdateUser(ctx, ctx.Doer, opts); err != nil { - ctx.ServerError("UpdateUser", err) + ctx.ServerErrorAuto(err) return } @@ -316,7 +316,7 @@ func UpdateUserLang(ctx *context.Context) { func UpdateUserHiddenComments(ctx *context.Context) { err := user_model.SetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyHiddenCommentTypes, forms.UserHiddenCommentTypesFromRequest(ctx).String()) if err != nil { - ctx.ServerError("SetUserSetting", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go index bc9d57dd865..b3054949976 100644 --- a/routers/web/user/setting/security/2fa.go +++ b/routers/web/user/setting/security/2fa.go @@ -43,19 +43,19 @@ func RegenerateScratchTwoFactor(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("settings.twofa_not_enrolled")) ctx.Redirect(setting.AppSubURL + "/user/settings/security") } else { - ctx.ServerError("SettingsTwoFactor: Failed to GetTwoFactorByUID", err) + ctx.ServerErrorAuto(err) } return } token, err := t.GenerateScratchToken() if err != nil { - ctx.ServerError("SettingsTwoFactor: Failed to GenerateScratchToken", err) + ctx.ServerErrorAuto(err) return } if err = auth.UpdateTwoFactor(ctx, t); err != nil { - ctx.ServerError("SettingsTwoFactor: Failed to UpdateTwoFactor", err) + ctx.ServerErrorAuto(err) return } @@ -81,7 +81,7 @@ func DisableTwoFactor(ctx *context.Context) { ctx.Flash.Error(ctx.Tr("settings.twofa_not_enrolled")) ctx.Redirect(setting.AppSubURL + "/user/settings/security") } else { - ctx.ServerError("SettingsTwoFactor: Failed to GetTwoFactorByUID", err) + ctx.ServerErrorAuto(err) } return } @@ -92,7 +92,7 @@ func DisableTwoFactor(ctx *context.Context) { ctx.Flash.Success(ctx.Tr("settings.twofa_disabled")) ctx.Redirect(setting.AppSubURL + "/user/settings/security") } else { - ctx.ServerError("SettingsTwoFactor: Failed to DeleteTwoFactorByID", err) + ctx.ServerErrorAuto(err) } return } @@ -109,7 +109,7 @@ func twofaGenerateSecretAndQr(ctx *context.Context) bool { if uri, ok := ctx.Session.Get("twofaUri").(string); ok { otpKey, err = otp.NewKeyFromURL(uri) if err != nil { - ctx.ServerError("SettingsTwoFactor: Failed NewKeyFromURL: ", err) + ctx.ServerErrorAuto(err) return false } } @@ -122,7 +122,7 @@ func twofaGenerateSecretAndQr(ctx *context.Context) bool { AccountName: ctx.Doer.Name, }) if err != nil { - ctx.ServerError("SettingsTwoFactor: totpGenerate Failed", err) + ctx.ServerErrorAuto(err) return false } } @@ -130,25 +130,25 @@ func twofaGenerateSecretAndQr(ctx *context.Context) bool { ctx.Data["TwofaSecret"] = otpKey.Secret() img, err := otpKey.Image(320, 240) if err != nil { - ctx.ServerError("SettingsTwoFactor: otpKey image generation failed", err) + ctx.ServerErrorAuto(err) return false } var imgBytes bytes.Buffer if err = png.Encode(&imgBytes, img); err != nil { - ctx.ServerError("SettingsTwoFactor: otpKey png encoding failed", err) + ctx.ServerErrorAuto(err) return false } ctx.Data["QrUri"] = template.URL("data:image/png;base64," + base64.StdEncoding.EncodeToString(imgBytes.Bytes())) if err := ctx.Session.Set("twofaSecret", otpKey.Secret()); err != nil { - ctx.ServerError("SettingsTwoFactor: Failed to set session for twofaSecret", err) + ctx.ServerErrorAuto(err) return false } if err := ctx.Session.Set("twofaUri", otpKey.String()); err != nil { - ctx.ServerError("SettingsTwoFactor: Failed to set session for twofaUri", err) + ctx.ServerErrorAuto(err) return false } @@ -180,7 +180,7 @@ func EnrollTwoFactor(ctx *context.Context) { return } if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) { - ctx.ServerError("SettingsTwoFactor: GetTwoFactorByUID", err) + ctx.ServerErrorAuto(err) return } @@ -211,7 +211,7 @@ func EnrollTwoFactorPost(ctx *context.Context) { return } if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) { - ctx.ServerError("SettingsTwoFactor: Failed to check if already enrolled with GetTwoFactorByUID", err) + ctx.ServerErrorAuto(err) return } @@ -244,12 +244,12 @@ func EnrollTwoFactorPost(ctx *context.Context) { } err = t.SetSecret(secret) if err != nil { - ctx.ServerError("SettingsTwoFactor: Failed to set secret", err) + ctx.ServerErrorAuto(err) return } token, err := t.GenerateScratchToken() if err != nil { - ctx.ServerError("SettingsTwoFactor: Failed to generate scratch token", err) + ctx.ServerErrorAuto(err) return } @@ -275,7 +275,7 @@ func EnrollTwoFactorPost(ctx *context.Context) { if newTwoFactorErr != nil { // FIXME: We need to handle a unique constraint fail here it's entirely possible that another request has beaten us. // If there is a unique constraint fail we should just tolerate the error - ctx.ServerError("SettingsTwoFactor: Failed to save two factor", newTwoFactorErr) + ctx.ServerErrorAuto(newTwoFactorErr) return } diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go index 8667402fc10..99a429d9a68 100644 --- a/routers/web/user/setting/security/security.go +++ b/routers/web/user/setting/security/security.go @@ -67,21 +67,21 @@ func DeleteAccountLink(ctx *context.Context) { func loadSecurityData(ctx *context.Context) { enrolled, err := auth_model.HasTwoFactorByUID(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("SettingsTwoFactor", err) + ctx.ServerErrorAuto(err) return } ctx.Data["TOTPEnrolled"] = enrolled credentials, err := auth_model.GetWebAuthnCredentialsByUID(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("GetWebAuthnCredentialsByUID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["WebAuthnCredentials"] = credentials tokens, err := db.Find[auth_model.AccessToken](ctx, auth_model.ListAccessTokensOptions{UserID: ctx.Doer.ID}) if err != nil { - ctx.ServerError("ListAccessTokens", err) + ctx.ServerErrorAuto(err) return } ctx.Data["Tokens"] = tokens @@ -91,7 +91,7 @@ func loadSecurityData(ctx *context.Context) { OrderBy: "login_source_id DESC", }) if err != nil { - ctx.ServerError("ListAccountLinks", err) + ctx.ServerErrorAuto(err) return } @@ -126,7 +126,7 @@ func loadSecurityData(ctx *context.Context) { LoginType: auth_model.OAuth2, }) if err != nil { - ctx.ServerError("FindSources", err) + ctx.ServerErrorAuto(err) return } @@ -135,7 +135,7 @@ func loadSecurityData(ctx *context.Context) { for _, source := range authSources { provider, err := oauth2.CreateProviderFromSource(source) if err != nil { - ctx.ServerError("CreateProviderFromSource", err) + ctx.ServerErrorAuto(err) return } oauth2Providers[source.Name] = provider diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go index d8544e82e69..98dab88b1a9 100644 --- a/routers/web/user/setting/security/webauthn.go +++ b/routers/web/user/setting/security/webauthn.go @@ -40,7 +40,7 @@ func WebAuthnRegister(ctx *context.Context) { cred, err := auth.GetWebAuthnCredentialByName(ctx, ctx.Doer.ID, form.Name) if err != nil && !auth.IsErrWebAuthnCredentialNotExist(err) { - ctx.ServerError("GetWebAuthnCredentialsByUID", err) + ctx.ServerErrorAuto(err) return } if cred != nil { @@ -50,7 +50,7 @@ func WebAuthnRegister(ctx *context.Context) { _ = ctx.Session.Delete("webauthnRegistration") if err := ctx.Session.Set("webauthnName", form.Name); err != nil { - ctx.ServerError("Unable to set session key for webauthnName", err) + ctx.ServerErrorAuto(err) return } @@ -58,7 +58,7 @@ func WebAuthnRegister(ctx *context.Context) { // the exclusions stop enrolling the same authenticator twice credentials, err := auth.GetWebAuthnCredentialsByUID(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("GetWebAuthnCredentialsByUID", err) + ctx.ServerErrorAuto(err) return } exclusions := webauthn.Credentials(credentials.ToCredentials()).CredentialDescriptors() @@ -68,13 +68,13 @@ func WebAuthnRegister(ctx *context.Context) { UserVerification: protocol.VerificationRequired, })) if err != nil { - ctx.ServerError("Unable to BeginRegistration", err) + ctx.ServerErrorAuto(err) return } // Save the session data as marshaled JSON if err = ctx.Session.Set("webauthnRegistration", sessionData); err != nil { - ctx.ServerError("Unable to set session", err) + ctx.ServerErrorAuto(err) return } @@ -90,14 +90,14 @@ func WebauthnRegisterPost(ctx *context.Context) { name, ok := ctx.Session.Get("webauthnName").(string) if !ok || name == "" { - ctx.ServerError("Get webauthnName", errors.New("no webauthnName")) + ctx.ServerErrorAuto(errors.New("no webauthnName")) return } // Load the session data sessionData, ok := ctx.Session.Get("webauthnRegistration").(*webauthn.SessionData) if !ok || sessionData == nil { - ctx.ServerError("Get registration", errors.New("no registration")) + ctx.ServerErrorAuto(errors.New("no registration")) return } defer func() { @@ -111,13 +111,13 @@ func WebauthnRegisterPost(ctx *context.Context) { if pErr, ok := err.(*protocol.Error); ok { log.Error("Unable to finish registration due to error: %v\nDevInfo: %s", pErr, pErr.DevInfo) } - ctx.ServerError("CreateCredential", err) + ctx.ServerErrorAuto(err) return } dbCred, err := auth.GetWebAuthnCredentialByName(ctx, ctx.Doer.ID, name) if err != nil && !auth.IsErrWebAuthnCredentialNotExist(err) { - ctx.ServerError("GetWebAuthnCredentialsByUID", err) + ctx.ServerErrorAuto(err) return } if dbCred != nil { @@ -128,7 +128,7 @@ func WebauthnRegisterPost(ctx *context.Context) { // Create the credential dbCred, err = auth.CreateCredential(ctx, ctx.Doer.ID, name, cred) if err != nil { - ctx.ServerError("CreateCredential", err) + ctx.ServerErrorAuto(err) return } _ = ctx.Session.Delete("webauthnName") @@ -182,7 +182,7 @@ func WebauthnDelete(ctx *context.Context) { } if ok, err := auth.DeleteCredential(ctx, ctx.Doer.ID, cred.ID); err != nil { - ctx.ServerError("DeleteCredential", err) + ctx.ServerErrorAuto(err) return } else if ok { audit.Record(ctx, audit_model.UserWebAuthRemove, ctx.Doer, "credential", cred.Name) diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go index b261853b370..13acd34cff8 100644 --- a/routers/web/user/setting/webhooks.go +++ b/routers/web/user/setting/webhooks.go @@ -28,7 +28,7 @@ func Webhooks(ctx *context.Context) { ws, err := db.Find[webhook.Webhook](ctx, webhook.ListWebhookOptions{OwnerID: ctx.Doer.ID}) if err != nil { - ctx.ServerError("ListWebhooksByOpts", err) + ctx.ServerErrorAuto(err) return } diff --git a/routers/web/web.go b/routers/web/web.go index f72116f66a4..f9c5b68c68e 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -434,12 +434,12 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { return func(ctx *context.Context) { // only check global disabled units when ignoreGlobal is false if !ignoreGlobal && unitType.UnitGlobalDisabled() { - ctx.NotFound(nil) + ctx.NotFound() return } if ctx.ContextUser.IsOrganization() { if ctx.Org.Organization.AnyRepoUnitPermission(ctx, ctx.Doer, unitType) < accessMode { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -547,7 +547,7 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { m.Get("/organizations", explore.Organizations) m.Get("/code", func(ctx *context.Context) { if unit.TypeCode.UnitGlobalDisabled() { - ctx.NotFound(nil) + ctx.NotFound() return } }, explore.Code) @@ -911,7 +911,7 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { reqPackageAccess := func(accessMode perm.AccessMode) func(ctx *context.Context) { return func(ctx *context.Context) { if ctx.Package.AccessMode < accessMode { - ctx.NotFound(nil) + ctx.NotFound() } } } @@ -922,12 +922,12 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { switch ctx.ContextUser.Visibility { case structs.VisibleTypePrivate: if ctx.Doer == nil || (ctx.ContextUser.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin) { - ctx.NotFound(nil) + ctx.NotFound() return } case structs.VisibleTypeLimited: if ctx.Doer == nil { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -1131,7 +1131,7 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { }) }, reqSignIn, reqAnyRepoUnitAccess(unit.TypeProjects, perm.AccessModeWrite, true), func(ctx *context.Context) { if ctx.ContextUser.IsIndividual() && ctx.ContextUser.ID != ctx.Doer.ID { - ctx.NotFound(nil) + ctx.NotFound() return } }) @@ -1794,6 +1794,6 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { m.NotFound(func(w http.ResponseWriter, req *http.Request) { ctx := context.GetWebContext(req.Context()) defer routing.RecordFuncInfo(ctx, routing.GetFuncInfo(ctx.NotFound, "WebNotFound"))() - ctx.NotFound(nil) + ctx.NotFound() }) } diff --git a/services/context/api.go b/services/context/api.go index c14c3b3e467..90b17d37083 100644 --- a/services/context/api.go +++ b/services/context/api.go @@ -74,25 +74,6 @@ type APIEmpty struct{} // swagger:response string type APIString string -// APIErrorInternal responds with error message, status is 500 -func (ctx *APIContext) APIErrorInternal(err error) { - ctx.apiErrorInternal(1, err) -} - -func (ctx *APIContext) apiErrorInternal(skip int, err error) { - log.ErrorWithSkip(skip+1, "InternalServerError: %v", err) - - var message string - if !setting.IsProd || (ctx.Doer != nil && ctx.Doer.IsAdmin) { - message = err.Error() - } - - ctx.JSON(http.StatusInternalServerError, APIError{ - Message: message, - URL: setting.API.SwaggerURL, - }) -} - // APIErrorNotFound handles 404s for APIContext func (ctx *APIContext) APIErrorNotFound(msg ...string) { ctx.JSON(http.StatusNotFound, APIError{ @@ -104,9 +85,13 @@ func (ctx *APIContext) APIErrorNotFound(msg ...string) { // APIError responds with an error message to client. // If status is 500, also it prints error to log. func (ctx *APIContext) APIError(status int, msg string) { + ctx.apiError(1, status, msg) +} + +func (ctx *APIContext) apiError(skip, status int, msg string) { message := msg if status == http.StatusInternalServerError { - log.ErrorWithSkip(1, "APIError: %s", message) + log.ErrorWithSkip(skip+1, "APIError: %s", message) if setting.IsProd && !(ctx.Doer != nil && ctx.Doer.IsAdmin) { message = "" @@ -121,11 +106,19 @@ func (ctx *APIContext) APIError(status int, msg string) { // APIErrorAuto use error check function to determine the response code func (ctx *APIContext) APIErrorAuto(err error) { + ctx.apiErrorAuto(1, err) +} + +func (ctx *APIContext) apiErrorAuto(skip int, err error) { if errMsg, code := util.ErrorUnwrapForUser(err, ctx.Locale); errMsg != "" { - ctx.APIError(code, errMsg) + ctx.apiError(skip+1, code, errMsg) return } - ctx.apiErrorInternal(1, err) + ctx.apiError(skip+1, http.StatusInternalServerError, err.Error()) +} + +func (ctx *APIContext) APIErrorInternal(err error) { + ctx.apiErrorAuto(1, err) } type apiContextKeyType struct{} diff --git a/services/context/base.go b/services/context/base.go index 4885a6da1d7..e07236ad34b 100644 --- a/services/context/base.go +++ b/services/context/base.go @@ -128,7 +128,7 @@ func (b *Base) RemoteAddr() string { func (b *Base) plainTextInternal(skip, status int, bs []byte) { statusPrefix := status / 100 if statusPrefix == 4 || statusPrefix == 5 { - log.Log(skip, log.TRACE, "plainTextInternal (status=%d): %s", status, string(bs)) + log.Log(skip+1, log.TRACE, "plainTextInternal (status=%d): %s", status, string(bs)) } b.Resp.Header().Set("Content-Type", "text/plain;charset=utf-8") b.Resp.Header().Set("X-Content-Type-Options", "nosniff") @@ -138,12 +138,12 @@ func (b *Base) plainTextInternal(skip, status int, bs []byte) { // PlainTextBytes renders bytes as plain text func (b *Base) PlainTextBytes(status int, bs []byte) { - b.plainTextInternal(2, status, bs) + b.plainTextInternal(1, status, bs) } // PlainText renders content as plain text func (b *Base) PlainText(status int, text string) { - b.plainTextInternal(2, status, []byte(text)) + b.plainTextInternal(1, status, []byte(text)) } // Redirect redirects the request diff --git a/services/context/captcha.go b/services/context/captcha.go index a833c617299..0be9cd51bac 100644 --- a/services/context/captcha.go +++ b/services/context/captcha.go @@ -45,7 +45,7 @@ func VerifyCaptcha(ctx *Context, tpl templates.TplName, form any) bool { case setting.CfTurnstile: valid, err = turnstile.Verify(ctx, ctx.Req.Form.Get(cfTurnstileResponseField)) default: - ctx.ServerError("Unknown Captcha Type", fmt.Errorf("unknown Captcha Type: %s", setting.Service.CaptchaType)) + ctx.ServerErrorAuto(fmt.Errorf("unknown Captcha Type: %s", setting.Service.CaptchaType)) return false } if err != nil { diff --git a/services/context/context_response.go b/services/context/context_response.go index 19337e535f3..f191ff3b891 100644 --- a/services/context/context_response.go +++ b/services/context/context_response.go @@ -4,7 +4,6 @@ package context import ( - "errors" "fmt" "html" "html/template" @@ -96,7 +95,7 @@ func (ctx *Context) HTML(status int, name templates.TplName) { // if rendering fails, show error page if name != tplStatus500 { err = fmt.Errorf("failed to render template: %s, error: %s", name, templates.HandleTemplateRenderingError(err)) - ctx.ServerError("Render failed", err) // show the 500 error page + ctx.ServerErrorAuto(err) // show the 500 error page } else { ctx.PlainText(http.StatusInternalServerError, "Unable to render status/500 page, the template system is broken, or Gitea can't find your template files.") return @@ -123,35 +122,24 @@ func (ctx *Context) RenderWithErrDeprecated[T string | template.HTML](msg T, tpl ctx.HTML(http.StatusOK, tpl) } -// NotFound displays a 404 (Not Found) page and prints the given error, if any. -func (ctx *Context) NotFound(logErr error) { - ctx.notFoundInternal(1, "", logErr) +// NotFound displays a 404 (Not Found) page. +func (ctx *Context) NotFound() { + ctx.renderError4xx(1, http.StatusNotFound, "") } -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(skip+1, log.DEBUG, "%s: %v", logMsg, logErr) - } - - // response simple message if Accept isn't text/html - showHTML := false - for _, part := range ctx.Req.Header["Accept"] { - if strings.Contains(part, "text/html") { - showHTML = true - break - } - } - - if !showHTML { - ctx.plainTextInternal(3, http.StatusNotFound, []byte("Not found.\n")) +func (ctx *Context) renderError4xx(skip, status int, msg string) { + if !httplib.ClientAcceptHTML(ctx.Req) { + msg = util.IfZero(msg, http.StatusText(status)) + ctx.plainTextInternal(skip+1, status, []byte(msg)) return } ctx.Data["IsRepo"] = ctx.Repo.Repository != nil - ctx.Data["Title"] = "Page Not Found" - ctx.Data["ErrorMsg"] = "" // FIXME: the template never renders this message, need to fix in the future (and show safe messages to end users) - ctx.HTML(http.StatusNotFound, "status/404") + ctx.Data["Title"] = http.StatusText(status) + ctx.Data["ErrorCodeStatus"] = status + ctx.Data["ErrorCodeText"] = http.StatusText(status) + ctx.Data["ErrorMsg"] = "" // TODO: USER-ERROR-HTML-DISPLAY: the template never renders this message, need to fix in the future (and show safe messages to end users) + ctx.HTML(status, "status/4xx") } func (ctx *Context) buildServerErrorMessageForUser(msg string, err error) (userErrorMsg string) { @@ -229,28 +217,20 @@ func (ctx *Context) JSONErrorNotFound(optMsg ...string) { ctx.JSON(http.StatusNotFound, buildJsonErrorMap(msg)) } -// 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. -// TODO: refactor this function like APIErrorAuto in the future, and handle more error types and http codes. -func (ctx *Context) ServerError(logMsg string, logErr error) { - if errors.Is(logErr, util.ErrNotExist) { - ctx.notFoundInternal(1, logMsg, logErr) +// ServerErrorAuto handles the error automatically +// - If the error is controlled by our error system, display a 4xx page. +// TODO: USER-ERROR-HTML-DISPLAY: To keep the same behavior as v28, HTML page still doesn't render the error message at the moment. +// - Otherwise, display a 500 (Internal Server Error) page and log the given error +func (ctx *Context) ServerErrorAuto(err error) { + if errMsg, httpCode := util.ErrorUnwrapForUser(err, ctx.Locale); errMsg != "" { + log.Log(1, log.DEBUG, "ServerErrorAuto(for user): status=%d, %v", httpCode, err) + ctx.renderError4xx(1, httpCode, errMsg) return } - if errMsg, httpCode := util.ErrorUnwrapForUser(logErr, ctx.Locale); errMsg != "" { - ctx.HTTPError(httpCode, errMsg) - return - } - ctx.serverErrorInternal(1, logMsg, logErr) -} -func (ctx *Context) serverErrorInternal(skip int, logMsg string, logErr error) { - if logErr != nil { - logLevel := util.Iif(httplib.IsClientOrNetworkError(ctx, logErr), log.DEBUG, log.ERROR) - log.Log(skip+1, logLevel, "%s: %v", logMsg, logErr) - } - - userErrorMsg := ctx.buildServerErrorMessageForUser(logMsg, logErr) + logLevel := util.Iif(httplib.IsClientOrNetworkError(ctx, err), log.DEBUG, log.ERROR) + log.Log(1, logLevel, "ServerErrorAuto: %v", err) + userErrorMsg := ctx.buildServerErrorMessageForUser("internal server error", err) if httplib.IsGiteaFetchActionRequest(ctx.Req) { ctx.JSON(http.StatusInternalServerError, buildJsonErrorMap(userErrorMsg)) return diff --git a/services/context/context_test.go b/services/context/context_test.go index 1fb85ef1b41..31ba7e7e241 100644 --- a/services/context/context_test.go +++ b/services/context/context_test.go @@ -23,10 +23,10 @@ func TestServerErrorFetchActionRespondsJSON(t *testing.T) { req.Header.Add("X-Gitea-Fetch-Action", "1") resp := httptest.NewRecorder() ctx := NewWebContext(NewBaseContextForTest(t, resp, req), nil, nil) - ctx.ServerError("test", errors.New("boom")) + ctx.ServerErrorAuto(errors.New("boom")) assert.Equal(t, http.StatusInternalServerError, resp.Code) assert.Contains(t, resp.Header().Get("Content-Type"), "application/json") - assert.JSONEq(t, `{"errorMessage":"test, error: boom","renderFormat":"text"}`, resp.Body.String()) + assert.JSONEq(t, `{"errorMessage":"internal server error, error: boom","renderFormat":"text"}`, resp.Body.String()) } func TestRedirectToCurrentSite(t *testing.T) { diff --git a/services/context/org.go b/services/context/org.go index fe7ef386b6e..b2b5deef9c7 100644 --- a/services/context/org.go +++ b/services/context/org.go @@ -50,13 +50,11 @@ func GetOrganizationByParams(ctx *Context) { redirectUserID, err := user_model.LookupUserRedirect(ctx, orgName) if err == nil { RedirectToUser(ctx.Base, ctx.Doer, orgName, redirectUserID) - } else if user_model.IsErrUserRedirectNotExist(err) { - ctx.NotFound(err) } else { - ctx.ServerError("LookupUserRedirect", err) + ctx.ServerErrorAuto(err) } } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) } return } @@ -93,7 +91,7 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { // Handle Visibility if org.Visibility != structs.VisibleTypePublic && !user_model.DoerCanViewPrivate(ctx.Doer) { // We must be signed in to see limited or private organizations - ctx.NotFound(err) + ctx.NotFound() return } @@ -115,7 +113,7 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { } else if ctx.IsSigned { ctx.Org.IsOwner, err = org.IsOwnedBy(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("IsOwnedBy", err) + ctx.ServerErrorAuto(err) return } @@ -126,13 +124,13 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { } else { ctx.Org.IsMember, err = org.IsOrgMember(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("IsOrgMember", err) + ctx.ServerErrorAuto(err) return } if ctx.Org.IsMember { ctx.Org.CanCreateOrgRepo, err = org.CanCreateOrgRepo(ctx, ctx.Doer.ID) if err != nil { - ctx.ServerError("CanCreateOrgRepo", err) + ctx.ServerErrorAuto(err) return } } @@ -142,7 +140,7 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { ctx.Data["SignedUser"] = &user_model.User{} } if (opts.RequireMember && !ctx.Org.IsMember) || (opts.RequireOwner && !ctx.Org.IsOwner) { - ctx.NotFound(err) + ctx.NotFound() return } ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner @@ -166,21 +164,21 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { } ctx.Data["NumMembers"], err = organization.CountOrgMembers(ctx, findMembersOpts) if err != nil { - ctx.ServerError("CountOrgMembers", err) + ctx.ServerErrorAuto(err) return } // Team. shouldSeeAllTeams, err := UserShouldSeeAllOrgTeams(ctx) if err != nil { - ctx.ServerError("UserShouldSeeAllOrgTeams", err) + ctx.ServerErrorAuto(err) return } switch { case shouldSeeAllTeams: ctx.Org.Teams, err = org.LoadTeams(ctx) if err != nil { - ctx.ServerError("LoadTeams", err) + ctx.ServerErrorAuto(err) return } case ctx.IsSigned: @@ -193,7 +191,7 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { IncludeVisibilities: organization.VisibleTeamVisibilitiesFor(ctx.Org.IsMember, true), }) if err != nil { - ctx.ServerError("SearchTeam", err) + ctx.ServerErrorAuto(err) return } } @@ -214,7 +212,7 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { } if !teamExists { - ctx.NotFound(err) + ctx.NotFound() return } @@ -224,13 +222,13 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { if !ctx.Org.IsOwner { ctx.Org.IsTeamMember, err = organization.IsTeamMember(ctx, org.ID, ctx.Org.Team.ID, ctx.Doer.ID) if err != nil { - ctx.ServerError("IsTeamMember", err) + ctx.ServerErrorAuto(err) return } } ctx.Data["IsTeamMember"] = ctx.Org.IsTeamMember if opts.RequireTeamMember && !ctx.Org.IsTeamMember { - ctx.NotFound(err) + ctx.NotFound() return } } @@ -244,7 +242,7 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) { if len(ctx.ContextUser.Description) != 0 { content, err := markdown.RenderString(markup.NewRenderContext(ctx), ctx.ContextUser.Description) if err != nil { - ctx.ServerError("RenderString", err) + ctx.ServerErrorAuto(err) return } ctx.Data["RenderedDescription"] = content diff --git a/services/context/package.go b/services/context/package.go index 4951d554c44..f729f7c613b 100644 --- a/services/context/package.go +++ b/services/context/package.go @@ -4,8 +4,6 @@ package context import ( - "errors" - "fmt" "net/http" "gitea.dev/models/organization" @@ -33,16 +31,8 @@ type packageAssignmentCtx struct { // PackageAssignment returns a middleware to handle Context.Package assignment func PackageAssignment() func(ctx *Context) { return func(ctx *Context) { - errorFn := func(status int, msg string) { - err := fmt.Errorf("%s", msg) - if status == http.StatusNotFound { - ctx.NotFound(err) - } else { - ctx.ServerError("PackageAssignment", err) - } - } paCtx := &packageAssignmentCtx{Base: ctx.Base, Doer: ctx.Doer, ContextUser: ctx.ContextUser} - ctx.Package = packageAssignment(paCtx, errorFn) + ctx.Package = packageAssignment(paCtx, ctx.ServerErrorAuto) } } @@ -50,15 +40,15 @@ func PackageAssignment() func(ctx *Context) { func PackageAssignmentAPI() func(ctx *APIContext) { return func(ctx *APIContext) { paCtx := &packageAssignmentCtx{Base: ctx.Base, Doer: ctx.Doer, ContextUser: ctx.ContextUser} - ctx.Package = packageAssignment(paCtx, ctx.APIError) + ctx.Package = packageAssignment(paCtx, ctx.APIErrorAuto) } } -func packageAssignment(ctx *packageAssignmentCtx, errCb func(int, string)) *Package { +func packageAssignment(ctx *packageAssignmentCtx, errCb func(error)) *Package { pkgOwner := ctx.ContextUser accessMode, err := determineAccessMode(ctx.Base, pkgOwner, ctx.Doer) if err != nil { - errCb(http.StatusInternalServerError, fmt.Sprintf("determineAccessMode: %v", err)) + errCb(err) return nil } @@ -76,27 +66,19 @@ func packageAssignment(ctx *packageAssignmentCtx, errCb func(int, string)) *Pack if version != "" { pv, err := packages_model.GetVersionByNameAndVersion(ctx, pkg.Owner.ID, packages_model.Type(packageType), name, version) if err != nil { - if errors.Is(err, packages_model.ErrPackageNotExist) { - errCb(http.StatusNotFound, fmt.Sprintf("GetVersionByNameAndVersion: %v", err)) - } else { - errCb(http.StatusInternalServerError, fmt.Sprintf("GetVersionByNameAndVersion: %v", err)) - } + errCb(err) return pkg } pkg.Descriptor, err = packages_model.GetPackageDescriptor(ctx, pv) if err != nil { - errCb(http.StatusInternalServerError, fmt.Sprintf("GetPackageDescriptor: %v", err)) + errCb(err) return pkg } } else { p, err := packages_model.GetPackageByName(ctx, pkg.Owner.ID, packages_model.Type(packageType), name) if err != nil { - if errors.Is(err, packages_model.ErrPackageNotExist) { - errCb(http.StatusNotFound, fmt.Sprintf("GetPackageByName: %v", err)) - } else { - errCb(http.StatusInternalServerError, fmt.Sprintf("GetPackageByName: %v", err)) - } + errCb(err) return pkg } diff --git a/services/context/permission.go b/services/context/permission.go index e5d90aec169..d1207206aae 100644 --- a/services/context/permission.go +++ b/services/context/permission.go @@ -21,7 +21,7 @@ func CheckTokenScopes(ctx *Context, scopes ...auth_model.AccessTokenScope) { scopeMatched, err := scope.HasAnyScope(scopes...) if err != nil { - ctx.ServerError("HasAnyScope", err) + ctx.ServerErrorAuto(err) return } @@ -34,7 +34,7 @@ func CheckTokenScopes(ctx *Context, scopes ...auth_model.AccessTokenScope) { func RequireRepoAdmin() func(ctx *Context) { return func(ctx *Context) { if !ctx.IsSigned || !ctx.Repo.Permission.IsAdmin() { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -44,7 +44,7 @@ func RequireRepoAdmin() func(ctx *Context) { func CanWriteToBranch() func(ctx *Context) { return func(ctx *Context) { if !ctx.Repo.CanWriteToBranch(ctx, ctx.Doer, ctx.Repo.BranchName) { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -56,7 +56,7 @@ func RequireUnitWriter(unitTypes ...unit.Type) func(ctx *Context) { if slices.ContainsFunc(unitTypes, ctx.Repo.Permission.CanWrite) { return } - ctx.NotFound(nil) + ctx.NotFound() } } @@ -71,7 +71,7 @@ func RequireUnitReader(unitTypes ...unit.Type) func(ctx *Context) { return } } - ctx.NotFound(nil) + ctx.NotFound() } } diff --git a/services/context/repo.go b/services/context/repo.go index 4a5d07022e5..436375cd775 100644 --- a/services/context/repo.go +++ b/services/context/repo.go @@ -6,7 +6,6 @@ package context import ( "context" - "errors" "fmt" "html" "html/template" @@ -156,7 +155,7 @@ func (r *Repository) GetObjectFormat() git.ObjectFormat { func RepoMustNotBeArchived() func(ctx *Context) { return func(ctx *Context) { if ctx.Repo.Repository.IsArchived { - ctx.NotFound(errors.New(ctx.Locale.TrString("repo.archive.title"))) + ctx.NotFound() } } } @@ -364,10 +363,10 @@ func RetrieveBaseRepo(ctx *Context, repo *repo_model.Repository) { repo.ForkID = 0 return } - ctx.ServerError("GetBaseRepo", err) + ctx.ServerErrorAuto(err) return } else if err = repo.BaseRepo.LoadOwner(ctx); err != nil { - ctx.ServerError("BaseRepo.LoadOwner", err) + ctx.ServerErrorAuto(err) return } } @@ -381,16 +380,16 @@ func RetrieveTemplateRepo(ctx *Context, repo *repo_model.Repository) { repo.TemplateID = 0 return } - ctx.ServerError("GetTemplateRepo", err) + ctx.ServerErrorAuto(err) return } else if err = templateRepo.LoadOwner(ctx); err != nil { - ctx.ServerError("TemplateRepo.LoadOwner", err) + ctx.ServerErrorAuto(err) return } perm, err := access_model.GetDoerRepoPermission(ctx, templateRepo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } @@ -462,7 +461,7 @@ func repoAssignmentLegacy(ctx *Context, data *repoAssignmentPrepareDataStruct) { var err error repo := data.repo if err = repo.LoadOwner(ctx); err != nil { - ctx.ServerError("LoadOwner", err) + ctx.ServerErrorAuto(err) return } @@ -471,7 +470,7 @@ func repoAssignmentLegacy(ctx *Context, data *repoAssignmentPrepareDataStruct) { } else { ctx.Repo.Permission, err = access_model.GetDoerRepoPermission(ctx, repo, ctx.Doer) if err != nil { - ctx.ServerError("GetDoerRepoPermission", err) + ctx.ServerErrorAuto(err) return } } @@ -486,7 +485,7 @@ func repoAssignmentLegacy(ctx *Context, data *repoAssignmentPrepareDataStruct) { EarlyResponseForGoGetMeta(ctx) return } - ctx.NotFound(nil) + ctx.NotFound() return } ctx.Data["Permission"] = &ctx.Repo.Permission @@ -496,7 +495,7 @@ func repoAssignmentLegacy(ctx *Context, data *repoAssignmentPrepareDataStruct) { if err == nil { ctx.Data["PullMirror"] = pullMirror } else if err != repo_model.ErrMirrorNotExist { - ctx.ServerError("GetMirrorByRepoID", err) + ctx.ServerErrorAuto(err) return } } @@ -561,13 +560,11 @@ func repoAssignmentPrepareOwner(ctx *Context, data *repoAssignmentPrepareDataStr if redirectUserID, err := user_model.LookupUserRedirect(ctx, userName); err == nil { RedirectToUser(ctx.Base, ctx.Doer, userName, redirectUserID) - } else if user_model.IsErrUserRedirectNotExist(err) { - ctx.NotFound(nil) } else { - ctx.ServerError("LookupUserRedirect", err) + ctx.ServerErrorAuto(err) } } else { - ctx.ServerError("GetUserByName", err) + ctx.ServerErrorAuto(err) } return } @@ -613,12 +610,12 @@ func repoAssignmentPrepareRepo(ctx *Context, data *repoAssignmentPrepareDataStru EarlyResponseForGoGetMeta(ctx) return } - ctx.NotFound(nil) + ctx.NotFound() } else { - ctx.ServerError("LookupRepoRedirect", err) + ctx.ServerErrorAuto(err) } } else { - ctx.ServerError("GetRepositoryByName", err) + ctx.ServerErrorAuto(err) } return } @@ -645,7 +642,7 @@ func repoAssignmentPrepareTemplateData(ctx *Context, data *repoAssignmentPrepare RepoID: ctx.Repo.Repository.ID, }) if err != nil { - ctx.ServerError("GetReleaseCountByRepoID", err) + ctx.ServerErrorAuto(err) return } ctx.Data["NumReleases"], err = db.Count[repo_model.Release](ctx, repo_model.FindReleasesOptions{ @@ -654,7 +651,7 @@ func repoAssignmentPrepareTemplateData(ctx *Context, data *repoAssignmentPrepare RepoID: ctx.Repo.Repository.ID, }) if err != nil { - ctx.ServerError("GetReleaseCountByRepoID", err) + ctx.ServerErrorAuto(err) return } @@ -669,14 +666,14 @@ func repoAssignmentPrepareTemplateData(ctx *Context, data *repoAssignmentPrepare canSignedUserFork, err := repo_module.CanUserForkRepo(ctx, ctx.Doer, ctx.Repo.Repository) if err != nil { - ctx.ServerError("CanUserForkRepo", err) + ctx.ServerErrorAuto(err) return } ctx.Data["CanSignedUserFork"] = canSignedUserFork userAndOrgForks, err := repo_model.GetForksByUserAndOrgs(ctx, ctx.Doer, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetForksByUserAndOrgs", err) + ctx.ServerErrorAuto(err) return } ctx.Data["UserAndOrgForks"] = userAndOrgForks @@ -694,7 +691,7 @@ func repoAssignmentPrepareTemplateData(ctx *Context, data *repoAssignmentPrepare if ctx.IsSigned { watch, err := repo_model.GetWatch(ctx, ctx.Doer.ID, repo.ID) if err != nil { - ctx.ServerError("GetWatch", err) + ctx.ServerErrorAuto(err) return } ctx.Data["RepoWatch"] = watch @@ -753,7 +750,7 @@ func repoAssignmentPrepareGitRepo(ctx *Context, data *repoAssignmentPrepareDataS } return } - ctx.ServerError("RepoAssignment Invalid repo "+repo.FullName(), err) + ctx.ServerErrorAuto(err) return } } @@ -769,7 +766,7 @@ func repoAssignmentPrepareBranches(ctx *Context, data *repoAssignmentPrepareData } branchesTotal, err := db.Count[git_model.Branch](ctx, branchOpts) if err != nil { - ctx.ServerError("CountBranches", err) + ctx.ServerErrorAuto(err) return } @@ -777,7 +774,7 @@ func repoAssignmentPrepareBranches(ctx *Context, data *repoAssignmentPrepareData if branchesTotal == 0 { // fallback to do a sync immediately branchesTotal, err = repo_module.SyncRepoBranches(ctx, ctx.Repo.Repository.ID, 0) if err != nil { - ctx.ServerError("SyncRepoBranches", err) + ctx.ServerErrorAuto(err) return } } @@ -806,12 +803,12 @@ func repoAssignmentPrepareRepoTransfer(ctx *Context, data *repoAssignmentPrepare if ctx.Repo.Repository.Status == repo_model.RepositoryPendingTransfer { repoTransfer, err := repo_model.GetPendingRepositoryTransfer(ctx, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetPendingRepositoryTransfer", err) + ctx.ServerErrorAuto(err) return } if err := repoTransfer.LoadAttributes(ctx); err != nil { - ctx.ServerError("LoadAttributes", err) + ctx.ServerErrorAuto(err) return } @@ -1035,7 +1032,7 @@ func RepoRefByType(detectRefType git.RefType) func(*Context) { ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(ctx, refShortName) if err != nil { - ctx.ServerError("GetBranchCommit", err) + ctx.ServerErrorAuto(err) return } ctx.Repo.CommitID = ctx.Repo.Commit.ID.String() @@ -1044,11 +1041,7 @@ func RepoRefByType(detectRefType git.RefType) func(*Context) { ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetTagCommit(ctx, refShortName) if err != nil { - if git.IsErrNotExist(err) { - ctx.NotFound(err) - return - } - ctx.ServerError("GetTagCommit", err) + ctx.ServerErrorAuto(err) return } ctx.Repo.CommitID = ctx.Repo.Commit.ID.String() @@ -1058,7 +1051,7 @@ func RepoRefByType(detectRefType git.RefType) func(*Context) { ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommit(ctx, refShortName) if err != nil { - ctx.NotFound(err) + ctx.ServerErrorAuto(err) return } // If short commit ID add canonical link header @@ -1068,7 +1061,7 @@ func RepoRefByType(detectRefType git.RefType) func(*Context) { ctx.RespHeader().Set("Link", fmt.Sprintf(`<%s>; rel="canonical"`, canonicalURL)) } } else { - ctx.NotFound(fmt.Errorf("branch or tag not exist: %s", refShortName)) + ctx.NotFound() return } @@ -1109,7 +1102,7 @@ func RepoRefByType(detectRefType git.RefType) func(*Context) { ctx.Repo.CommitsCount, err = git.GetCommitsCountCache(ctx, ctx.Repo.Repository, ctx.Repo.RefFullName, ctx.Repo.Commit) if err != nil { - ctx.ServerError("GetCommitsCount", err) + ctx.ServerErrorAuto(err) return } if ctx.Repo.RefFullName.IsTag() { @@ -1129,7 +1122,7 @@ func RepoRefByType(detectRefType git.RefType) func(*Context) { func GitHookService() func(ctx *Context) { return func(ctx *Context) { if !ctx.Doer.CanEditGitHook() { - ctx.NotFound(nil) + ctx.NotFound() return } } diff --git a/services/context/user.go b/services/context/user.go index 06fc2671fd8..d021728ba7c 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -4,13 +4,14 @@ package context import ( + "errors" "fmt" - "net/http" "strings" "gitea.dev/models/organization" user_model "gitea.dev/models/user" "gitea.dev/modules/session" + "gitea.dev/modules/util" ) func ReqContextUserVisibleToDoer() func(ctx *Context) { @@ -18,7 +19,7 @@ func ReqContextUserVisibleToDoer() func(ctx *Context) { isOrg := ctx.ContextUser.IsOrganization() if isOrg && !organization.HasOrgOrUserVisible(ctx, ctx.ContextUser, ctx.Doer) || !isOrg && !user_model.IsUserVisibleToViewer(ctx, ctx.ContextUser, ctx.Doer) { - ctx.NotFound(nil) + ctx.NotFound() return } } @@ -27,15 +28,7 @@ func ReqContextUserVisibleToDoer() func(ctx *Context) { // UserAssignmentWeb returns a middleware to handle context-user assignment for web routes func UserAssignmentWeb() func(ctx *Context) { return func(ctx *Context) { - errorFn := func(status int, msg string) { - err := fmt.Errorf("%s", msg) - if status == http.StatusNotFound { - ctx.NotFound(err) - } else { - ctx.ServerError("UserAssignmentWeb", err) - } - } - ctx.ContextUser = userAssignment(ctx.Base, ctx.Doer, errorFn) + ctx.ContextUser = userAssignment(ctx.Base, ctx.Doer, ctx.ServerErrorAuto) ctx.Data["ContextUser"] = ctx.ContextUser } } @@ -43,11 +36,11 @@ func UserAssignmentWeb() func(ctx *Context) { // UserAssignmentAPI returns a middleware to handle context-user assignment for api routes func UserAssignmentAPI() func(ctx *APIContext) { return func(ctx *APIContext) { - ctx.ContextUser = userAssignment(ctx.Base, ctx.Doer, ctx.APIError) + ctx.ContextUser = userAssignment(ctx.Base, ctx.Doer, ctx.APIErrorAuto) } } -func userAssignment(ctx *Base, doer *user_model.User, errCb func(int, string)) (contextUser *user_model.User) { +func userAssignment(ctx *Base, doer *user_model.User, errCb func(error)) (contextUser *user_model.User) { username := ctx.PathParam("username") if doer != nil && strings.EqualFold(doer.LowerName, username) { @@ -56,22 +49,22 @@ func userAssignment(ctx *Base, doer *user_model.User, errCb func(int, string)) ( var err error contextUser, err = user_model.GetUserByName(ctx, username) if err != nil { - if user_model.IsErrUserNotExist(err) { + if errors.Is(err, util.ErrNotExist) { if redirectUserID, err := user_model.LookupUserRedirect(ctx, username); err == nil { RedirectToUser(ctx, doer, username, redirectUserID) - } else if user_model.IsErrUserRedirectNotExist(err) { - errCb(http.StatusNotFound, err.Error()) + } else if errors.Is(err, util.ErrNotExist) { + errCb(util.NewNotExistErrorf("user not found")) } else { - errCb(http.StatusInternalServerError, fmt.Sprintf("LookupUserRedirect: %v", err)) + errCb(fmt.Errorf("LookupUserRedirect: %w", err)) } } else { - errCb(http.StatusInternalServerError, fmt.Sprintf("GetUserByName: %v", err)) + errCb(fmt.Errorf("GetUserByName: %w", err)) } return nil } } if !user_model.DoerTokenAllowsOwner(doer, contextUser) { - errCb(http.StatusNotFound, user_model.ErrUserRedirectNotExist{Name: username}.Error()) + errCb(util.NewNotExistErrorf("user not found")) return nil } return contextUser diff --git a/templates/status/404.tmpl b/templates/status/4xx.tmpl similarity index 65% rename from templates/status/404.tmpl rename to templates/status/4xx.tmpl index e83dcf463b2..14f407767e2 100644 --- a/templates/status/404.tmpl +++ b/templates/status/4xx.tmpl @@ -4,9 +4,15 @@