1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
|
package ingest_test
import (
"bytes"
"encoding/binary"
"errors"
"io"
"io/fs"
"os"
"path/filepath"
"strings"
"testing"
"codeberg.org/lindenii/furgit/internal/testgit"
objectid "codeberg.org/lindenii/furgit/object/id"
"codeberg.org/lindenii/furgit/packfile/ingest"
)
type noExtraReadReader struct {
reader *bytes.Reader
}
func (r *noExtraReadReader) Read(p []byte) (int, error) {
if r.reader.Len() == 0 {
return 0, errors.New("unexpected extra read after pack trailer")
}
return r.reader.Read(p)
}
func beginAndContinue(
src io.Reader,
packRoot *os.Root,
algo objectid.Algorithm,
opts ingest.Options,
) (ingest.Result, error) {
pending, err := ingest.Ingest(src, algo, opts)
if err != nil {
return ingest.Result{}, err
}
return pending.Continue(packRoot)
}
// fixturePath returns one fixture file path for the selected algorithm.
func fixturePath(t *testing.T, algo objectid.Algorithm, name string) string {
t.Helper()
dir := algo.String()
if dir == "" {
t.Fatalf("unsupported fixture algorithm: %v", algo)
}
return filepath.Join("testdata", "fixtures", dir, name)
}
// fixtureBytes reads one fixture file fully.
func fixtureBytes(t *testing.T, algo objectid.Algorithm, name string) []byte {
t.Helper()
path := fixturePath(t, algo, name)
dir := filepath.Dir(path)
base := filepath.Base(path)
root, err := os.OpenRoot(dir)
if err != nil {
t.Fatalf("open fixture root %q: %v", dir, err)
}
defer func() {
err := root.Close()
if err != nil {
t.Fatalf("close fixture root %q: %v", dir, err)
}
}()
data, err := root.ReadFile(base)
if err != nil {
t.Fatalf("read fixture %q: %v", base, err)
}
return data
}
// fixtureMetadata parses key=value metadata for one algorithm fixture set.
func fixtureMetadata(t *testing.T, algo objectid.Algorithm) map[string]string {
t.Helper()
data := fixtureBytes(t, algo, "METADATA.txt")
out := make(map[string]string)
for line := range strings.SplitSeq(strings.TrimSpace(string(data)), "\n") {
line = strings.TrimSpace(line)
if line == "" {
continue
}
key, value, ok := strings.Cut(line, "=")
if !ok {
t.Fatalf("invalid fixture metadata line %q", line)
}
out[strings.TrimSpace(key)] = strings.TrimSpace(value)
}
return out
}
// fixtureOID returns one fixture metadata object ID value.
func fixtureOID(t *testing.T, algo objectid.Algorithm, key string) objectid.ObjectID {
t.Helper()
meta := fixtureMetadata(t, algo)
hex, ok := meta[key]
if !ok {
t.Fatalf("missing fixture metadata key %q", key)
}
id, err := objectid.ParseHex(algo, hex)
if err != nil {
t.Fatalf("parse fixture metadata oid %q: %v", hex, err)
}
return id
}
// verifyReindexOracle regenerates idx/rev with upstream git index-pack and
// compares bytes with files produced by ingest.
func verifyReindexOracle(t *testing.T, repo *testgit.TestRepo, packName, idxName, revName string) {
t.Helper()
oracleDir := t.TempDir()
oracleIdxPath := filepath.Join(oracleDir, "oracle.idx")
_ = repo.Run(t, "index-pack", "--rev-index", "-o", oracleIdxPath, filepath.Join("objects", "pack", packName))
oracleRevPath := strings.TrimSuffix(oracleIdxPath, ".idx") + ".rev"
packRoot := repo.OpenPackRoot(t)
gotIdx, err := packRoot.ReadFile(idxName)
if err != nil {
t.Fatalf("read idx: %v", err)
}
oracleRoot, err := os.OpenRoot(oracleDir)
if err != nil {
t.Fatalf("open oracle root: %v", err)
}
defer func() {
err := oracleRoot.Close()
if err != nil {
t.Fatalf("close oracle root: %v", err)
}
}()
wantIdx, err := oracleRoot.ReadFile(filepath.Base(oracleIdxPath))
if err != nil {
t.Fatalf("read oracle idx: %v", err)
}
if !bytes.Equal(gotIdx, wantIdx) {
t.Fatal("idx bytes differ from git index-pack output")
}
gotRev, err := packRoot.ReadFile(revName)
if err != nil {
t.Fatalf("read rev: %v", err)
}
wantRev, err := oracleRoot.ReadFile(filepath.Base(oracleRevPath))
if err != nil {
t.Fatalf("read oracle rev: %v", err)
}
if !bytes.Equal(gotRev, wantRev) {
t.Fatal("rev bytes differ from git index-pack output")
}
}
func TestIngestNonThinPackWritesPackIdxRev(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
head := fixtureOID(t, algo, "head")
packBytes := fixtureBytes(t, algo, "nonthin.pack")
receiver := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true})
packRoot := receiver.OpenPackRoot(t)
result, err := beginAndContinue(bytes.NewReader(packBytes), packRoot, algo, ingest.Options{
WriteRev: true,
RequireTrailingEOF: true,
})
if err != nil {
t.Fatalf("Ingest: %v", err)
}
if result.ThinFixed {
t.Fatalf("ThinFixed = true, want false")
}
if result.RevName == "" {
t.Fatal("RevName is empty")
}
_, err = packRoot.Stat(result.PackName)
if err != nil {
t.Fatalf("stat pack: %v", err)
}
_, err = packRoot.Stat(result.IdxName)
if err != nil {
t.Fatalf("stat idx: %v", err)
}
_, err = packRoot.Stat(result.RevName)
if err != nil {
t.Fatalf("stat rev: %v", err)
}
_ = receiver.Run(t, "verify-pack", "-v", filepath.Join("objects", "pack", result.IdxName))
verifyReindexOracle(t, receiver, result.PackName, result.IdxName, result.RevName)
receiver.UpdateRef(t, "refs/heads/main", head)
_ = receiver.Run(t, "fsck", "--full", "--strict", "--no-progress", "--no-dangling")
})
}
func TestIngestThinPackWithoutFixReturnsUnresolved(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
thinPack := fixtureBytes(t, algo, "thin.pack")
receiver := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true})
packRoot := receiver.OpenPackRoot(t)
_, err := beginAndContinue(bytes.NewReader(thinPack), packRoot, algo, ingest.Options{
WriteRev: true,
RequireTrailingEOF: true,
})
if err == nil {
t.Fatal("Ingest error = nil, want error")
}
if _, ok := errors.AsType[*ingest.ThinPackUnresolvedError](err); !ok {
t.Fatalf("Ingest error type = %T (%v), want *ThinPackUnresolvedError", err, err)
}
entries, err := fs.ReadDir(packRoot.FS(), ".")
if err != nil {
t.Fatalf("ReadDir(pack): %v", err)
}
for _, entry := range entries {
if strings.HasSuffix(entry.Name(), ".pack") {
t.Fatalf("found finalized pack file after failure: %v", entry.Name())
}
}
})
}
func TestIngestThinPackWithFixThin(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
head := fixtureOID(t, algo, "head")
basePack := fixtureBytes(t, algo, "base.pack")
thinPack := fixtureBytes(t, algo, "thin.pack")
receiver := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true})
packRoot := receiver.OpenPackRoot(t)
_, err := beginAndContinue(bytes.NewReader(basePack), packRoot, algo, ingest.Options{
RequireTrailingEOF: true,
})
if err != nil {
t.Fatalf("ingest base pack: %v", err)
}
receiverRepo := receiver.OpenRepository(t)
result, err := beginAndContinue(bytes.NewReader(thinPack), packRoot, algo, ingest.Options{
FixThin: true,
WriteRev: true,
Base: receiverRepo.Objects(),
RequireTrailingEOF: true,
})
if err != nil {
t.Fatalf("Ingest(thin): %v", err)
}
if !result.ThinFixed {
t.Fatal("ThinFixed = false, want true")
}
_ = receiver.Run(t, "verify-pack", "-v", filepath.Join("objects", "pack", result.IdxName))
verifyReindexOracle(t, receiver, result.PackName, result.IdxName, result.RevName)
receiver.UpdateRef(t, "refs/heads/main", head)
_ = receiver.Run(t, "fsck", "--full", "--strict", "--no-progress", "--no-dangling")
})
}
func TestIngestPackTrailerMismatch(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
packBytes := fixtureBytes(t, algo, "nonthin.pack")
if len(packBytes) == 0 {
t.Fatal("empty pack stream")
}
packBytes[len(packBytes)-1] ^= 0xff
receiver := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true})
packRoot := receiver.OpenPackRoot(t)
_, err := beginAndContinue(bytes.NewReader(packBytes), packRoot, algo, ingest.Options{
WriteRev: true,
RequireTrailingEOF: true,
})
if err == nil {
t.Fatal("Ingest error = nil, want error")
}
if _, ok := errors.AsType[*ingest.PackTrailerMismatchError](err); !ok {
t.Fatalf("Ingest error type = %T (%v), want *PackTrailerMismatchError", err, err)
}
entries, err := fs.ReadDir(packRoot.FS(), ".")
if err != nil {
t.Fatalf("ReadDir(pack): %v", err)
}
for _, entry := range entries {
if strings.HasSuffix(entry.Name(), ".pack") {
t.Fatalf("found finalized pack file after failure: %v", entry.Name())
}
}
})
}
func zeroObjectPackBytes(t *testing.T, algo objectid.Algorithm) []byte {
t.Helper()
hashImpl, err := algo.New()
if err != nil {
t.Fatalf("algo.New: %v", err)
}
var header [12]byte
copy(header[:4], []byte{'P', 'A', 'C', 'K'})
binary.BigEndian.PutUint32(header[4:8], 2)
binary.BigEndian.PutUint32(header[8:12], 0)
_, _ = hashImpl.Write(header[:])
return append(header[:], hashImpl.Sum(nil)...)
}
func TestIngestDiscardZeroObjectPack(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
packBytes := zeroObjectPackBytes(t, algo)
pending, err := ingest.Ingest(bytes.NewReader(packBytes), algo, ingest.Options{
RequireTrailingEOF: true,
})
if err != nil {
t.Fatalf("Ingest: %v", err)
}
if pending.Header().ObjectCount != 0 {
t.Fatalf("ObjectCount = %d, want 0", pending.Header().ObjectCount)
}
discarded, err := pending.Discard()
if err != nil {
t.Fatalf("Discard: %v", err)
}
if discarded.ObjectCount != 0 {
t.Fatalf("Discard.ObjectCount = %d, want 0", discarded.ObjectCount)
}
})
}
func TestIngestContinueRejectsZeroObjectPack(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
packBytes := zeroObjectPackBytes(t, algo)
receiver := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true})
packRoot := receiver.OpenPackRoot(t)
pending, err := ingest.Ingest(bytes.NewReader(packBytes), algo, ingest.Options{
RequireTrailingEOF: true,
})
if err != nil {
t.Fatalf("Ingest: %v", err)
}
_, err = pending.Continue(packRoot)
if !errors.Is(err, ingest.ErrZeroObjectContinue) {
t.Fatalf("Continue error = %v, want ErrZeroObjectContinue", err)
}
})
}
func TestIngestCanFinishWithoutTrailingEOF(t *testing.T) {
t.Parallel()
testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper
head := fixtureOID(t, algo, "head")
packBytes := fixtureBytes(t, algo, "nonthin.pack")
receiver := testgit.NewRepo(t, testgit.RepoOptions{ObjectFormat: algo, Bare: true})
packRoot := receiver.OpenPackRoot(t)
result, err := beginAndContinue(&noExtraReadReader{reader: bytes.NewReader(packBytes)}, packRoot, algo, ingest.Options{
WriteRev: true,
})
if err != nil {
t.Fatalf("Ingest without trailing EOF: %v", err)
}
receiver.UpdateRef(t, "refs/heads/main", head)
_ = receiver.Run(t, "verify-pack", "-v", filepath.Join("objects", "pack", result.IdxName))
_ = receiver.Run(t, "fsck", "--full", "--strict", "--no-progress", "--no-dangling")
})
}
|