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

node: Fix Tor full-proxy mode support 

We ensure that the global proxy is used as the connection address if
set.
This commit is contained in:
cloudhead 2024-06-21 16:16:51 +02:00
parent 6a9f11a1d9
commit f8c6cf8bf9
No known key found for this signature in database
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-node/Cargo.toml
View File

@ -19,7 +19,7 @@ byteorder = { version = "1" }
chrono = { version = "0.4.0", default-features = false, features = ["clock"] } chrono = { version = "0.4.0", default-features = false, features = ["clock"] }
colored = { version = "2.1.0" } colored = { version = "2.1.0" }
crossbeam-channel = { version = "0.5.6" } crossbeam-channel = { version = "0.5.6" }
cyphernet = { version = "0.5.0", features = ["tor", "dns", "ed25519", "p2p-ed25519"] } cyphernet = { version = "0.5.2", features = ["tor", "dns", "ed25519", "p2p-ed25519"] }
fastrand = { version = "2.0.0" } fastrand = { version = "2.0.0" }
gix-protocol = { version = "0.41.1", features = ["blocking-client"] } gix-protocol = { version = "0.41.1", features = ["blocking-client"] }
io-reactor = { version = "0.5.1", features = ["popol"] } io-reactor = { version = "0.5.1", features = ["popol"] }

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

@ -1126,21 +1126,29 @@ pub fn dial<G: Signer + Ecdh<Pk = NodeId>>(
signer: G, signer: G,
config: &service::Config, config: &service::Config,
) -> io::Result<WireSession<G>> { ) -> io::Result<WireSession<G>> {
let inet_addr: NetAddr<InetHost> = match &remote_addr.host { // Determine what address to establish a TCP connection with, given the remote peer
HostName::Ip(ip) => NetAddr::new(InetHost::Ip(*ip), remote_addr.port), // address and our node configuration.
HostName::Dns(dns) => NetAddr::new(InetHost::Dns(dns.clone()), remote_addr.port), let inet_addr: NetAddr<InetHost> = match (&remote_addr.host, config.proxy) {
HostName::Tor(onion) => match config.onion { // For IP and DNS addresses, use the global proxy if set, otherwise use the address as-is.
// In Tor proxy mode, simply specify the proxy address. (HostName::Ip(_), Some(proxy)) => proxy.into(),
(HostName::Ip(ip), None) => NetAddr::new(InetHost::Ip(*ip), remote_addr.port),
(HostName::Dns(_), Some(proxy)) => proxy.into(),
(HostName::Dns(dns), None) => NetAddr::new(InetHost::Dns(dns.clone()), remote_addr.port),
// For onion addresses, handle with care.
(HostName::Tor(onion), proxy) => match config.onion {
// In onion proxy mode, simply use the configured proxy address.
// This takes precedence over any global proxy.
Some(AddressConfig::Proxy { address }) => address.into(), Some(AddressConfig::Proxy { address }) => address.into(),
// In "forward" mode, if a global proxy is set, we use that, otherwise // In "forward" mode, if a global proxy is set, we use that, otherwise
// we treat `.onion` addresses as regular DNS names. // we treat `.onion` addresses as regular DNS names.
Some(AddressConfig::Forward) => { Some(AddressConfig::Forward) => {
if let Some(proxy) = config.proxy { if let Some(proxy) = proxy {
proxy.into() proxy.into()
} else { } else {
NetAddr::new(InetHost::Dns(onion.to_string()), remote_addr.port) NetAddr::new(InetHost::Dns(onion.to_string()), remote_addr.port)
} }
} }
// If onion address support isn't configured, refuse to connect.
None => { None => {
return Err(io::Error::new( return Err(io::Error::new(
io::ErrorKind::Unsupported, io::ErrorKind::Unsupported,
@ -1152,14 +1160,14 @@ pub fn dial<G: Signer + Ecdh<Pk = NodeId>>(
return Err(io::Error::new( return Err(io::Error::new(
io::ErrorKind::Unsupported, io::ErrorKind::Unsupported,
"unsupported remote address type", "unsupported remote address type",
)) ));
} }
}; };
// Whether to tunnel regular connections through the proxy.
let force_proxy = config.proxy.is_some();
// 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)?;
// Whether to tunnel regular connections through the proxy.
let force_proxy = config.proxy.is_some();
session::<G>( session::<G>(
remote_addr, remote_addr,