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

Improve output on invalid HTTP Status Code and ignore another failure to contact the TSP server

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1747863 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-06-11 08:45:41 +00:00
parent 0c74fe60a3
commit 9880040b1b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
View File

@ -150,8 +150,10 @@ public class TSPTimeStampService implements TimeStampService {
int statusCode = huc.getResponseCode(); int statusCode = huc.getResponseCode();
if (statusCode != 200) { if (statusCode != 200) {
LOG.log(POILogger.ERROR, "Error contacting TSP server ", signatureConfig.getTspUrl()); LOG.log(POILogger.ERROR, "Error contacting TSP server ", signatureConfig.getTspUrl() +
throw new IOException("Error contacting TSP server " + signatureConfig.getTspUrl()); ", had status code " + statusCode + "/" + huc.getResponseMessage());
throw new IOException("Error contacting TSP server " + signatureConfig.getTspUrl() +
", had status code " + statusCode + "/" + huc.getResponseMessage());
} }
// HTTP input validation // HTTP input validation

7
src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
View File

@ -389,10 +389,13 @@ public class TestSignatureInfo {
throw e; throw e;
} }
if((e.getCause() instanceof ConnectException) || (e.getCause() instanceof SocketTimeoutException)) { if((e.getCause() instanceof ConnectException) || (e.getCause() instanceof SocketTimeoutException)) {
assertTrue("Only allowing ConnectException with 'timed out' as message here, but had: " + e, Assume.assumeTrue("Only allowing ConnectException with 'timed out' as message here, but had: " + e,
e.getCause().getMessage().contains("timed out")); e.getCause().getMessage().contains("timed out"));
} else if (e.getCause() instanceof IOException) {
Assume.assumeTrue("Only allowing IOException with 'Error contacting TSP server' as message here, but had: " + e,
e.getCause().getMessage().contains("Error contacting TSP server"));
} else if (e.getCause() instanceof RuntimeException) { } else if (e.getCause() instanceof RuntimeException) {
assertTrue("Only allowing RuntimeException with 'This site is cur' as message here, but had: " + e, Assume.assumeTrue("Only allowing RuntimeException with 'This site is cur' as message here, but had: " + e,
e.getCause().getMessage().contains("This site is cur")); e.getCause().getMessage().contains("This site is cur"));
} else { } else {
throw e; throw e;