{% if nextURL == 'setup_endpoint.node_type'%}
{{ _("Skip") }}
@@ -37,8 +35,8 @@
}
const jsonResponse = await response.json();
if ("success" in jsonResponse) {
- showNotification(jsonResponse.success);
document.getElementById('setup-tor-button').classList.add('hidden');
+ showPacman()
startProgressCheck('torbrowser', "{{ url_for(nextURL) }}");
return;
} if (jsonResponse.error == "Tor is already installed") {
@@ -46,7 +44,7 @@
}
showError(jsonResponse.error, 4000);
} catch(e) {
- showError(`{{ _("Failed to download Tor daemon...") }}`);
+ showError(`{{ _("Failed to install Tor daemon...") }}`);
showError(e);
}
}
diff --git a/src/cryptoadvance/specter/tor_daemon.py b/src/cryptoadvance/specter/tor_daemon.py
index 7304988cf..9c5556181 100644
--- a/src/cryptoadvance/specter/tor_daemon.py
+++ b/src/cryptoadvance/specter/tor_daemon.py
@@ -14,7 +14,7 @@ logger = logging.getLogger(__name__)
class TorDaemonController:
- """A class controlling the tor-daemon process directly on the machine"""
+ """A class controlling the Tor daemon process directly on the machine"""
def __init__(
self,
@@ -24,7 +24,7 @@ class TorDaemonController:
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)
+ self.is_running()
def start_tor_daemon(self, cleanup_at_exit=True):
if self.is_running():
@@ -41,7 +41,7 @@ class TorDaemonController:
stderr=subprocess.STDOUT,
)
logger.debug(
- "Running tor-daemon process with pid {}".format(self.tor_daemon_proc.pid)
+ "Running Tor daemon process with pid {}".format(self.tor_daemon_proc.pid)
)
def get_logs(self):
@@ -65,13 +65,22 @@ class TorDaemonController:
return hashed_pw
def is_running(self):
- # This fails the cypress-tests, unfortunately
- # 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
+ """Checks whether the Tor process is still running.
+ Note: poll() from the subprocess module does not work reliably. For example,
+ if the process has been terminated but its exit code has not yet been collected, it would still indicate
+ that the process is still running.
+ """
+ if self.tor_daemon_proc is None:
+ return False
+ try:
+ # Note: This pid here is usually not the same as the pid given by the OS to the Tor process
+ process = psutil.Process(self.tor_daemon_proc.pid)
+ logger.debug(f"Is the built-in Tor daemon running? {process.is_running()}")
+ return process.is_running()
+ except psutil.NoSuchProcess:
+ return False
+ # Currently not used
def is_port_open(self):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
location = ("127.0.0.1", 9050)
@@ -84,15 +93,16 @@ class TorDaemonController:
return False
def stop_tor_daemon(self):
- timeout = 50 # in secs
+ # It is possible for the Tor process to terminate unexpectedly without updating self.tor_daemon_proc
+ if not self.is_running():
+ return
if self.tor_daemon_proc:
+ # This double approach ensures that the Tor child process is terminated on all levels (within Specter and on the OS level).
+ # This seems to be unnecessary for Linux, but it is necessary for MacOS and Windows.
if platform.system() == "Windows":
subprocess.run("Taskkill /IM tor.exe /F")
+ else:
+ cmdline_args = f"{self.tor_daemon_path} --defaults-torrc {self.tor_config_path}" # Sth. like: ~/.specter/tor-binaries/tor --defaults-torrc ~/.specter/torrc
+ subprocess.run(["pkill", "-f", cmdline_args])
self.tor_daemon_proc.terminate()
- procs = psutil.Process().children()
- for p in procs:
- p.terminate()
- _, alive = psutil.wait_procs(procs, timeout=timeout)
- for p in alive:
- logger.info("tor daemon did not terminated in time, killing!")
- p.kill()
+ self.tor_daemon_proc = None
diff --git a/src/cryptoadvance/specter/util/tor_setup_tasks.py b/src/cryptoadvance/specter/util/tor_setup_tasks.py
index 7ce8895ac..5c76b2ee6 100644
--- a/src/cryptoadvance/specter/util/tor_setup_tasks.py
+++ b/src/cryptoadvance/specter/util/tor_setup_tasks.py
@@ -1,5 +1,6 @@
import os, time, requests, platform, tarfile, zipfile, sys, subprocess, shutil, stat, zipfile, logging
import pgpy
+from flask_login import current_user
from pathlib import Path
from .sha256sum import sha256sum
from .file_download import download_file
@@ -19,9 +20,9 @@ def copytree(src, dst, symlinks=False, ignore=None):
def setup_tor_thread(specter=None):
- """This will extracted the tor-binary out of the tar.xz packaged with specterd and copy
+ """This will extract the Tor binary out of the tar.xz packaged with specterd and copy
it over to the ~/.specter/tor-binaries folder
- Then it will create a torrc file and start the tor-demon
+ It will then create a torrc file and start the Tor daemon
"""
try:
specter.update_setup_status("torbrowser", "STARTING_SETUP")
@@ -59,10 +60,9 @@ def setup_tor_thread(specter=None):
file.write(
f"\nHashedControlPassword {specter.tor_daemon.get_hashed_password(specter.config['torrc_password'])}"
)
-
specter.tor_daemon.start_tor_daemon()
- specter.update_tor_controller()
specter.reset_setup("torbrowser")
+ specter.update_tor_type("builtin", current_user)
except Exception as e:
logger.exception(f"Failed to install Tor.")
specter.update_setup_error("torbrowser", str(e))