Commit f3faad54 by chaitali borole Committed by nixonrodrigues

ATLAS-4002 : Upgrade commons-beanutils to 1.9.4 due to CVE-2019-10086

parent 7dec8f53
...@@ -718,7 +718,7 @@ ...@@ -718,7 +718,7 @@
<!-- Apache commons --> <!-- Apache commons -->
<!--Apache poi and Open csv--> <!--Apache poi and Open csv-->
<opencsv.version>4.6</opencsv.version> <opencsv.version>5.0</opencsv.version>
<poi.version>3.17</poi.version> <poi.version>3.17</poi.version>
<poi-ooxml.version>3.17</poi-ooxml.version> <poi-ooxml.version>3.17</poi-ooxml.version>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
package org.apache.atlas.util; package org.apache.atlas.util;
import com.opencsv.CSVReader; import com.opencsv.CSVReader;
import com.opencsv.exceptions.CsvValidationException;
import org.apache.atlas.AtlasErrorCode; import org.apache.atlas.AtlasErrorCode;
import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.exception.AtlasBaseException;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -70,7 +71,7 @@ public class FileUtils { ...@@ -70,7 +71,7 @@ public class FileUtils {
return ret; return ret;
} }
public static List<String[]> readCSV(InputStream inputStream) throws IOException { public static List<String[]> readCSV(InputStream inputStream) throws IOException, AtlasBaseException {
List<String[]> ret = new ArrayList<>(); List<String[]> ret = new ArrayList<>();
try (CSVReader csvReader = new CSVReader(new InputStreamReader(inputStream))) { try (CSVReader csvReader = new CSVReader(new InputStreamReader(inputStream))) {
...@@ -87,6 +88,8 @@ public class FileUtils { ...@@ -87,6 +88,8 @@ public class FileUtils {
ret.add(data); ret.add(data);
} }
} }
} catch (CsvValidationException e) {
throw new AtlasBaseException(AtlasErrorCode.NO_DATA_FOUND, e);
} }
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment