Stream isolation for Tor

p2p/src/main/java/bisq/network/Socks5ProxyProvider.java

@@ -19,6 +19,8 @@
 
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
 
+import bisq.network.p2p.network.NetworkNode;
+
 import com.google.inject.Inject;
 
 import javax.inject.Named;
@@ -45,7 +47,7 @@ public class Socks5ProxyProvider {
     private static final Logger log = LoggerFactory.getLogger(Socks5ProxyProvider.class);
 
     @Nullable
-    private Socks5Proxy socks5ProxyInternal;
+    private NetworkNode socks5ProxyInternalFactory;
 
     // proxy used for btc network
     @Nullable
@@ -66,8 +68,8 @@ public Socks5ProxyProvider(@Named(NetworkOptionKeys.SOCKS_5_PROXY_BTC_ADDRESS) S
     public Socks5Proxy getSocks5Proxy() {
         if (socks5ProxyBtc != null)
             return socks5ProxyBtc;
-        else if (socks5ProxyInternal != null)
-            return socks5ProxyInternal;
+        else if (socks5ProxyInternalFactory != null)
+            return getSocks5ProxyInternal();
         else
             return null;
     }
@@ -84,11 +86,11 @@ public Socks5Proxy getSocks5ProxyHttp() {
 
     @Nullable
     public Socks5Proxy getSocks5ProxyInternal() {
-        return socks5ProxyInternal;
+        return socks5ProxyInternalFactory.getSocksProxy();
     }
 
-    public void setSocks5ProxyInternal(@Nullable Socks5Proxy bisqSocks5Proxy) {
-        this.socks5ProxyInternal = bisqSocks5Proxy;
+    public void setSocks5ProxyInternal(@Nullable NetworkNode bisqSocks5ProxyFactory) {
+        this.socks5ProxyInternalFactory = bisqSocks5ProxyFactory;
     }
 
     @Nullable

p2p/src/main/java/bisq/network/p2p/P2PService.java

@@ -275,7 +275,7 @@ public void shutDown(Runnable shutDownCompleteHandler) {
     public void onTorNodeReady() {
         Log.traceCall();
 
-        socks5ProxyProvider.setSocks5ProxyInternal(networkNode.getSocksProxy());
+        socks5ProxyProvider.setSocks5ProxyInternal(networkNode);
 
         boolean seedNodesAvailable = requestDataManager.requestPreliminaryData();
 

p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java

@@ -45,7 +45,7 @@
 import javafx.beans.property.SimpleBooleanProperty;
 
 import java.net.Socket;
-
+import java.security.SecureRandom;
 import java.io.IOException;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -76,6 +76,8 @@ public class TorNetworkNode extends NetworkNode {
 
     private TorMode torMode;
 
+    private boolean streamIsolation = false;
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -115,7 +117,17 @@ protected Socket createSocket(NodeAddress peerNodeAddress) throws IOException {
     public Socks5Proxy getSocksProxy() {
         try {
             tor = Tor.getDefault();
-            return tor != null ? tor.getProxy() : null;
+
+            String stream = "";
+            if (streamIsolation) {
+                // create a random string
+                byte[] bytes = new byte[512]; // note that getProxy does Sha256 that string anyways
+                new SecureRandom().nextBytes(bytes);
+                stream = new String(bytes);
+            }
+
+            // ask for the connection
+            return tor != null ? tor.getProxy(stream) : null;
         } catch (TorCtlException e) {
             log.error("TorCtlException at getSocksProxy: " + e.toString());
             e.printStackTrace();