mirror of
https://github.com/go-gitea/gitea.git
synced 2026-04-05 14:48:07 +00:00
a3cc34472b
Pass `ServeHeaderOptions` by value instead of pointer across all call
sites — no nil-check semantics are needed and the struct is small enough
that copying is fine.
## Changes
- **`services/context/base.go`**: `SetServeHeaders` and `ServeContent`
accept `ServeHeaderOptions` (value, not pointer); internal unsafe
pointer cast replaced with a clean type conversion
- **`routers/api/packages/helper/helper.go`**: `ServePackageFile`
variadic changed from `...*context.ServeHeaderOptions` to
`...context.ServeHeaderOptions`; internal variable is now a value type
- **All call sites** (13 files): `&context.ServeHeaderOptions{...}` →
`context.ServeHeaderOptions{...}`
Before/after at the definition level:
```go
// Before
func (b *Base) SetServeHeaders(opt *ServeHeaderOptions) { ... }
func (b *Base) ServeContent(r io.ReadSeeker, opts *ServeHeaderOptions) { ... }
func ServePackageFile(..., forceOpts ...*context.ServeHeaderOptions) { ... }
// After
func (b *Base) SetServeHeaders(opts ServeHeaderOptions) { ... }
func (b *Base) ServeContent(r io.ReadSeeker, opts ServeHeaderOptions) { ... }
func ServePackageFile(..., forceOpts ...context.ServeHeaderOptions) { ... }
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
62 lines
1.7 KiB
Go
62 lines
1.7 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package helper
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
packages_model "code.gitea.io/gitea/models/packages"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/services/context"
|
|
)
|
|
|
|
// ProcessErrorForUser logs the error and returns a user-error message for the end user.
|
|
// If the status is http.StatusInternalServerError, the message is stripped for non-admin users in production.
|
|
func ProcessErrorForUser(ctx *context.Context, status int, errObj any) string {
|
|
var message string
|
|
if err, ok := errObj.(error); ok {
|
|
message = err.Error()
|
|
} else if errObj != nil {
|
|
message = fmt.Sprint(errObj)
|
|
}
|
|
|
|
if status == http.StatusInternalServerError {
|
|
log.Log(2, log.ERROR, "Package registry API internal error: %d %s", status, message)
|
|
if setting.IsProd && (ctx.Doer == nil || !ctx.Doer.IsAdmin) {
|
|
message = "internal server error"
|
|
}
|
|
return message
|
|
}
|
|
|
|
log.Log(2, log.DEBUG, "Package registry API user error: %d %s", status, message)
|
|
return message
|
|
}
|
|
|
|
// ServePackageFile the content of the package file
|
|
// If the url is set it will redirect the request, otherwise the content is copied to the response.
|
|
func ServePackageFile(ctx *context.Context, s io.ReadSeekCloser, u *url.URL, pf *packages_model.PackageFile, forceOpts ...context.ServeHeaderOptions) {
|
|
if u != nil {
|
|
ctx.Redirect(u.String())
|
|
return
|
|
}
|
|
|
|
defer s.Close()
|
|
|
|
var opts context.ServeHeaderOptions
|
|
if len(forceOpts) > 0 {
|
|
opts = forceOpts[0]
|
|
} else {
|
|
opts = context.ServeHeaderOptions{
|
|
Filename: pf.Name,
|
|
LastModified: pf.CreatedUnix.AsLocalTime(),
|
|
}
|
|
}
|
|
|
|
ctx.ServeContent(s, opts)
|
|
}
|