mirror of
https://github.com/go-gitea/gitea.git
synced 2026-04-04 23:10:38 +02: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>
74 lines
3.1 KiB
Go
74 lines
3.1 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/test"
|
|
"code.gitea.io/gitea/tests"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestDownloadRepoContent(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
t.Run("RawBlob", func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/user2/repo1/raw/blob/4b4851ad51df6a7d9f25c979345979eaeb5b349f")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
|
|
})
|
|
|
|
t.Run("SVGUsesSecureHeaders", func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/user2/repo2/raw/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.Header().Get("Content-Security-Policy"))
|
|
assert.Equal(t, "image/svg+xml", resp.Header().Get("Content-Type"))
|
|
assert.Equal(t, "nosniff", resp.Header().Get("X-Content-Type-Options"))
|
|
})
|
|
|
|
t.Run("MediaBlob", func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/user2/repo1/media/blob/4b4851ad51df6a7d9f25c979345979eaeb5b349f")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
|
|
})
|
|
|
|
t.Run("MediaSVGUsesSecureHeaders", func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/user2/repo2/media/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.Header().Get("Content-Security-Policy"))
|
|
assert.Equal(t, "image/svg+xml", resp.Header().Get("Content-Type"))
|
|
assert.Equal(t, "nosniff", resp.Header().Get("X-Content-Type-Options"))
|
|
})
|
|
|
|
t.Run("MimeTypeMap", func(t *testing.T) {
|
|
req := NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
// although the file is a valid XML file, it is served as "text/plain" to avoid site content spamming (the same to "text/html" files)
|
|
assert.Equal(t, "text/plain; charset=utf-8", resp.Header().Get("Content-Type"))
|
|
|
|
defer tests.PrepareTestEnv(t)()
|
|
defer test.MockVariableValue(&setting.MimeTypeMap)()
|
|
setting.MimeTypeMap.Enabled = true
|
|
|
|
setting.MimeTypeMap.Map[".xml"] = "text/xml"
|
|
req = NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
// respect the mime mapping, and "text/plain" protection isn't used anymore
|
|
assert.Equal(t, "text/xml; charset=utf-8", resp.Header().Get("Content-Type"))
|
|
assert.Equal(t, "inline; filename=test.xml", resp.Header().Get("Content-Disposition"))
|
|
|
|
setting.MimeTypeMap.Map[".xml"] = "application/xml"
|
|
req = NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
|
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
|
// non-text file don't have "charset"
|
|
assert.Equal(t, "application/xml", resp.Header().Get("Content-Type"))
|
|
})
|
|
}
|