TorInstallationFiles: Remove dotTorDir and cookieFile

bisq-network · Aug 20, 2023 · fa9a773 · fa9a773
1 parent 0503cec
commit fa9a773
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 36 deletions.
diff --git a/network/tor/tor/src/main/java/bisq/tor/Constants.java b/network/tor/tor/src/main/java/bisq/tor/Constants.java
@@ -25,7 +25,6 @@ public class Constants {
     public final static String LOCALHOST = "127.0.0.1";
 
     // Directories
-    public final static String DOT_TOR_DIR = ".tor";
     public final static String HS_DIR = "hiddenservice";
     public final static String NATIVE_DIR = "native";
     public final static String WIN_DIR = "windows";
@@ -41,7 +40,6 @@ public class Constants {
     public final static String GEO_IPV_6 = "geoip6";
     public final static String TORRC = "torrc";
     public final static String PID = "pid";
-    public final static String COOKIE = "control_auth_cookie";
     public final static String HOSTNAME = "hostname";
     public final static String PRIV_KEY = "private_key";
     public final static String TOR_ARCHIVE = "tor.tar.xz";
@@ -53,7 +51,6 @@ public class Constants {
     public final static String TORRC_KEY_GEOIP = "GeoIPFile";
     public final static String TORRC_KEY_PID = "PidFile";
     public final static String TORRC_KEY_DATA_DIRECTORY = "DataDirectory";
-    public final static String TORRC_KEY_COOKIE = "CookieAuthFile";
 
     // Tor control connection
     public final static String CONTROL_PORT_LOG_SUB_STRING = "Control listener listening on port ";

diff --git a/network/tor/tor/src/main/java/bisq/tor/TorBootstrap.java b/network/tor/tor/src/main/java/bisq/tor/TorBootstrap.java
@@ -24,7 +24,6 @@
 import bisq.tor.process.TorProcessConfig;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Scanner;
@@ -49,7 +48,6 @@ class TorBootstrap {
     }
 
     int start() throws IOException, InterruptedException {
-        torInstallationFiles.removeCookieFileIfPresent();
         torInstaller.installIfNotUpToDate();
 
         Process torProcess = startTorProcess();
@@ -59,15 +57,10 @@ int start() throws IOException, InterruptedException {
         int controlPort = waitForControlPort(torProcess);
         terminateProcessBuilder(torProcess);
 
-        waitForCookieInitialized();
         log.info("Cookie initialized");
         return controlPort;
     }
 
-    File getCookieFile() {
-        return torInstallationFiles.getCookieFile();
-    }
-
     void deleteVersionFile() {
         torInstaller.deleteVersionFile();
     }
@@ -136,17 +129,6 @@ private void terminateProcessBuilder(Process torProcess) throws InterruptedExcep
         log.debug("Process builder terminated");
     }
 
-    private void waitForCookieInitialized() throws InterruptedException, IOException {
-        long start = System.currentTimeMillis();
-        File cookieFile = torInstallationFiles.getCookieFile();
-        while (isRunning.get() && cookieFile.length() < 32 && !Thread.currentThread().isInterrupted()) {
-            if (System.currentTimeMillis() - start > 5000) {
-                throw new IOException("Auth cookie not created");
-            }
-            Thread.sleep(50);
-        }
-    }
-
     void shutdown() {
         isRunning.set(false);
     }

diff --git a/network/tor/tor/src/main/java/bisq/tor/installer/TorInstallationFiles.java b/network/tor/tor/src/main/java/bisq/tor/installer/TorInstallationFiles.java
@@ -30,32 +30,22 @@
 public class TorInstallationFiles {
     private final File torDir;
     private final File torBinary;
-    private final File dotTorDir;
     private final File pidFile;
     private final File geoIPFile;
     private final File geoIPv6File;
     private final File torrcFile;
-    private final File cookieFile;
     private final File versionFile;
 
     public TorInstallationFiles(Path torDirPath, OsType osType) {
         torDir = torDirPath.toFile();
         torBinary = new File(torDir, osType.getBinaryName());
-        dotTorDir = new File(torDir, Constants.DOT_TOR_DIR);
         pidFile = new File(torDir, Constants.PID);
         geoIPFile = new File(torDir, Constants.GEO_IP);
         geoIPv6File = new File(torDir, Constants.GEO_IPV_6);
         torrcFile = new File(torDir, Constants.TORRC);
-        cookieFile = new File(dotTorDir.getAbsoluteFile(), Constants.COOKIE);
         versionFile = new File(torDir, Constants.VERSION);
     }
 
-    public void removeCookieFileIfPresent() throws IOException {
-        if (cookieFile.exists() && !cookieFile.delete()) {
-            throw new IOException("Cannot delete old cookie file.");
-        }
-    }
-
     public void writePidToDisk(String ownerPid) throws IOException {
         FileUtils.writeToFile(ownerPid, pidFile);
     }

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
@@ -56,9 +56,6 @@ private void install() throws IOException {
             File torDir = torInstallationFiles.getTorDir();
             FileUtils.makeDirs(torDir);
 
-            File dotTorDir = torInstallationFiles.getDotTorDir();
-            FileUtils.makeDirs(dotTorDir);
-
             File destDir = torInstallationFiles.getTorDir();
             new TorBinaryZipExtractor(destDir).extractBinary();
             log.info("Tor files installed to {}", destDir.getAbsolutePath());

diff --git a/network/tor/tor/src/main/java/bisq/tor/installer/TorrcConfigInstaller.java b/network/tor/tor/src/main/java/bisq/tor/installer/TorrcConfigInstaller.java
@@ -79,8 +79,6 @@ private void extendTorrcFile() throws IOException {
                     torInstallationFiles.getGeoIPv6File().getCanonicalPath());
             printWriter.println(Constants.TORRC_KEY_PID + " " +
                     torInstallationFiles.getPidFile().getCanonicalPath());
-            printWriter.println(Constants.TORRC_KEY_COOKIE + " " +
-                    torInstallationFiles.getCookieFile().getCanonicalPath());
             printWriter.println("");
         }
     }