moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

show full exception stack-trace if zip-bomb detection test fails

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1687197 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2015-06-24 08:33:06 +00:00
parent 7393f122b2
commit 5103ea7c0c
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
View File

@ -712,7 +712,7 @@ public final class TestPackage {
Workbook wb = WorkbookFactory.create(file);
wb.close();
// check ratio ouf of bounds
// check ratio out of bounds
ZipSecureFile.setMinInflateRatio(min_ratio+0.002);
try {
wb = WorkbookFactory.create(file);
@ -721,11 +721,15 @@ public final class TestPackage {
// depending if this executed via "ant test" or within eclipse
// maybe a difference in JDK ...
} catch (InvalidFormatException e) {
assertEquals("Zip bomb detected! Exiting.", e.getMessage());
if(!e.getMessage().equals("Zip bomb detected! Exiting.")) {
throw new IllegalStateException(e);
}
} catch (POIXMLException e) {
InvocationTargetException t = (InvocationTargetException)e.getCause();
IOException t2 = (IOException)t.getTargetException();
assertEquals("Zip bomb detected! Exiting.", t2.getMessage());
if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) {
throw new IllegalStateException(e);
}
}
// check max entry size ouf of bounds
@ -735,11 +739,15 @@ public final class TestPackage {
wb = WorkbookFactory.create(file, null, true);
wb.close();
} catch (InvalidFormatException e) {
assertEquals("Zip bomb detected! Exiting.", e.getMessage());
if(!e.getMessage().equals("Zip bomb detected! Exiting.")) {
throw new IllegalStateException(e);
}
} catch (POIXMLException e) {
InvocationTargetException t = (InvocationTargetException)e.getCause();
IOException t2 = (IOException)t.getTargetException();
assertEquals("Zip bomb detected! Exiting.", t2.getMessage());
if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) {
throw new IllegalStateException(e);
}
}
} finally {
// reset otherwise a lot of ooxml tests will fail