aboutsummaryrefslogtreecommitdiffstats
path: root/common-app-api/src
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2020-07-21 12:10:39 +0100
committerVasyl Razinkov <vasyl.razinkov@est.tech>2020-07-22 09:55:12 +0000
commit3341e0651287f444576cd5fe5ee8c36af7257c30 (patch)
tree365c5ed2af1ad9297d9176f6e5cc0d77443b8407 /common-app-api/src
parentc29233021060e9b58dab7b44f9a5c868dd7200d4 (diff)
Fix CRITICAL BUG
https://sonarcloud.io/project/issues?fileUuids=AXF_8JZ3aPDFCRVJURGa&id=onap_sdc&resolved=false&types=BUG Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3204 Change-Id: I55f1c6c95c4de59d9ca5493d99c7fd3569379622
Diffstat (limited to 'common-app-api/src')
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/zip/ZipUtilsTest.java77
1 files changed, 49 insertions, 28 deletions
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/zip/ZipUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/zip/ZipUtilsTest.java
index bfd1046000..6d88ff277d 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/zip/ZipUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/zip/ZipUtilsTest.java
@@ -19,12 +19,12 @@
package org.openecomp.sdc.common.zip;
+import static org.hamcrest.MatcherAssert.assertThat;
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 static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
@@ -41,27 +41,32 @@ 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.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import org.openecomp.sdc.common.zip.exception.ZipException;
import org.openecomp.sdc.common.zip.exception.ZipSlipException;
-public class ZipUtilsTest {
+class ZipUtilsTest {
+
+ private static final String ZIP_SLIP_LINUX_ZIP = "zip-slip/zip-slip-linux.zip";
+ private static final String ZIP_SLIP_WINDOWS_ZIP = "zip-slip/zip-slip-windows.zip";
+ private static final ClassLoader CLASS_LOADER = ZipUtilsTest.class.getClassLoader();
@Test
- public void testZipSlipInRead() {
+ 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) {
+ final InputStream linuxZipAsStream = CLASS_LOADER.getResourceAsStream(ZIP_SLIP_LINUX_ZIP);
+ final InputStream windowsZipAsStream = CLASS_LOADER.getResourceAsStream(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");
+ fail("Could not load the required zip slip files", e);
return;
}
@@ -81,48 +86,66 @@ public class ZipUtilsTest {
}
@Test
- public void testZipSlipInUnzip() throws IOException {
- final Path tempDirectoryWindows = Files.createTempDirectory("zipSlipWindows" + System.currentTimeMillis());
+ @EnabledOnOs(OS.LINUX)
+ void testZipSlipInUnzipLinux() throws IOException {
final Path tempDirectoryLinux = Files.createTempDirectory("zipSlipLinux" + System.currentTimeMillis());
try {
final Path linuxZipPath;
+ try {
+ linuxZipPath = Paths.get(CLASS_LOADER.getResource(ZIP_SLIP_LINUX_ZIP).toURI());
+ } catch (final URISyntaxException e) {
+ fail("Could not load the required zip slip files", e);
+ return;
+ }
+
+ try {
+ 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 {
+ FileUtils.deleteDirectory(tempDirectoryLinux.toFile());
+ }
+ }
+
+ @Test
+ @EnabledOnOs(OS.WINDOWS)
+ void testZipSlipInUnzipWindows() throws IOException {
+ final Path tempDirectoryWindows = Files.createTempDirectory("zipSlipWindows" + System.currentTimeMillis());
+ try {
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());
+ windowsZipPath = Paths.get(CLASS_LOADER.getResource(ZIP_SLIP_WINDOWS_ZIP).toURI());
} catch (final URISyntaxException e) {
- fail("Could not load the required zip slip files");
+ fail("Could not load the required zip slip files", e);
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());
+ FileUtils.deleteDirectory(tempDirectoryWindows.toFile());
}
}
@Test
- public void testUnzipAndZip() throws IOException, ZipException {
+ void testUnzipAndZip() throws IOException, ZipException {
final Path unzipTempPath = Files.createTempDirectory("testUnzip").toRealPath();
final Path zipTempPath = Files.createTempDirectory("testZip").toRealPath();
final Path testZipPath;
try {
try {
- testZipPath = Paths
- .get(ZipUtilsTest.class.getClassLoader().getResource("zip/extract-test.zip").toURI());
+ testZipPath = Paths.get(CLASS_LOADER.getResource("zip/extract-test.zip").toURI());
ZipUtils.unzip(testZipPath, unzipTempPath);
} catch (final URISyntaxException e) {
- fail("Could not load the required zip file");
+ fail("Could not load the required zip file", e);
return;
}
@@ -141,7 +164,7 @@ public class ZipUtilsTest {
expectedPaths.add(Paths.get(unzipTempPath.toString(), "TwoLvlFolder", "SingleLvlFolder", "singleLvlFolderFileNoExtension"));
final AtomicLong actualPathCount = new AtomicLong(0);
- try (Stream<Path> stream = Files.walk(unzipTempPath)) {
+ try (final 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));
@@ -167,6 +190,4 @@ public class ZipUtilsTest {
}
}
-
-
-} \ No newline at end of file
+}