You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2015/06/24 10:53:25 UTC
svn commit: r1687212 -
/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
Author: centic
Date: Wed Jun 24 08:53:25 2015
New Revision: 1687212
URL: http://svn.apache.org/r1687212
Log:
Fix test to find the exception-text in all cases
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java?rev=1687212&r1=1687211&r2=1687212&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java Wed Jun 24 08:53:25 2015
@@ -721,15 +721,9 @@ public final class TestPackage {
// depending if this executed via "ant test" or within eclipse
// maybe a difference in JDK ...
} catch (InvalidFormatException e) {
- if(!e.getMessage().equals("Zip bomb detected! Exiting.")) {
- throw new IllegalStateException(e);
- }
+ checkForZipBombException(e);
} catch (POIXMLException e) {
- InvocationTargetException t = (InvocationTargetException)e.getCause();
- IOException t2 = (IOException)t.getTargetException();
- if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) {
- throw new IllegalStateException(e);
- }
+ checkForZipBombException(e);
}
// check max entry size ouf of bounds
@@ -739,15 +733,9 @@ public final class TestPackage {
wb = WorkbookFactory.create(file, null, true);
wb.close();
} catch (InvalidFormatException e) {
- if(!e.getMessage().equals("Zip bomb detected! Exiting.")) {
- throw new IllegalStateException(e);
- }
+ checkForZipBombException(e);
} catch (POIXMLException e) {
- InvocationTargetException t = (InvocationTargetException)e.getCause();
- IOException t2 = (IOException)t.getTargetException();
- if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) {
- throw new IllegalStateException(e);
- }
+ checkForZipBombException(e);
}
} finally {
// reset otherwise a lot of ooxml tests will fail
@@ -755,4 +743,26 @@ public final class TestPackage {
ZipSecureFile.setMaxEntrySize(0xFFFFFFFFl);
}
}
+
+ private void checkForZipBombException(Throwable e) {
+ if(e instanceof InvocationTargetException) {
+ InvocationTargetException t = (InvocationTargetException)e;
+ IOException t2 = (IOException)t.getTargetException();
+ if("Zip bomb detected! Exiting.".equals(t2.getMessage())) {
+ return;
+ }
+ }
+
+ if ("Zip bomb detected! Exiting.".equals(e.getMessage())) {
+ return;
+ }
+
+ // recursively check the causes for the message as it can be nested further down in the exception-tree
+ if(e.getCause() != null && e.getCause() != e) {
+ checkForZipBombException(e.getCause());
+ return;
+ }
+
+ throw new IllegalStateException("Expected to catch an Exception because of a detected Zip Bomb, but did not find the related error message in the exception", e);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org