Maybe fix DNS leaks

pokkst · Nov 1, 2023 · 3607346 · 3607346
1 parent 8b25443
commit 3607346
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/swap/src/asb/network.rs b/swap/src/asb/network.rs
@@ -42,13 +42,16 @@ pub mod transport {
         let tcp_with_dns = TokioDnsConfig::system(tcp)?;
         let websocket_with_dns = WsConfig::new(tcp_with_dns.clone());
 
-        let maybe_tor_transport = match maybe_tor_socks5_port {
-            Some(port) => OptionalTransport::some(TorDialOnlyTransport::new(port)),
-            None => OptionalTransport::none(),
+        let transport = match maybe_tor_socks5_port {
+            Some(port) => {
+                let tor_transport = OptionalTransport::some(TorDialOnlyTransport::new(port));
+                tor_transport.boxed()
+            },
+            None => {
+                tcp_with_dns.or_transport(websocket_with_dns).boxed()
+            },
         };
 
-        let transport = maybe_tor_transport.or_transport(tcp_with_dns).or_transport(websocket_with_dns).boxed();
-
         authenticate_and_multiplex(transport, identity)
     }
 }

diff --git a/swap/src/cli/transport.rs b/swap/src/cli/transport.rs
@@ -6,6 +6,7 @@ use libp2p::core::transport::{Boxed, OptionalTransport};
 use libp2p::dns::TokioDnsConfig;
 use libp2p::tcp::TokioTcpConfig;
 use libp2p::{identity, PeerId, Transport};
+use libp2p::websocket::WsConfig;
 
 /// Creates the libp2p transport for the swap CLI.
 ///
@@ -21,12 +22,14 @@ pub fn new(
 ) -> Result<Boxed<(PeerId, StreamMuxerBox)>> {
     let tcp = TokioTcpConfig::new().nodelay(true);
     let tcp_with_dns = TokioDnsConfig::system(tcp)?;
-    let maybe_tor_transport = match maybe_tor_socks5_port {
-        Some(port) => OptionalTransport::some(TorDialOnlyTransport::new(port)),
-        None => OptionalTransport::none(),
+    let websocket_with_dns = WsConfig::new(tcp_with_dns.clone());
+    let transport = match maybe_tor_socks5_port {
+        Some(port) => {
+            let tor_transport = OptionalTransport::some(TorDialOnlyTransport::new(port));
+            tor_transport.boxed()
+        },
+        None => tcp_with_dns.or_transport(websocket_with_dns).boxed(),
     };
 
-    let transport = maybe_tor_transport.or_transport(tcp_with_dns).boxed();
-
     authenticate_and_multiplex(transport, identity)
 }