Skip to content

fix(packages): use file names for generic web downloads #37514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxiaoguang merged 3 commits into from
May 3, 2026
Merged

fix(packages): use file names for generic web downloads #37514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8734e45
fix(packages): use file names for generic web downloads
cyphercodes May 3, 2026
eb0c200
fix test bug
wxiaoguang May 3, 2026
2a90130
fix test
wxiaoguang May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/packages/package_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func TryInsertFile(ctx context.Context, pf *PackageFile) (*PackageFile, error) {
// GetFilesByVersionID gets all files of a version
func GetFilesByVersionID(ctx context.Context, versionID int64) ([]*PackageFile, error) {
pfs := make([]*PackageFile, 0, 10)
return pfs, db.GetEngine(ctx).Where("version_id = ?", versionID).Find(&pfs)
return pfs, db.GetEngine(ctx).Where("version_id = ?", versionID).OrderBy("lower_name, created_unix, id").Find(&pfs)
}

// GetFileForVersionByID gets a file of a version by id
Expand Down
6 changes: 5 additions & 1 deletion routers/web/user/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,11 @@ func DownloadPackageFile(ctx *context.Context) {
return
}

packages_helper.ServePackageFile(ctx, s, u, pf)
packages_helper.ServePackageFile(ctx, s, u, pf, httplib.ServeHeaderOptions{
Filename: pf.Name,
LastModified: pf.CreatedUnix.AsLocalTime(),
ContentDisposition: httplib.ContentDispositionAttachment,
})
}

// ActionPackageTerraformLock locks a terraform state
Expand Down
23 changes: 23 additions & 0 deletions tests/integration/api_packages_generic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import (
"bytes"
"fmt"
"io"
"mime"
"net/http"
neturl "net/url"
"testing"

"code.gitea.io/gitea/models/packages"
Expand Down Expand Up @@ -173,6 +175,27 @@ func TestPackageGeneric(t *testing.T) {

checkDownloadCount(3)
})

t.Run("WebAssetUsesFilename", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()

pvs, err := packages.GetVersionsByPackageType(t.Context(), user.ID, packages.TypeGeneric)
assert.NoError(t, err)
assert.Len(t, pvs, 1)

pfs, err := packages.GetFilesByVersionID(t.Context(), pvs[0].ID)
assert.NoError(t, err)
assert.NotEmpty(t, pfs)

req = NewRequest(t, "GET", fmt.Sprintf("/%s/-/packages/generic/%s/%s/files/%d", user.Name, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion), pfs[0].ID))
resp = MakeRequest(t, req, http.StatusOK)
assert.Equal(t, content, resp.Body.Bytes())

disposition, params, err := mime.ParseMediaType(resp.Header().Get("Content-Disposition"))
assert.NoError(t, err)
assert.Equal(t, "attachment", disposition)
assert.Equal(t, pfs[0].Name, params["filename"])
})
})

t.Run("Delete", func(t *testing.T) {
Expand Down