Restore commons.fileupload (#369)

intuit · Jan 24, 2025 · 8322158 · 8322158
1 parent bdd5a43
commit 8322158
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 33 deletions.
diff --git a/agent/agent_common/pom.xml b/agent/agent_common/pom.xml
@@ -15,18 +15,19 @@
 
 
   <dependencies>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>api</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jdom</groupId>
       <artifactId>jdom2</artifactId>
     </dependency>
-
     <dependency>
       <groupId>jakarta.xml.ws</groupId>
       <artifactId>jakarta.xml.ws-api</artifactId>

diff --git a/agent/agent_common/src/main/java/com/intuit/tank/http/TankHttpUtil.java b/agent/agent_common/src/main/java/com/intuit/tank/http/TankHttpUtil.java
@@ -12,14 +12,14 @@
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.fileupload.MultipartStream;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.intuit.tank.http.binary.BinaryResponse;
 import com.intuit.tank.http.json.JsonResponse;
 import com.intuit.tank.http.xml.XMLResponse;
-import org.apache.tomcat.util.http.fileupload.MultipartStream;
 
 import static java.util.stream.Collectors.joining;
 

diff --git a/api/src/main/java/com/intuit/tank/storage/S3FileStorage.java b/api/src/main/java/com/intuit/tank/storage/S3FileStorage.java
@@ -7,6 +7,7 @@
 import java.util.zip.GZIPInputStream;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.LogManager;
@@ -15,7 +16,6 @@
 import com.intuit.tank.vm.settings.CloudCredentials;
 import com.intuit.tank.vm.settings.CloudProvider;
 import com.intuit.tank.vm.settings.TankConfig;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;

diff --git a/pom.xml b/pom.xml
@@ -306,28 +306,6 @@
       <artifactId>weld-servlet-core</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-catalina</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-coyote</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jasper</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
 
@@ -543,6 +521,11 @@
         <artifactId>json-rpc</artifactId>
         <version>1.0</version>
       </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.5</version>
+      </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>

diff --git a/rest-mvc/impl/pom.xml b/rest-mvc/impl/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>tank-script-processor</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-coyote</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/rest-mvc/impl/src/main/java/com/intuit/tank/rest/mvc/rest/util/ScriptServiceUtil.java b/rest-mvc/impl/src/main/java/com/intuit/tank/rest/mvc/rest/util/ScriptServiceUtil.java
@@ -14,9 +14,9 @@
 import com.intuit.tank.script.models.*;
 import com.intuit.tank.script.RequestDataPhase;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -329,7 +329,7 @@ public static ScriptTO parseXMLtoScriptTO(InputStream inputStream) {
             JAXBContext ctx = JAXBContext.newInstance(ScriptTO.class.getPackage().getName());
             return (ScriptTO) ctx.createUnmarshaller().unmarshal(xmlSource);
         } catch (ParserConfigurationException | JAXBException | SAXException e) {
-            LOG.error("Error unmarshalling script: " + e.getMessage() , e);
+            LOG.error("Error unmarshalling script: {}", e.getMessage(), e);
             throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
         } finally {
             IOUtils.closeQuietly(inputStream);

diff --git a/script_processor/src/main/java/com/intuit/tank/script/util/ScriptServiceUtil.java b/script_processor/src/main/java/com/intuit/tank/script/util/ScriptServiceUtil.java
@@ -26,9 +26,9 @@
 import com.intuit.tank.project.Script;
 import com.intuit.tank.project.ScriptStep;
 import com.intuit.tank.script.RequestDataPhase;
+import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -43,7 +43,6 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.sax.SAXSource;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -366,7 +365,7 @@ public static ScriptTO parseXMLtoScriptTO(InputStream inputStream) {
             JAXBContext ctx = JAXBContext.newInstance(ScriptTO.class.getPackage().getName());
             return (ScriptTO) ctx.createUnmarshaller().unmarshal(xmlSource);
         } catch (ParserConfigurationException | JAXBException | SAXException e) {
-            LOG.error("Error unmarshalling script: " + e.getMessage() , e);
+            LOG.error("Error unmarshalling script: {}", e.getMessage(), e);
             throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
         } finally {
             IOUtils.closeQuietly(inputStream);

diff --git a/web/web_support/pom.xml b/web/web_support/pom.xml
@@ -187,7 +187,26 @@
       <scope>runtime</scope>
     </dependency>
 
-
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-catalina</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
   </dependencies>
 </project>