mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Always go through proxy with Tor 

Force the proxy for regular connections, when Tor is configured.
This commit is contained in:
cloudhead 2024-05-05 00:34:27 +02:00
parent 153be9ede4
commit 43b0b2b426
No known key found for this signature in database
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
radicle-node/src/wire/protocol.rs
View File

@ -1085,6 +1085,8 @@ pub fn dial<G: Signer + Ecdh<Pk = NodeId>>(
NetAddr::new(host, remote_addr.port) NetAddr::new(host, remote_addr.port)
} }
}; };
// Whether to tunnel regular connections through the proxy.
let force_proxy = matches!(config.tor, Some(TorConfig::Proxy { .. }));
// Nb. This timeout is currently not used by the underlying library due to the // Nb. This timeout is currently not used by the underlying library due to the
// `socket2` library not supporting non-blocking connect with timeout. // `socket2` library not supporting non-blocking connect with timeout.
let connection = net::TcpStream::connect_nonblocking(inet_addr, DEFAULT_DIAL_TIMEOUT)?; let connection = net::TcpStream::connect_nonblocking(inet_addr, DEFAULT_DIAL_TIMEOUT)?;
@ -1096,6 +1098,7 @@ pub fn dial<G: Signer + Ecdh<Pk = NodeId>>(
remote_addr, remote_addr,
Some(remote_id), Some(remote_id),
connection, connection,
force_proxy,
signer, signer,
)) ))
} }
@ -1106,7 +1109,7 @@ pub fn accept<G: Signer + Ecdh<Pk = NodeId>>(
connection: net::TcpStream, connection: net::TcpStream,
signer: G, signer: G,
) -> WireSession<G> { ) -> WireSession<G> {
session::<G>(remote_addr, None, connection, signer) session::<G>(remote_addr, None, connection, false, signer)
} }
/// Create a new [`WireSession`]. /// Create a new [`WireSession`].
@ -1114,9 +1117,10 @@ fn session<G: Signer + Ecdh<Pk = NodeId>>(
remote_addr: NetAddr<HostName>, remote_addr: NetAddr<HostName>,
remote_id: Option<NodeId>, remote_id: Option<NodeId>,
connection: net::TcpStream, connection: net::TcpStream,
force_proxy: bool,
signer: G, signer: G,
) -> WireSession<G> { ) -> WireSession<G> {
let socks5 = socks5::Socks5::with(remote_addr, false); let socks5 = socks5::Socks5::with(remote_addr, force_proxy);
let proxy = Socks5Session::with(connection, socks5); let proxy = Socks5Session::with(connection, socks5);
let pair = G::generate_keypair(); let pair = G::generate_keypair();
let keyset = Keyset { let keyset = Keyset {