Map all SSL failures to network error and await server response on control connection. Fix #17946.

Author: dkocher

core/src/main/java/ch/cyberduck/core/exception/SSLNegotiateException.java

@@ -15,11 +15,7 @@
  * GNU General Public License for more details.
  */
 
-public class SSLNegotiateException extends InteroperabilityException {
-    public SSLNegotiateException(final String detail) {
-        super(detail);
-    }
-
+public class SSLNegotiateException extends ConnectionRefusedException {
     public SSLNegotiateException(final String detail, final Throwable cause) {
         super(detail, cause);
     }

core/src/main/java/ch/cyberduck/core/ssl/SSLExceptionMappingService.java

@@ -22,7 +22,7 @@
 import ch.cyberduck.core.DefaultSocketExceptionMappingService;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.ConnectionCanceledException;
-import ch.cyberduck.core.exception.InteroperabilityException;
+import ch.cyberduck.core.exception.ConnectionRefusedException;
 import ch.cyberduck.core.exception.SSLNegotiateException;
 
 import org.apache.commons.lang3.StringUtils;
@@ -98,10 +98,10 @@ public BackgroundException map(final SSLException failure) {
         }
         if(ExceptionUtils.getRootCause(failure) instanceof GeneralSecurityException) {
             this.append(buffer, ExceptionUtils.getRootCause(failure).getMessage());
-            return new InteroperabilityException(buffer.toString(), failure);
+            return new ConnectionRefusedException(buffer.toString(), failure);
         }
         this.append(buffer, message);
-        return new InteroperabilityException(buffer.toString(), failure);
+        return new ConnectionRefusedException(buffer.toString(), failure);
     }
 
     private enum Alert {

core/src/main/java/ch/cyberduck/core/threading/DefaultFailureDiagnostics.java

@@ -29,7 +29,6 @@
 import ch.cyberduck.core.exception.LoginFailureException;
 import ch.cyberduck.core.exception.QuotaException;
 import ch.cyberduck.core.exception.ResolveFailedException;
-import ch.cyberduck.core.exception.SSLNegotiateException;
 import ch.cyberduck.core.exception.TransferCanceledException;
 import ch.cyberduck.core.exception.UnsupportedException;
 import ch.cyberduck.core.io.IOResumeException;
@@ -78,9 +77,6 @@ public Type determine(final BackgroundException failure) {
             if(cause instanceof ConnectionRefusedException) {
                 return Type.network;
             }
-            if(cause instanceof SSLNegotiateException) {
-                return Type.application;
-            }
             if(cause instanceof SSLHandshakeException) {
                 return Type.application;
             }

core/src/test/java/ch/cyberduck/core/ssl/SSLExceptionMappingServiceTest.java

@@ -19,23 +19,34 @@
  */
 
 import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.exception.ConnectionRefusedException;
+import ch.cyberduck.core.exception.SSLNegotiateException;
 
 import org.junit.Test;
 
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
 import java.net.SocketException;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 public class SSLExceptionMappingServiceTest {
 
     @Test
-    public void testMap() {
+    public void testMapSocketException() {
         final BackgroundException f = new SSLExceptionMappingService().map(new SSLException(
                 "Connection has been shutdown: javax.net.ssl.SSLException: java.net.SocketException: Broken pipe",
                 new SSLException("javax.net.ssl.SSLException: java.net.SocketException: Broken pipe",
                         new SocketException("Broken pipe"))));
+        assertSame(ConnectionRefusedException.class, f.getClass());
         assertEquals("Connection failed", f.getMessage());
         assertEquals("Broken pipe. The connection attempt was rejected. The server may be down, or your network may not be properly configured.", f.getDetail());
     }
+
+    @Test
+    public void testMapSSLFailure() {
+        final BackgroundException f = new SSLExceptionMappingService().map(new SSLHandshakeException("r"));
+        assertSame(SSLNegotiateException.class, f.getClass());
+    }
 }

ftp/src/main/java/ch/cyberduck/core/ftp/DataConnectionActionExecutor.java

@@ -19,6 +19,7 @@
 
 import ch.cyberduck.core.exception.AccessDeniedException;
 import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.exception.ConnectionRefusedException;
 import ch.cyberduck.core.exception.ConnectionTimeoutException;
 import ch.cyberduck.core.exception.InteroperabilityException;
 import ch.cyberduck.core.exception.NotfoundException;
@@ -55,9 +56,9 @@ public <T> T open(final DataConnectionAction<T> action) throws IOException, Back
             }
             return action.execute();
         }
-        catch(ConnectionTimeoutException failure) {
-            log.warn("Timeout opening data socket {}", failure.getMessage());
-            // Expect 421 response
+        catch(ConnectionRefusedException | ConnectionTimeoutException failure) {
+            log.warn("I/O error opening data socket {}", failure.getMessage());
+            // Drain any pending reply on the control channel to resynchronize after failed data connection
             session.getClient().completePendingCommand();
             throw failure;
         }

ftp/src/test/java/ch/cyberduck/core/ftp/DataConnectionActionExecutorTest.java

@@ -18,6 +18,7 @@
  */
 
 import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.exception.InteroperabilityException;
 import ch.cyberduck.test.IntegrationTest;
 
 import org.junit.Test;
@@ -29,14 +30,14 @@
 public class DataConnectionActionExecutorTest extends AbstractFTPTest {
 
     @Test
-    public void testFallbackOpenConnection500Error() throws Exception {
+    public void testServerError() throws Exception {
         final DataConnectionAction<Void> action = new DataConnectionAction<Void>() {
             @Override
             public Void execute() throws BackgroundException {
                 throw new FTPExceptionMappingService().map(new FTPException(500, "m"));
             }
         };
         final DataConnectionActionExecutor f = new DataConnectionActionExecutor(session);
-        assertThrows(Exception.class, () -> f.open(action));
+        assertThrows(InteroperabilityException.class, () -> f.open(action));
     }
 }

s3/src/test/java/ch/cyberduck/core/s3/S3ExceptionMappingServiceTest.java

@@ -126,7 +126,7 @@ public void testWrapped() {
 
     @Test
     public void testAlgorithmFailure() {
-        assertEquals("EC AlgorithmParameters not available. Please contact your web hosting service provider for assistance.",
+        assertEquals("EC AlgorithmParameters not available. The connection attempt was rejected. The server may be down, or your network may not be properly configured.",
             new S3ExceptionMappingService().map(new S3ServiceException(
                 new SSLException(
                     new RuntimeException(