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
|
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.common.zip;
import static org.hamcrest.Matchers.aMapWithSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isIn;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.openecomp.sdc.common.zip.exception.ZipException;
import org.openecomp.sdc.common.zip.exception.ZipSlipException;
public class ZipUtilsTest {
@Test
public void testZipSlipInRead() {
final byte[] windowsZipBytes;
final byte[] linuxZipBytes;
try {
final InputStream linuxZipAsStream = ZipUtilsTest.class.getClassLoader().getResourceAsStream("zip-slip/zip-slip-linux.zip");
final InputStream windowsZipAsStream = ZipUtilsTest.class.getClassLoader().getResourceAsStream("zip-slip/zip-slip-windows.zip");
if(linuxZipAsStream == null || windowsZipAsStream == null) {
fail("Could not load the zip slip files");
}
linuxZipBytes = IOUtils.toByteArray(linuxZipAsStream);
windowsZipBytes = IOUtils.toByteArray(windowsZipAsStream);
} catch (final IOException e) {
e.printStackTrace();
fail("Could not load the required zip slip files");
return;
}
try {
ZipUtils.readZip(linuxZipBytes, true);
fail("Zip slip should be detected");
} catch (final ZipException ex) {
assertThat("Expected ZipSlipException", ex, is(instanceOf(ZipSlipException.class)));
}
try {
ZipUtils.readZip(windowsZipBytes, true);
fail("Zip slip should be detected");
} catch (final ZipException ex) {
assertThat("Expected ZipSlipException", ex, is(instanceOf(ZipSlipException.class)));
}
}
@Test
public void testZipSlipInUnzip() throws IOException {
final Path tempDirectoryWindows = Files.createTempDirectory("zipSlipWindows" + System.currentTimeMillis());
final Path tempDirectoryLinux = Files.createTempDirectory("zipSlipLinux" + System.currentTimeMillis());
try {
final Path linuxZipPath;
final Path windowsZipPath;
try {
linuxZipPath = Paths
.get(ZipUtilsTest.class.getClassLoader().getResource("zip-slip/zip-slip-linux.zip").toURI());
windowsZipPath = Paths
.get(ZipUtilsTest.class.getClassLoader().getResource("zip-slip/zip-slip-windows.zip").toURI());
} catch (final URISyntaxException e) {
fail("Could not load the required zip slip files");
return;
}
try {
ZipUtils.unzip(windowsZipPath, tempDirectoryWindows);
ZipUtils.unzip(linuxZipPath, tempDirectoryLinux);
fail("Zip slip should be detected");
} catch (final ZipException ex) {
assertThat("At least one of the zip files should throw ZipSlipException",
ex, is(instanceOf(ZipSlipException.class)));
}
} finally {
org.apache.commons.io.FileUtils.deleteDirectory(tempDirectoryLinux.toFile());
org.apache.commons.io.FileUtils.deleteDirectory(tempDirectoryWindows.toFile());
}
}
@Test
public void testUnzipAndZip() throws IOException, ZipException {
final Path unzipTempPath = Files.createTempDirectory("testUnzip");
final Path zipTempPath = Files.createTempDirectory("testZip");
final Path testZipPath;
try {
try {
testZipPath = Paths
.get(ZipUtilsTest.class.getClassLoader().getResource("zip/extract-test.zip").toURI());
ZipUtils.unzip(testZipPath, unzipTempPath);
} catch (final URISyntaxException e) {
fail("Could not load the required zip file");
return;
}
final Set<Path> expectedPaths = new HashSet<>();
expectedPaths.add(Paths.get(unzipTempPath.toString(),"rootFile1.txt"));
expectedPaths.add(Paths.get(unzipTempPath.toString(),"rootFileNoExtension"));
expectedPaths.add(Paths.get(unzipTempPath.toString(),"EmptyFolder"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "SingleLvlFolder"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "SingleLvlFolder", "singleLvlFolderFile.txt"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "SingleLvlFolder", "singleLvlFolderFileNoExtension"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder", "twoLvlFolderFile.txt"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder", "twoLvlFolderFileNoExtension"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder", "SingleLvlFolder"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder", "SingleLvlFolder", "singleLvlFolderFile.txt"));
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder", "SingleLvlFolder", "singleLvlFolderFileNoExtension"));
final AtomicLong actualPathCount = new AtomicLong(0);
try (Stream<Path> stream = Files.walk(unzipTempPath)) {
stream.filter(path -> !unzipTempPath.equals(path)).forEach(actualPath -> {
actualPathCount.getAndIncrement();
assertThat("Unzipped file should be in the expected list", actualPath, isIn(expectedPaths));
});
}
assertThat("The number of unzipped files should be as expected", actualPathCount.get(), is((long) expectedPaths.size()));
final Path zipFilePath = zipTempPath.resolve("testzip.zip");
ZipUtils.createZipFromPath(unzipTempPath, zipFilePath);
final Map<String, byte[]> fileMap = ZipUtils.readZip(zipFilePath.toFile(), true);
//matching the folder pattern of the readZip
final Set<String> expectedPathStringSet = expectedPaths.stream()
.map(path -> {
final Path relativePath = unzipTempPath.relativize(path);
return path.toFile().isDirectory() ? relativePath.toString() + File.separator : relativePath.toString();
}).collect(Collectors.toSet());
assertThat("The number of zipped files should be as expected", fileMap, aMapWithSize(expectedPathStringSet.size()));
fileMap.keySet().forEach(s -> {
assertThat("File in zip package should be in the expected list", s, isIn(expectedPathStringSet));
});
} finally {
FileUtils.deleteDirectory(unzipTempPath.toFile());
FileUtils.deleteDirectory(zipTempPath.toFile());
}
}
}
|
