Commit `18da8c33b3`

18da8c33b3c0caf1f457ef638eeccd9c2e8a47de

Verified · cmc ci/build: success ci/test: success

cmc <hello@cleberg.net> · 2026-09-29 03:32 UTC

backup: verify skips LFS upload staging files; asset label names a missing repository by id

Ref #259

Layout: unified · split

cmd/gitbayd/backup.go +10 −4

 	"gitbay.org/gitbay/internal/backuplock"
 	"gitbay.org/gitbay/internal/config"
 	"gitbay.org/gitbay/internal/gitutil"
+	"gitbay.org/gitbay/internal/lfs"
 	"gitbay.org/gitbay/internal/store"
 )
 			if err := extractTo(tr, dbPath); err != nil {
 				return fmt.Errorf("%s: extracting the database: %w", path, err)
 			}
-		case strings.HasPrefix(h.Name, "lfs/") && h.Typeflag == tar.TypeReg:
+		case strings.HasPrefix(h.Name, "lfs/") && h.Typeflag == tar.TypeReg && lfs.OIDPat.MatchString(filepath.Base(h.Name)):
 			// Objects are named by their sha256, so each is checked as it
-			// streams past and none is extracted.
+			// streams past and none is extracted. Other names, such as an
+			// upload's .upload-* staging file, are not objects.
 			lfsObjects++
 			if !filepath.IsLocal(h.Name) {
 				return fmt.Errorf("%s: member %q leaves the archive root", path, h.Name)
 			return 0, nil, err
 		}
 		n++
-		r := byID[repoID]
+		r, ok := byID[repoID]
-		label := fmt.Sprintf("%s release %d %s", r.Path(), relID, name)
+		owner := r.Path()
+		if !ok {
+			owner = fmt.Sprintf("repository %d", repoID)
+		}
+		label := fmt.Sprintf("%s release %d %s", owner, relID, name)
 		f, err := os.Open(filepath.Join(root, "repos", r.OwnerName, r.Name+".git", "gitbay-releases", strconv.FormatInt(relID, 10), name))
 		if err != nil {
 			bad = append(bad, label)

cmd/gitbayd/backup_test.go +4 −2

 	oid := sha256.Sum256(obj)
 	o := hex.EncodeToString(oid[:])
 	writeFile(t, filepath.Join(root, "lfs", o[:2], o[2:4], o), obj)
+	// An upload in progress stages a temporary file beside the objects.
+	writeFile(t, filepath.Join(root, "lfs", o[:2], o[2:4], ".upload-123"), []byte("partial"))
 	good := filepath.Join(t.TempDir(), "good.tar.gz")
 	if err := runBackup(cfg, good, false); err != nil {
 	if err == nil || !strings.Contains(err.Error(), "krz/thing release") || !strings.Contains(err.Error(), wrong) {
 		t.Fatalf("archive with a bad asset and LFS object: %v", err)
 	}
-	if strings.Contains(err.Error(), o) {
+	if strings.Contains(err.Error(), o) || strings.Contains(err.Error(), ".upload-") {
-		t.Fatalf("intact LFS object reported: %v", err)
+		t.Fatalf("intact LFS object or upload staging file reported: %v", err)
 	}
 }

Commit 18da8c33b3