Fixed vulnerabile apache commons compress dependency + fixed a unit test

eskimo-sh · Jul 24, 2019 · 6f0ab7f · 6f0ab7f
1 parent 1619f26
commit 6f0ab7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/eskimo-ce.iml b/eskimo-ce.iml
@@ -81,7 +81,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13-beta-3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.sourceforge.htmlunit:htmlunit:2.35.0" level="project" />

diff --git a/pom.xml b/pom.xml
@@ -136,7 +136,7 @@ Software.
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.10</version>
+            <version>1.18</version>
         </dependency>
 
 		<!-- test dependencies -->

diff --git a/src/test/java/ch/niceideas/eskimo/services/SystemServiceTest.java b/src/test/java/ch/niceideas/eskimo/services/SystemServiceTest.java
@@ -74,10 +74,10 @@ public void testInstallService() throws Exception {
         assertTrue(testSSHCommandScript.toString().startsWith("rm -Rf /tmp/zookeeper\n" +
                 "rm -f /tmp/zookeeper.tgz\n"));
 
-        assertTrue(testSSHCommandScript.toString().endsWith(
+        assertTrue(testSSHCommandScript.toString().contains(
                 "tar xfz /tmp/zookeeper.tgz --directory=/tmp/\n" +
-                "chmod 755 /tmp/zookeeper/setup.sh\n" +
-                "mv docker_template_zookeeper.tar.gz /tmp/zookeeper/ \n" +
+                "chmod 755 /tmp/zookeeper/setup.sh\n"));
+        assertTrue(testSSHCommandScript.toString().contains(
                 "bash /tmp/zookeeper/setup.sh localhost \n" +
                 "rm -Rf /tmp/zookeeper\n" +
                 "rm -f /tmp/zookeeper.tgz\n"));