mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Singleton proxy restores original behaviour

Browse source
This commit is contained in:
Florian Reimair 2018-12-07 09:59:55 +01:00
parent f134b278ff
commit c255099763
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
View file

@ -47,6 +47,7 @@ import javafx.beans.property.SimpleBooleanProperty;
import java.net.Socket;
import java.security.SecureRandom;
import java.io.IOException;
import java.util.Base64;
import java.util.Date;
import java.util.concurrent.TimeUnit;
@ -78,6 +79,8 @@ public class TorNetworkNode extends NetworkNode {
private boolean streamIsolation = false;
private Socks5Proxy socksProxy;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
@ -118,18 +121,21 @@ public class TorNetworkNode extends NetworkNode {
// TODO handle failure more cleanly
public Socks5Proxy getSocksProxy() {
try {
tor = Tor.getDefault();
String stream = "";
String stream = null;
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);
stream = Base64.getEncoder().encodeToString(bytes);
}
// ask for the connection
return tor != null ? tor.getProxy(stream) : null;
if (socksProxy == null || streamIsolation) {
tor = Tor.getDefault();
// ask for the connection
socksProxy = tor != null ? tor.getProxy(stream) : null;
}
return socksProxy;
} catch (TorCtlException e) {
log.error("TorCtlException at getSocksProxy: " + e.toString());
e.printStackTrace();