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

Fix test to find the exception-text in all cases

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

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

@ -721,15 +721,9 @@ public final class TestPackage {
// depending if this executed via "ant test" or within eclipse // depending if this executed via "ant test" or within eclipse
// maybe a difference in JDK ... // maybe a difference in JDK ...
} catch (InvalidFormatException e) { } catch (InvalidFormatException e) {
if(!e.getMessage().equals("Zip bomb detected! Exiting.")) { checkForZipBombException(e);
throw new IllegalStateException(e);
}
} catch (POIXMLException e) { } catch (POIXMLException e) {
InvocationTargetException t = (InvocationTargetException)e.getCause(); checkForZipBombException(e);
IOException t2 = (IOException)t.getTargetException();
if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) {
throw new IllegalStateException(e);
}
} }
// check max entry size ouf of bounds // check max entry size ouf of bounds
@ -739,15 +733,9 @@ public final class TestPackage {
wb = WorkbookFactory.create(file, null, true); wb = WorkbookFactory.create(file, null, true);
wb.close(); wb.close();
} catch (InvalidFormatException e) { } catch (InvalidFormatException e) {
if(!e.getMessage().equals("Zip bomb detected! Exiting.")) { checkForZipBombException(e);
throw new IllegalStateException(e);
}
} catch (POIXMLException e) { } catch (POIXMLException e) {
InvocationTargetException t = (InvocationTargetException)e.getCause(); checkForZipBombException(e);
IOException t2 = (IOException)t.getTargetException();
if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) {
throw new IllegalStateException(e);
}
} }
} finally { } finally {
// reset otherwise a lot of ooxml tests will fail // reset otherwise a lot of ooxml tests will fail
@ -755,4 +743,26 @@ public final class TestPackage {
ZipSecureFile.setMaxEntrySize(0xFFFFFFFFl); 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);
}
} }