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
|
/*
* Copyright (C) 2011, Robin Rosenberg <robin.rosenberg@dewire.com>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v1.0 which accompanies this
* distribution, is reproduced below, and is available at
* http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.lib;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.dircache.InvalidPathException;
import org.eclipse.jgit.junit.MockSystemReader;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.util.SystemReader;
import org.junit.Test;
public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase {
protected ObjectId theHead;
protected ObjectId theMerge;
@Test
public void testMaliciousAbsolutePathIsOk() throws Exception {
testMaliciousPathGoodFirstCheckout("ok");
}
@Test
public void testMaliciousAbsolutePathIsOkSecondCheckout() throws Exception {
testMaliciousPathGoodSecondCheckout("ok");
}
@Test
public void testMaliciousAbsolutePathIsOkTwoLevels() throws Exception {
testMaliciousPathGoodSecondCheckout("a", "ok");
}
@Test
public void testMaliciousAbsolutePath() throws Exception {
testMaliciousPathBadFirstCheckout("/tmp/x");
}
@Test
public void testMaliciousAbsolutePathSecondCheckout() throws Exception {
testMaliciousPathBadSecondCheckout("/tmp/x");
}
@Test
public void testMaliciousAbsolutePathTwoLevelsFirstBad() throws Exception {
testMaliciousPathBadFirstCheckout("/tmp/x", "y");
}
@Test
public void testMaliciousAbsolutePathTwoLevelsSecondBad() throws Exception {
testMaliciousPathBadFirstCheckout("y", "/tmp/x");
}
@Test
public void testMaliciousAbsoluteCurDrivePathWindows() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("\\somepath");
}
@Test
public void testMaliciousAbsoluteCurDrivePathWindowsOnUnix()
throws Exception {
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathGoodFirstCheckout("\\somepath");
}
@Test
public void testMaliciousAbsoluteUNCPathWindows1() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("\\\\somepath");
}
@Test
public void testMaliciousAbsoluteUNCPathWindows1OnUnix() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathGoodFirstCheckout("\\\\somepath");
}
@Test
public void testMaliciousAbsoluteUNCPathWindows2() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("\\/somepath");
}
@Test
public void testMaliciousAbsoluteUNCPathWindows2OnUnix() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathBadFirstCheckout("\\/somepath");
}
@Test
public void testMaliciousAbsoluteWindowsPath1() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("c:\\temp\\x");
}
@Test
public void testMaliciousAbsoluteWindowsPath1OnUnix() throws Exception {
if (File.separatorChar == '\\')
return; // cannot emulate Unix on Windows for this test
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathGoodFirstCheckout("c:\\temp\\x");
}
@Test
public void testMaliciousAbsoluteWindowsPath2() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setCurrentPlatform();
testMaliciousPathBadFirstCheckout("c:/temp/x");
}
@Test
public void testMaliciousGitPath1() throws Exception {
testMaliciousPathBadFirstCheckout(".git/konfig");
}
@Test
public void testMaliciousGitPath2() throws Exception {
testMaliciousPathBadFirstCheckout(".git", "konfig");
}
@Test
public void testMaliciousGitPath1Case() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows(); // or OS X
testMaliciousPathBadFirstCheckout(".Git/konfig");
}
@Test
public void testMaliciousGitPath2Case() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows(); // or OS X
testMaliciousPathBadFirstCheckout(".gIt", "konfig");
}
@Test
public void testMaliciousGitPath3Case() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows(); // or OS X
testMaliciousPathBadFirstCheckout(".giT", "konfig");
}
@Test
public void testMaliciousGitPathEndSpaceWindows() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout(".git ", "konfig");
}
@Test
public void testMaliciousGitPathEndSpaceUnixOk() throws Exception {
if (File.separatorChar == '\\')
return; // cannot emulate Unix on Windows for this test
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathGoodFirstCheckout(".git ", "konfig");
}
@Test
public void testMaliciousGitPathEndDotWindows1() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout(".git.", "konfig");
}
@Test
public void testMaliciousGitPathEndDotWindows2() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout(".f.");
}
@Test
public void testMaliciousGitPathEndDotWindows3() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathGoodFirstCheckout(".f");
}
@Test
public void testMaliciousGitPathEndDotUnixOk() throws Exception {
if (File.separatorChar == '\\')
return; // cannot emulate Unix on Windows for this test
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathGoodFirstCheckout(".git.", "konfig");
}
@Test
public void testMaliciousPathDotDot() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setCurrentPlatform();
testMaliciousPathBadFirstCheckout("..", "no");
}
@Test
public void testMaliciousPathDot() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setCurrentPlatform();
testMaliciousPathBadFirstCheckout(".", "no");
}
@Test
public void testMaliciousPathEmptyUnix() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathBadFirstCheckout("", "no");
}
@Test
public void testMaliciousPathEmptyWindows() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("", "no");
}
@Test
public void testMaliciousWindowsADS() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("some:path");
}
@Test
public void testMaliciousWindowsADSOnUnix() throws Exception {
if (File.separatorChar == '\\')
return; // cannot emulate Unix on Windows for this test
((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathGoodFirstCheckout("some:path");
}
@Test
public void testForbiddenNamesOnWindowsEgCon() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("con");
}
@Test
public void testForbiddenNamesOnWindowsEgConDotSuffix() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("con.txt");
}
@Test
public void testForbiddenNamesOnWindowsEgLpt1() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("lpt1");
}
@Test
public void testForbiddenNamesOnWindowsEgLpt1DotSuffix() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("lpt1.txt");
}
@Test
public void testForbiddenNamesOnWindowsEgDotCon() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathGoodFirstCheckout(".con");
}
@Test
public void testForbiddenNamesOnWindowsEgLpr() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathGoodFirstCheckout("lpt"); // good name
}
@Test
public void testForbiddenNamesOnWindowsEgCon1() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathGoodFirstCheckout("con1"); // good name
}
@Test
public void testForbiddenWindowsNamesOnUnixEgCon() throws Exception {
if (File.separatorChar == '\\')
return; // cannot emulate Unix on Windows for this test
testMaliciousPathGoodFirstCheckout("con");
}
@Test
public void testForbiddenWindowsNamesOnUnixEgLpt1() throws Exception {
if (File.separatorChar == '\\')
return; // cannot emulate Unix on Windows for this test
testMaliciousPathGoodFirstCheckout("lpt1");
}
private void testMaliciousPathBadFirstCheckout(String... paths)
throws Exception {
testMaliciousPath(false, false, paths);
}
private void testMaliciousPathBadSecondCheckout(String... paths) throws Exception {
testMaliciousPath(false, true, paths);
}
private void testMaliciousPathGoodFirstCheckout(String... paths)
throws Exception {
testMaliciousPath(true, false, paths);
}
private void testMaliciousPathGoodSecondCheckout(String... paths) throws Exception {
testMaliciousPath(true, true, paths);
}
/**
* Create a bad tree and tries to check it out
*
* @param good
* true if we expect this to pass
* @param secondCheckout
* perform the actual test on the second checkout
* @param path
* to the blob, one or more levels
* @throws GitAPIException
* @throws IOException
*/
private void testMaliciousPath(boolean good, boolean secondCheckout,
String... path) throws GitAPIException, IOException {
Git git = new Git(db);
ObjectInserter newObjectInserter;
newObjectInserter = git.getRepository().newObjectInserter();
ObjectId blobId = newObjectInserter.insert(Constants.OBJ_BLOB,
"data".getBytes());
newObjectInserter = git.getRepository().newObjectInserter();
FileMode mode = FileMode.REGULAR_FILE;
ObjectId insertId = blobId;
for (int i = path.length - 1; i >= 0; --i) {
TreeFormatter treeFormatter = new TreeFormatter();
treeFormatter.append("goodpath", mode, insertId);
insertId = newObjectInserter.insert(treeFormatter);
mode = FileMode.TREE;
}
newObjectInserter = git.getRepository().newObjectInserter();
CommitBuilder commitBuilder = new CommitBuilder();
commitBuilder.setAuthor(author);
commitBuilder.setCommitter(committer);
commitBuilder.setMessage("foo#1");
commitBuilder.setTreeId(insertId);
ObjectId firstCommitId = newObjectInserter.insert(commitBuilder);
newObjectInserter = git.getRepository().newObjectInserter();
mode = FileMode.REGULAR_FILE;
insertId = blobId;
for (int i = path.length - 1; i >= 0; --i) {
TreeFormatter treeFormatter = new TreeFormatter();
treeFormatter.append(path[i], mode, insertId);
insertId = newObjectInserter.insert(treeFormatter);
mode = FileMode.TREE;
}
// Create another commit
commitBuilder = new CommitBuilder();
commitBuilder.setAuthor(author);
commitBuilder.setCommitter(committer);
commitBuilder.setMessage("foo#2");
commitBuilder.setTreeId(insertId);
commitBuilder.setParentId(firstCommitId);
ObjectId commitId = newObjectInserter.insert(commitBuilder);
RevWalk revWalk = new RevWalk(git.getRepository());
if (!secondCheckout)
git.checkout().setStartPoint(revWalk.parseCommit(firstCommitId))
.setName("refs/heads/master").setCreateBranch(true).call();
try {
if (secondCheckout) {
git.checkout().setStartPoint(revWalk.parseCommit(commitId))
.setName("refs/heads/master").setCreateBranch(true)
.call();
} else {
git.branchCreate().setName("refs/heads/next")
.setStartPoint(commitId.name()).call();
git.checkout().setName("refs/heads/next")
.call();
}
if (!good)
fail("Checkout of Tree " + Arrays.asList(path) + " should fail");
} catch (InvalidPathException e) {
if (good)
throw e;
assertTrue(e.getMessage().startsWith("Invalid path"));
}
}
}
|