Skip to content

Commit 8af632b

Browse files
lf-wxiaoguang
authored andcommitted
Add an immutable tarball link to archive download headers for Nix
This allows `nix flake metadata` and nix in general to lock a *branch* tarball link in a manner that causes it to fetch the correct commit even if the branch is updated with a newer version. For further context, Nix flakes are a feature that, among other things, allows for "inputs" that are "github:someuser/somerepo", "https://some-tarball-service/some-tarball.tar.gz", "sourcehut:~meow/nya" or similar. This feature allows our users to fetch tarballs of git-based inputs to their builds rather than using git to fetch them, saving significant download time. There is presently no gitea or forgejo specific fetcher in Nix, and we don't particularly wish to have one. Ideally (as a developer on a Nix implementation myself) we could just use the generic tarball fetcher and not add specific forgejo support, but to do so, we need additional metadata to know which commit a given *branch* tarball represents, which is the purpose of the Link header added here. The result of this patch is that a Nix user can specify `inputs.something.url = "https://forgejo-host/some/project/archive/main.tar.gz"` in flake.nix and get a link to some concrete tarball for the actual commit in the lock file, then when they run `nix flake update` in the future, they will get the latest commit in that branch. Example of it working locally: » nix flake metadata --refresh 'http://localhost:3000/api/v1/repos/jade/cats/archive/main.tar.gz?dir=configs/nix' Resolved URL: http://localhost:3000/api/v1/repos/jade/cats/archive/main.tar.gz?dir=configs/nix Locked URL: http://localhost:3000/api/v1/repos/jade/cats/archive/804ede182b6b66469b23ea4d21eece52766b7a06.tar.gz?dir=configs /nix&narHash=sha256-yP7KkDVfuixZzs0fsqhSETXFC0y8m6nmPLw2GrAMxKQ%3D Description: Computers with the nixos Path: /nix/store/s856c6yqghyan4v0zy6jj19ksv0q22nx-source Revision: 804ede182b6b66469b23ea4d21eece52766b7a06 Last modified: 2024-05-02 00:48:32 For details on the header value, see: https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md Update routers/api/v1/repo/file.go Co-authored-by: wxiaoguang <[email protected]> Update routers/web/repo/repo.go Co-authored-by: wxiaoguang <[email protected]> Update tests/integration/api_repo_archive_test.go Co-authored-by: wxiaoguang <[email protected]>
1 parent 1e3c4d8 commit 8af632b

File tree

3 files changed

+23
-0
lines changed

3 files changed

+23
-0
lines changed

routers/api/v1/repo/file.go

+6
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,12 @@ func archiveDownload(ctx *context.APIContext) {
319319
func download(ctx *context.APIContext, archiveName string, archiver *repo_model.RepoArchiver) {
320320
downloadName := ctx.Repo.Repository.Name + "-" + archiveName
321321

322+
// Add nix format link header so tarballs lock correctly:
323+
// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
324+
ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.tar.gz?rev=%s>; rel="immutable"`,
325+
ctx.Repo.Repository.APIURL(),
326+
archiver.CommitID, archiver.CommitID))
327+
322328
rPath := archiver.RelativePath()
323329
if setting.RepoArchive.Storage.MinioConfig.ServeDirect {
324330
// If we have a signed url (S3, object storage), redirect to this directly.

routers/web/repo/repo.go

+6
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,12 @@ func Download(ctx *context.Context) {
484484
func download(ctx *context.Context, archiveName string, archiver *repo_model.RepoArchiver) {
485485
downloadName := ctx.Repo.Repository.Name + "-" + archiveName
486486

487+
// Add nix format link header so tarballs lock correctly:
488+
// https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md
489+
ctx.Resp.Header().Add("Link", fmt.Sprintf(`<%s/archive/%s.tar.gz?rev=%s>; rel="immutable"`,
490+
ctx.Repo.Repository.APIURL(),
491+
archiver.CommitID, archiver.CommitID))
492+
487493
rPath := archiver.RelativePath()
488494
if setting.RepoArchive.Storage.MinioConfig.ServeDirect {
489495
// If we have a signed url (S3, object storage), redirect to this directly.

tests/integration/api_repo_archive_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"io"
99
"net/http"
1010
"net/url"
11+
"regexp"
1112
"testing"
1213

1314
auth_model "code.gitea.io/gitea/models/auth"
@@ -39,6 +40,16 @@ func TestAPIDownloadArchive(t *testing.T) {
3940
assert.NoError(t, err)
4041
assert.Len(t, bs, 266)
4142

43+
// Must return a link to a commit ID as the "immutable" archive link
44+
linkHeaderRe := regexp.MustCompile(`^<(https?://.*/api/v1/repos/user2/repo1/archive/[a-f0-9]+\.tar\.gz.*)>; rel="immutable"$`)
45+
m := linkHeaderRe.FindStringSubmatch(resp.Header().Get("Link"))
46+
assert.NotEmpty(t, m[1])
47+
resp = MakeRequest(t, NewRequest(t, "GET", m[1]).AddTokenAuth(token), http.StatusOK)
48+
bs2, err := io.ReadAll(resp.Body)
49+
assert.NoError(t, err)
50+
// The locked URL should give the same bytes as the non-locked one
51+
assert.EqualValues(t, bs, bs2)
52+
4253
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.bundle", user2.Name, repo.Name))
4354
resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
4455
bs, err = io.ReadAll(resp.Body)

0 commit comments

Comments
 (0)