Merge pull request dropbox#135 from cakoose/cert-path

jiuyangzhao · web-flow · commit c133b8ceb453 · 2017-09-18T15:32:45.000-07:00
[IDEA] On CertPathValidationException, include cert path in exception message.
diff --git a/src/main/java/com/dropbox/core/NetworkIOException.java b/src/main/java/com/dropbox/core/NetworkIOException.java
@@ -1,6 +1,8 @@
 package com.dropbox.core;
 
+import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
+import java.security.cert.CertPathValidatorException;
 
 /**
  * This gets thrown when there's an {@link IOException} when reading or writing to the
@@ -14,7 +16,24 @@ public class NetworkIOException extends DbxException {
     private static final long serialVersionUID = 0L;
 
     public NetworkIOException(IOException cause) {
-        super(cause.getMessage(), cause);
+        super(computeMessage(cause), cause);
+    }
+
+    private static String computeMessage(IOException ex) {
+        String message = ex.getMessage();
+
+        // For CertPathValidationErrors, the CertPath is in the exception object but not
+        // in the exception message.  Pull it out into the message, because it would be
+        // useful for debugging.
+        if (ex instanceof SSLHandshakeException) {
+            Throwable innerCause = ex.getCause();
+            if (innerCause instanceof CertPathValidatorException) {
+                CertPathValidatorException cpve = (CertPathValidatorException) innerCause;
+                message += "[CERT PATH: " + cpve.getCertPath() + "]";
+            }
+        }
+
+        return message;
     }
 
     @Override
