tor: Use system tor (installed by package manager)

During Bisq's installation the OS's package manager automatically installs Tor and its required dependecies.
bisq-network · Oct 19, 2024 · 4c791be · 4c791be
1 parent 181f970
commit 4c791be
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/network/tor/tor/src/main/java/bisq/tor/TorNotInstalledException.java b/network/tor/tor/src/main/java/bisq/tor/TorNotInstalledException.java
@@ -0,0 +1,4 @@
+package bisq.tor;
+
+public class TorNotInstalledException extends RuntimeException {
+}
diff --git a/network/tor/tor/src/main/java/bisq/tor/TorService.java b/network/tor/tor/src/main/java/bisq/tor/TorService.java
@@ -18,6 +18,7 @@
 package bisq.tor;
 
 import bisq.common.application.Service;
+import bisq.common.file.FileUtils;
 import bisq.common.observable.Observable;
 import bisq.common.platform.LinuxDistribution;
 import bisq.common.platform.OS;
@@ -74,7 +75,16 @@ public CompletableFuture<Boolean> initialize() {
         }
 
         if (!LinuxDistribution.isWhonix()) {
-            installTorIfNotUpToDate();
+            try {
+                Path torDataDirPath = transportConfig.getDataDir();
+                FileUtils.makeDirs(torDataDirPath.toFile());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+
+            if (!OS.isLinux()) {
+                installTorIfNotUpToDate();
+            }
 
             PasswordDigest hashedControlPassword = PasswordDigest.generateDigest();
             createTorrcConfigFile(torDataDirPath, hashedControlPassword);
@@ -177,11 +187,8 @@ public Socks5Proxy getSocks5Proxy(String streamId) throws IOException {
     private Path getTorBinaryPath() {
         if (OS.isLinux()) {
             Optional<Path> systemTorBinaryPath = NativeTorProcess.getSystemTorPath();
-            if (systemTorBinaryPath.isPresent()) {
-                return systemTorBinaryPath.get();
-            }
+            return systemTorBinaryPath.orElseThrow(TorNotInstalledException::new);
         }
-
         return torDataDirPath.resolve("tor");
     }
 

diff --git a/network/tor/tor/src/main/java/bisq/tor/installer/TorInstaller.java b/network/tor/tor/src/main/java/bisq/tor/installer/TorInstaller.java
@@ -58,9 +58,6 @@ private boolean isTorUpToDate() throws IOException {
 
     private void install() throws IOException {
         try {
-            File torDir = torInstallationFiles.getTorDir();
-            FileUtils.makeDirs(torDir);
-
             File destDir = torInstallationFiles.getTorDir();
             new TorBinaryZipExtractor(destDir).extractBinary();
             log.info("Tor files installed to {}", destDir.getAbsolutePath());