From c588783f57855719b6341ab305451daf6db8c917 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Thu, 28 Nov 2019 20:32:28 -0800
Subject: [PATCH] Make cleaning up the onion more reliably kill the tor
 subprocess, and make iit so testing tor settings in the settings dialog
 always uses a tmp tor data dir

---
 onionshare/onion.py               | 46 +++++++++++++++----------------
 onionshare_gui/settings_dialog.py |  2 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/onionshare/onion.py b/onionshare/onion.py
index b04ab6b4..4c4112db 100644
--- a/onionshare/onion.py
+++ b/onionshare/onion.py
@@ -673,7 +673,7 @@ class Onion(object):
                 "Onion", "stop_onion_service", f"failed to remove {onion_host}"
             )
 
-    def cleanup(self, stop_tor=True):
+    def cleanup(self):
         """
         Stop onion services that were created earlier. If there's a tor subprocess running, kill it.
         """
@@ -697,32 +697,30 @@ class Onion(object):
         except:
             pass
 
-        if stop_tor:
-            # Stop tor process
-            if self.tor_proc:
-                self.tor_proc.terminate()
-                time.sleep(0.2)
-                if not self.tor_proc.poll():
-                    try:
-                        self.tor_proc.kill()
-                    except:
-                        pass
-                self.tor_proc = None
+        # Stop tor process
+        if self.tor_proc:
+            self.tor_proc.terminate()
+            time.sleep(0.2)
+            if self.tor_proc.poll() == None:
+                self.common.log("Onion", "cleanup", "Tried to terminate tor process but it's still running")
+                try:
+                    self.tor_proc.kill()
+                    time.sleep(0.2)
+                    if self.tor_proc.poll() == None:
+                        self.common.log("Onion", "cleanup", "Tried to kill tor process but it's still running")
+                except:
+                    self.common.log("Onion", "cleanup", "Exception while killing tor process")
+            self.tor_proc = None
 
-            # Reset other Onion settings
-            self.connected_to_tor = False
-            self.stealth = False
+        # Reset other Onion settings
+        self.connected_to_tor = False
 
-            try:
-                # Delete the temporary tor data directory
+        try:
+            # Delete the temporary tor data directory
+            if self.use_tmp_dir:
                 self.tor_data_directory.cleanup()
-            except AttributeError:
-                # Skip if cleanup was somehow run before connect
-                pass
-            except PermissionError:
-                # Skip if the directory is still open (#550)
-                # TODO: find a better solution
-                pass
+        except:
+            pass
 
     def get_tor_socks_port(self):
         """
diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py
index 110cfac7..45eef270 100644
--- a/onionshare_gui/settings_dialog.py
+++ b/onionshare_gui/settings_dialog.py
@@ -660,7 +660,7 @@ class SettingsDialog(QtWidgets.QDialog):
             else:
                 tor_status_update_func = None
 
-            onion = Onion(self.common)
+            onion = Onion(self.common, use_tmp_dir=True)
             onion.connect(
                 custom_settings=settings,
                 tor_status_update_func=tor_status_update_func,