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
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
|
package localrepo
import (
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
"time"
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git"
"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/internal/helper/text"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/internal/testhelper/testcfg"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
)
func setupRepo(t *testing.T, bare bool) (*Repo, string) {
t.Helper()
cfg := testcfg.Build(t)
var repoProto *gitalypb.Repository
var repoPath string
var repoCleanUp func()
if bare {
repoProto, repoPath, repoCleanUp = gittest.InitBareRepoAt(t, cfg, cfg.Storages[0])
} else {
repoProto, repoPath, repoCleanUp = gittest.CloneRepoAtStorage(t, cfg, cfg.Storages[0], t.Name())
}
t.Cleanup(repoCleanUp)
gitCmdFactory := git.NewExecCommandFactory(cfg)
return New(gitCmdFactory, catfile.NewCache(cfg), repoProto, cfg), repoPath
}
type ReaderFunc func([]byte) (int, error)
func (fn ReaderFunc) Read(b []byte) (int, error) { return fn(b) }
func TestRepo_WriteBlob(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
repo, repoPath := setupRepo(t, true)
for _, tc := range []struct {
desc string
attributes string
input io.Reader
sha string
error error
content string
}{
{
desc: "error reading",
input: ReaderFunc(func([]byte) (int, error) { return 0, assert.AnError }),
error: fmt.Errorf("%w, stderr: %q", assert.AnError, []byte{}),
},
{
desc: "successful empty blob",
input: strings.NewReader(""),
content: "",
},
{
desc: "successful blob",
input: strings.NewReader("some content"),
content: "some content",
},
{
desc: "LF line endings left unmodified",
input: strings.NewReader("\n"),
content: "\n",
},
{
desc: "CRLF converted to LF due to global git config",
input: strings.NewReader("\r\n"),
content: "\n",
},
{
desc: "line endings preserved in binary files",
input: strings.NewReader("\r\n"),
attributes: "file-path binary",
content: "\r\n",
},
} {
t.Run(tc.desc, func(t *testing.T) {
require.NoError(t,
ioutil.WriteFile(filepath.Join(repoPath, "info", "attributes"), []byte(tc.attributes), os.ModePerm),
)
sha, err := repo.WriteBlob(ctx, "file-path", tc.input)
require.Equal(t, tc.error, err)
if tc.error != nil {
return
}
content, err := repo.ReadObject(ctx, sha)
require.NoError(t, err)
assert.Equal(t, tc.content, string(content))
})
}
}
func TestFormatTag(t *testing.T) {
for _, tc := range []struct {
desc string
objectID git.ObjectID
objectType string
tagName []byte
userName []byte
userEmail []byte
tagBody []byte
authorDate time.Time
err error
}{
// Just trivial tests here, most of this is tested in
// internal/gitaly/service/operations/tags_test.go
{
desc: "basic signature",
objectID: git.ZeroOID,
objectType: "commit",
tagName: []byte("my-tag"),
userName: []byte("root"),
userEmail: []byte("root@localhost"),
tagBody: []byte(""),
},
{
desc: "basic signature",
objectID: git.ZeroOID,
objectType: "commit",
tagName: []byte("my-tag\ninjection"),
userName: []byte("root"),
userEmail: []byte("root@localhost"),
tagBody: []byte(""),
err: FormatTagError{expectedLines: 4, actualLines: 5},
},
{
desc: "signature with fixed time",
objectID: git.ZeroOID,
objectType: "commit",
tagName: []byte("my-tag"),
userName: []byte("root"),
userEmail: []byte("root@localhost"),
tagBody: []byte(""),
authorDate: time.Unix(12345, 0),
},
} {
t.Run(tc.desc, func(t *testing.T) {
signature, err := FormatTag(tc.objectID, tc.objectType, tc.tagName, tc.userName, tc.userEmail, tc.tagBody, tc.authorDate)
if err != nil {
require.Equal(t, tc.err, err)
require.Equal(t, "", signature)
} else {
require.NoError(t, err)
require.Contains(t, signature, "object ")
require.Contains(t, signature, "tag ")
require.Contains(t, signature, "tagger ")
}
})
}
}
func TestRepo_WriteTag(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
repo, repoPath := setupRepo(t, false)
for _, tc := range []struct {
desc string
objectID git.ObjectID
objectType string
tagName []byte
userName []byte
userEmail []byte
tagBody []byte
authorDate time.Time
}{
// Just trivial tests here, most of this is tested in
// internal/gitaly/service/operations/tags_test.go
{
desc: "basic signature",
objectID: "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
objectType: "commit",
tagName: []byte("my-tag"),
userName: []byte("root"),
userEmail: []byte("root@localhost"),
tagBody: []byte(""),
},
{
desc: "signature with time",
objectID: "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
objectType: "commit",
tagName: []byte("tag-with-timestamp"),
userName: []byte("root"),
userEmail: []byte("root@localhost"),
tagBody: []byte(""),
authorDate: time.Unix(12345, 0),
},
} {
t.Run(tc.desc, func(t *testing.T) {
tagObjID, err := repo.WriteTag(ctx, tc.objectID, tc.objectType, tc.tagName, tc.userName, tc.userEmail, tc.tagBody, tc.authorDate)
require.NoError(t, err)
repoTagObjID := gittest.Exec(t, repo.cfg, "-C", repoPath, "rev-parse", tagObjID.String())
require.Equal(t, text.ChompBytes(repoTagObjID), tagObjID.String())
})
}
}
func TestRepo_ReadObject(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
repo, _ := setupRepo(t, false)
for _, tc := range []struct {
desc string
oid git.ObjectID
content string
error error
}{
{
desc: "invalid object",
oid: git.ZeroOID,
error: InvalidObjectError(git.ZeroOID.String()),
},
{
desc: "valid object",
// README in gitlab-test
oid: "3742e48c1108ced3bf45ac633b34b65ac3f2af04",
content: "Sample repo for testing gitlab features\n",
},
} {
t.Run(tc.desc, func(t *testing.T) {
content, err := repo.ReadObject(ctx, tc.oid)
require.Equal(t, tc.error, err)
require.Equal(t, tc.content, string(content))
})
}
}
func TestRepo_ReadCommit(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
repo, _ := setupRepo(t, false)
for _, tc := range []struct {
desc string
revision git.Revision
opts []ReadCommitOpt
expectedCommit *gitalypb.GitCommit
expectedErr error
}{
{
desc: "invalid commit",
revision: git.ZeroOID.Revision(),
expectedErr: ErrObjectNotFound,
},
{
desc: "invalid commit with trailers",
revision: git.ZeroOID.Revision(),
expectedErr: ErrObjectNotFound,
opts: []ReadCommitOpt{WithTrailers()},
},
{
desc: "valid commit",
revision: "refs/heads/master",
expectedCommit: &gitalypb.GitCommit{
Id: "1e292f8fedd741b75372e19097c76d327140c312",
TreeId: "07f8147e8e73aab6c935c296e8cdc5194dee729b",
ParentIds: []string{
"7975be0116940bf2ad4321f79d02a55c5f7779aa",
"c1c67abbaf91f624347bb3ae96eabe3a1b742478",
},
Subject: []byte("Merge branch 'cherry-pick-ce369011' into 'master'"),
Body: []byte("Merge branch 'cherry-pick-ce369011' into 'master'\n\nAdd file with a _flattable_ path\n\nSee merge request gitlab-org/gitlab-test!35"),
BodySize: 128,
Author: &gitalypb.CommitAuthor{
Name: []byte("Drew Blessing"),
Email: []byte("drew@blessing.io"),
Date: ×tamp.Timestamp{
Seconds: 1540830087,
},
Timezone: []byte("+0000"),
},
Committer: &gitalypb.CommitAuthor{
Name: []byte("Drew Blessing"),
Email: []byte("drew@blessing.io"),
Date: ×tamp.Timestamp{
Seconds: 1540830087,
},
Timezone: []byte("+0000"),
},
},
},
{
desc: "trailers do not get parsed without WithTrailers()",
revision: "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
expectedCommit: &gitalypb.GitCommit{
Id: "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
TreeId: "a6973545d42361b28bfba5ced3b75dba5848b955",
ParentIds: []string{
"570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
},
Subject: []byte("Add submodule from gitlab.com"),
Body: []byte("Add submodule from gitlab.com\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n"),
BodySize: 98,
Author: &gitalypb.CommitAuthor{
Name: []byte("Dmitriy Zaporozhets"),
Email: []byte("dmitriy.zaporozhets@gmail.com"),
Date: ×tamp.Timestamp{
Seconds: 1393491698,
},
Timezone: []byte("+0200"),
},
Committer: &gitalypb.CommitAuthor{
Name: []byte("Dmitriy Zaporozhets"),
Email: []byte("dmitriy.zaporozhets@gmail.com"),
Date: ×tamp.Timestamp{
Seconds: 1393491698,
},
Timezone: []byte("+0200"),
},
SignatureType: gitalypb.SignatureType_PGP,
},
},
{
desc: "trailers get parsed with WithTrailers()",
revision: "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
opts: []ReadCommitOpt{WithTrailers()},
expectedCommit: &gitalypb.GitCommit{
Id: "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
TreeId: "a6973545d42361b28bfba5ced3b75dba5848b955",
ParentIds: []string{
"570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
},
Subject: []byte("Add submodule from gitlab.com"),
Body: []byte("Add submodule from gitlab.com\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n"),
BodySize: 98,
Author: &gitalypb.CommitAuthor{
Name: []byte("Dmitriy Zaporozhets"),
Email: []byte("dmitriy.zaporozhets@gmail.com"),
Date: ×tamp.Timestamp{
Seconds: 1393491698,
},
Timezone: []byte("+0200"),
},
Committer: &gitalypb.CommitAuthor{
Name: []byte("Dmitriy Zaporozhets"),
Email: []byte("dmitriy.zaporozhets@gmail.com"),
Date: ×tamp.Timestamp{
Seconds: 1393491698,
},
Timezone: []byte("+0200"),
},
SignatureType: gitalypb.SignatureType_PGP,
Trailers: []*gitalypb.CommitTrailer{
&gitalypb.CommitTrailer{
Key: []byte("Signed-off-by"),
Value: []byte("Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>"),
},
},
},
},
{
desc: "not a commit",
revision: "refs/heads/master^{tree}",
expectedErr: ErrObjectNotFound,
},
} {
t.Run(tc.desc, func(t *testing.T) {
commit, err := repo.ReadCommit(ctx, tc.revision, tc.opts...)
require.Equal(t, tc.expectedErr, err)
require.Equal(t, tc.expectedCommit, commit)
})
}
}
func TestRepo_IsAncestor(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
repo, _ := setupRepo(t, false)
for _, tc := range []struct {
desc string
parent git.Revision
child git.Revision
isAncestor bool
errorMatcher func(testing.TB, error)
}{
{
desc: "parent is ancestor",
parent: "HEAD~1",
child: "HEAD",
isAncestor: true,
},
{
desc: "parent is not ancestor",
parent: "HEAD",
child: "HEAD~1",
isAncestor: false,
},
{
desc: "parent is not valid commit",
parent: git.ZeroOID.Revision(),
child: "HEAD",
errorMatcher: func(t testing.TB, err error) {
require.Equal(t, InvalidCommitError(git.ZeroOID), err)
},
},
{
desc: "child is not valid commit",
parent: "HEAD",
child: git.ZeroOID.Revision(),
errorMatcher: func(t testing.TB, err error) {
require.Equal(t, InvalidCommitError(git.ZeroOID), err)
},
},
{
desc: "child points to a tree",
parent: "HEAD",
child: "HEAD^{tree}",
errorMatcher: func(t testing.TB, actualErr error) {
treeOID, err := repo.ResolveRevision(ctx, "HEAD^{tree}")
require.NoError(t, err)
require.EqualError(t, actualErr, fmt.Sprintf(
`determine ancestry: exit status 128, stderr: "error: object %s is a tree, not a commit\nfatal: Not a valid commit name HEAD^{tree}\n"`,
treeOID,
))
},
},
} {
t.Run(tc.desc, func(t *testing.T) {
isAncestor, err := repo.IsAncestor(ctx, tc.parent, tc.child)
if tc.errorMatcher != nil {
tc.errorMatcher(t, err)
return
}
require.NoError(t, err)
require.Equal(t, tc.isAncestor, isAncestor)
})
}
}
|