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
|
package helper
import (
"os"
"path"
"testing"
"github.com/stretchr/testify/assert"
"gitlab.com/gitlab-org/gitaly/internal/config"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc/codes"
)
func TestGetRepoPath(t *testing.T) {
defer func(oldStorages []config.Storage) {
config.Config.Storages = oldStorages
}(config.Config.Storages)
testRepo := testhelper.TestRepository()
repoPath, err := GetRepoPath(testRepo)
if err != nil {
t.Fatal(err)
}
exampleStorages := []config.Storage{
{Name: "default", Path: testhelper.GitlabTestStoragePath()},
{Name: "other", Path: "/home/git/repositories2"},
{Name: "third", Path: "/home/git/repositories3"},
}
testCases := []struct {
desc string
storages []config.Storage
repo *gitalypb.Repository
path string
err codes.Code
}{
{
desc: "storages configured",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath},
path: repoPath,
},
{
desc: "no storage config, storage name provided",
repo: &gitalypb.Repository{StorageName: "does not exist", RelativePath: testhelper.TestRelativePath},
err: codes.InvalidArgument,
},
{
desc: "no storage config, nil repo",
err: codes.InvalidArgument,
},
{
desc: "storage config provided, empty repo",
storages: exampleStorages,
repo: &gitalypb.Repository{},
err: codes.InvalidArgument,
},
{
desc: "no storage config, empty repo",
repo: &gitalypb.Repository{},
err: codes.InvalidArgument,
},
{
desc: "non existing repo",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: "made/up/path.git"},
err: codes.NotFound,
},
{
desc: "non existing storage",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "does not exists", RelativePath: testhelper.TestRelativePath},
err: codes.InvalidArgument,
},
{
desc: "storage defined but storage dir does not exist",
storages: []config.Storage{{Name: "default", Path: "/does/not/exist"}},
repo: &gitalypb.Repository{StorageName: "default", RelativePath: "foobar.git"},
err: codes.Internal,
},
{
desc: "relative path with directory traversal",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: "../bazqux.git"},
err: codes.InvalidArgument,
},
{
desc: "valid path with ..",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: "foo../bazqux.git"},
err: codes.NotFound, // Because the directory doesn't exist
},
{
desc: "relative path with sneaky directory traversal",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: "/../bazqux.git"},
err: codes.InvalidArgument,
},
{
desc: "relative path with one level traversal at the end",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath + "/.."},
err: codes.InvalidArgument,
},
{
desc: "relative path with one level dashed traversal at the end",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath + "/../"},
err: codes.InvalidArgument,
},
{
desc: "relative path with deep traversal at the end",
storages: exampleStorages,
repo: &gitalypb.Repository{StorageName: "default", RelativePath: "bazqux.git/../.."},
err: codes.InvalidArgument,
},
}
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
config.Config.Storages = tc.storages
path, err := GetRepoPath(tc.repo)
if tc.err != codes.OK {
testhelper.RequireGrpcError(t, err, tc.err)
return
}
if err != nil {
assert.NoError(t, err)
return
}
assert.Equal(t, tc.path, path)
})
}
}
func assertInvalidRepoWithoutFile(t *testing.T, repo *gitalypb.Repository, repoPath, file string) {
oldRoute := path.Join(repoPath, file)
renamedRoute := path.Join(repoPath, file+"moved")
os.Rename(oldRoute, renamedRoute)
defer func() {
os.Rename(renamedRoute, oldRoute)
}()
_, err := GetRepoPath(repo)
testhelper.RequireGrpcError(t, err, codes.NotFound)
}
func TestGetRepoPathWithCorruptedRepo(t *testing.T) {
testRepo := testhelper.TestRepository()
testRepoStoragePath := testhelper.GitlabTestStoragePath()
testRepoPath := path.Join(testRepoStoragePath, testRepo.RelativePath)
for _, file := range []string{"objects", "refs", "HEAD"} {
assertInvalidRepoWithoutFile(t, testRepo, testRepoPath, file)
}
}
func TestGetObjectDirectoryPath(t *testing.T) {
testRepo := testhelper.TestRepository()
repoPath, err := GetRepoPath(testRepo)
if err != nil {
t.Fatal(err)
}
testCases := []struct {
desc string
repo *gitalypb.Repository
path string
err codes.Code
}{
{
desc: "storages configured",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "objects/"},
path: path.Join(repoPath, "objects/"),
},
{
desc: "no GitObjectDirectoryPath",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath},
err: codes.InvalidArgument,
},
{
desc: "with directory traversal",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "../bazqux.git"},
err: codes.InvalidArgument,
},
{
desc: "valid path but doesn't exist",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "foo../bazqux.git"},
err: codes.NotFound,
},
{
desc: "with sneaky directory traversal",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "/../bazqux.git"},
err: codes.InvalidArgument,
},
{
desc: "with one level traversal at the end",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "objects/.."},
err: codes.InvalidArgument,
},
{
desc: "with one level dashed traversal at the end",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "objects/../"},
err: codes.InvalidArgument,
},
{
desc: "with deep traversal at the end",
repo: &gitalypb.Repository{StorageName: "default", RelativePath: testhelper.TestRelativePath, GitObjectDirectory: "bazqux.git/../.."},
err: codes.InvalidArgument,
},
}
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
path, err := GetObjectDirectoryPath(tc.repo)
if tc.err != codes.OK {
testhelper.RequireGrpcError(t, err, tc.err)
return
}
if err != nil {
assert.NoError(t, err)
return
}
assert.Equal(t, tc.path, path)
})
}
}
|
