From f602de8771db507f4538a60302a0f2d2bca218f6 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 4 Mar 2019 17:08:53 +0100
Subject: [PATCH] Call shutdown() in connect() on exception

to clean up the state build up by connect().

Related to SMACK-855 there is the possiblitiy of a stray (writer)
thread if, for example, tlsHandled.checkifSuccessOrWaitorThrow() in
XMPPTCPConnection.connectInternal() throws. This commit should prevent
that.
---
 .../smack/bosh/XMPPBOSHConnection.java        |  5 ++++
 .../smack/AbstractXMPPConnection.java         | 25 +++++++++++++------
 .../jivesoftware/smack/DummyConnection.java   |  6 +++++
 .../smack/tcp/XMPPTCPConnection.java          |  4 +--
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
index 8fba8051a..68dd48fcb 100644
--- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
+++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
@@ -263,6 +263,11 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
             client = null;
         }
 
+        instantShutdown();
+    }
+
+    @Override
+    public void instantShutdown() {
         setWasAuthenticated();
         sessionID = null;
         done = true;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
index 7a9bf2ee1..697ebfc3b 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -405,15 +405,19 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         tlsHandled.init();
         streamId = null;
 
-        // Perform the actual connection to the XMPP service
-        connectInternal();
+        try {
+            // Perform the actual connection to the XMPP service
+            connectInternal();
 
-        // If TLS is required but the server doesn't offer it, disconnect
-        // from the server and throw an error. First check if we've already negotiated TLS
-        // and are secure, however (features get parsed a second time after TLS is established).
-        if (!isSecureConnection() && getConfiguration().getSecurityMode() == SecurityMode.required) {
-            shutdown();
-            throw new SecurityRequiredByClientException();
+            // If TLS is required but the server doesn't offer it, disconnect
+            // from the server and throw an error. First check if we've already negotiated TLS
+            // and are secure, however (features get parsed a second time after TLS is established).
+            if (!isSecureConnection() && getConfiguration().getSecurityMode() == SecurityMode.required) {
+                throw new SecurityRequiredByClientException();
+            }
+        } catch (SmackException | IOException | XMPPException | InterruptedException e) {
+            instantShutdown();
+            throw e;
         }
 
         // Make note of the fact that we're now connected.
@@ -763,6 +767,11 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
      */
     protected abstract void shutdown();
 
+    /**
+     * Performs an unclean disconnect and shutdown of the connection. Does not send a closing stream stanza.
+     */
+    public abstract void instantShutdown();
+
     @Override
     public void addConnectionListener(ConnectionListener connectionListener) {
         if (connectionListener == null) {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
index a3ff3246f..ea39e1233 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
@@ -100,6 +100,11 @@ public class DummyConnection extends AbstractXMPPConnection {
         callConnectionClosedListener();
     }
 
+    @Override
+    public void instantShutdown() {
+        shutdown();
+    }
+
     @Override
     public boolean isSecureConnection() {
         return false;
@@ -226,4 +231,5 @@ public class DummyConnection extends AbstractXMPPConnection {
             }
         }
     }
+
 }
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index 8b1bdb70f..0d340cfcd 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -478,9 +478,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         shutdown(false);
     }
 
-    /**
-     * Performs an unclean disconnect and shutdown of the connection. Does not send a closing stream stanza.
-     */
+    @Override
     public synchronized void instantShutdown() {
         shutdown(true);
     }