improve tor resilience

src/cryptoadvance/specter/managers/config_manager.py

@@ -182,6 +182,10 @@ def generate_torrc_password(self, overwrite=False):
             self.data["torrc_password"] = secrets.token_urlsafe(16)
             self._save()
             logger.info(f"Generated torrc_password in {self.data_file}")
+        else:
+            logger.info(
+                f"torrc_password in {self.data_file} already set. Skipping generation"
+            )
 
     def update_hwi_bridge_url(self, url, user):
         """update the hwi bridge url to use"""

src/cryptoadvance/specter/server_endpoints/settings.py

@@ -230,7 +230,7 @@ def tor():
                 res = requests_session.get(
                     # "http://expyuzz4wqqyqhjn.onion",  # Tor Project onion website (seems to be down)
                     "https://protonirockerxow.onion",  # Proton mail onion website
-                    timeout=10,
+                    timeout=30,
                 )
                 tor_connectable = res.status_code == 200
                 if tor_connectable:

src/cryptoadvance/specter/tor_daemon.py

@@ -2,11 +2,14 @@
 import os
 import platform
 import signal
+import socket
 import subprocess
 from io import StringIO
 
 import psutil
 
+from .specter_error import SpecterError
+
 logger = logging.getLogger(__name__)
 
 
@@ -21,9 +24,14 @@ def __init__(
         self.tor_daemon_path = tor_daemon_path
         self.tor_config_path = tor_config_path
         self.tor_daemon_proc = None
+        self.is_running()  # throws an exception if port 9050 is open (which looks like another tor-process is running)
 
     def start_tor_daemon(self, cleanup_at_exit=True):
         if self.is_running():
+            if self.tor_daemon_proc is None:
+                raise Exception(
+                    "Tor Daemon running but not via this Controller instance."
+                )
             return
 
         self.tor_daemon_proc = subprocess.Popen(
@@ -37,6 +45,8 @@ def start_tor_daemon(self, cleanup_at_exit=True):
         )
 
     def get_logs(self):
+        if self.is_running():
+            return "Cannot return logs as tor is still running"
         logs = ""
         newline = self.tor_daemon_proc.stdout.readline().decode("ascii")
         while newline != "":
@@ -55,8 +65,22 @@ def get_hashed_password(self, password):
         return hashed_pw
 
     def is_running(self):
+        if not self.tor_daemon_proc and self.is_port_open():
+            raise SpecterError(
+                "Port 9050 is open but tor_daemon_proc is not existing. Probably another Tor-Daemon is running?!"
+            )
         return self.tor_daemon_proc and self.tor_daemon_proc.poll() is None
 
+    def is_port_open(self):
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        location = ("127.0.0.1", 9050)
+        try:
+            s.connect(location)
+            s.close()
+            return True
+        except Exception as e:
+            return False
+
     def stop_tor_daemon(self):
         timeout = 50  # in secs
         if self.tor_daemon_proc: