fix: restore missing blob file when re-publishing a package (#39239)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Huang-404-Q
2026-09-05 10:33:36 +02:00
committed by GitHub
co-authored by wxiaoguang
parent e4455fb494
commit efa69e7230
10 changed files with 145 additions and 76 deletions
+73
View File
@@ -4,6 +4,11 @@
package packages
import (
"bytes"
"crypto/sha256"
"encoding/hex"
"io"
"net/http"
"testing"
"gitea.dev/models/db"
@@ -13,6 +18,8 @@ import (
unit_model "gitea.dev/models/unit"
"gitea.dev/models/unittest"
user_model "gitea.dev/models/user"
packages_module "gitea.dev/modules/packages"
"gitea.dev/modules/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -22,6 +29,72 @@ func TestMain(m *testing.M) {
unittest.MainTest(m)
}
func TestCreatePackageAndAddFileRestoresMissingBlobFile(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
uploadPackage := func(t *testing.T, user *user_model.User, name, filename string, data []byte) (*packages_model.PackageFile, error) {
buf, err := packages_module.CreateHashedBufferFromReader(bytes.NewReader(data))
require.NoError(t, err)
_, pf, err := CreatePackageAndAddFile(t.Context(),
&PackageCreationInfo{
Owner: user,
PackageType: packages_model.TypeNuGet,
Name: name,
Version: "1.0.0",
SemverCompatible: true,
Creator: user,
},
&PackageFileCreationInfo{
Filename: filename,
Creator: user,
Data: buf,
IsLead: true,
})
return pf, err
}
// This test data is from https://github.com/go-gitea/gitea/issues/39215, it doesn't really matter, actually.
// The key point is that if the blob object is missing in the content storage, it must be restored when uploaded again.
pkgData := test.WriteZipArchive(map[string]string{
"package.nuspec": "<package><metadata><id>nuget.repro</id><version>1.0.0</version></metadata></package>",
"lib/netstandard2.0/_._": "",
}).Bytes()
pkgDataSum := sha256.Sum256(pkgData)
key := packages_module.BlobHash256Key(hex.EncodeToString(pkgDataSum[:]))
contentStore := packages_module.NewContentStore()
// The initial upload writes the blob row and its file
pf1, err := uploadPackage(t, user, "nuget.repro", "nuget.repro.1.0.0.nupkg", pkgData)
require.NoError(t, err)
sz, err := contentStore.OptionalSize(key)
assert.NoError(t, err)
assert.EqualValues(t, len(pkgData), sz.ValueOrDefault(-1))
// Simulate the storage inconsistency: the blob row survives but its file is missing
require.NoError(t, contentStore.Delete(key))
sz, err = contentStore.OptionalSize(key)
assert.NoError(t, err)
assert.EqualValues(t, -1, sz.ValueOrDefault(-1))
// Publishing a package with identical content must restore the blob file
pf2, err := uploadPackage(t, user, "nuget.repro-copy", "nuget.repro-copy.1.0.0.nupkg", pkgData)
require.NoError(t, err)
sz, err = contentStore.OptionalSize(key)
assert.NoError(t, err)
assert.EqualValues(t, len(pkgData), sz.ValueOrDefault(-1))
// The blob file must be present and both packages must be downloadable
for _, pf := range []*packages_model.PackageFile{pf1, pf2} {
s, _, _, err := OpenFileForDownload(t.Context(), pf, http.MethodGet)
require.NoError(t, err)
respData, err := io.ReadAll(s)
require.NoError(t, err)
assert.NoError(t, s.Close())
assert.Equal(t, pkgData, respData)
}
}
func TestUnlinkFromRepositoryRequiresTargetRepoAdmin(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
repo := &repo_model.Repository{OwnerID: 3, OwnerName: "org3", Name: "package-repo", LowerName: "package-repo", IsPrivate: true}