fix: use tcp backend for peer seed DNS resolution

tari-project · Nov 7, 2021 · 8f3e7b2 · 8f3e7b2
1 parent 800686e
commit 8f3e7b2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/base_layer/p2p/src/dns/client.rs b/base_layer/p2p/src/dns/client.rs
@@ -25,15 +25,23 @@ use crate::dns::mock::{DefaultOnSend, MockClientHandle};
 
 use super::DnsClientError;
 use futures::{future, FutureExt};
-use std::{net::SocketAddr, sync::Arc};
+use std::{net::SocketAddr, sync::Arc, time::Duration};
 use tari_shutdown::Shutdown;
-use tokio::{net::UdpSocket, task};
+use tokio::task;
 use trust_dns_client::{
     client::{AsyncClient, AsyncDnssecClient, ClientHandle},
     op::Query,
-    proto::{error::ProtoError, rr::dnssec::TrustAnchor, udp::UdpClientStream, xfer::DnsResponse, DnsHandle},
-    rr::{DNSClass, IntoName, RecordType},
+    proto::{
+        error::ProtoError,
+        iocompat::AsyncIoTokioAsStd,
+        rr::dnssec::TrustAnchor,
+        xfer::DnsResponse,
+        DnsHandle,
+        DnsMultiplexer,
+    },
+    rr::{dnssec::SigSigner, DNSClass, IntoName, RecordType},
     serialize::binary::BinEncoder,
+    tcp::TcpClientStream,
 };
 
 #[derive(Clone)]
@@ -112,11 +120,16 @@ pub struct Client<C> {
 impl Client<AsyncDnssecClient> {
     pub async fn connect_secure(name_server: SocketAddr, trust_anchor: TrustAnchor) -> Result<Self, DnsClientError> {
         let shutdown = Shutdown::new();
-        let stream = UdpClientStream::<UdpSocket>::new(name_server);
-        let (client, background) = AsyncDnssecClient::builder(stream)
+
+        // TODO: make configurable
+        let timeout = Duration::from_secs(5);
+        let (connect_fut, handle) = TcpClientStream::<AsyncIoTokioAsStd<tokio::net::TcpStream>>::new(name_server);
+        let dns_muxer = DnsMultiplexer::<_, SigSigner>::with_timeout(connect_fut, handle, timeout, None);
+        let (client, background) = AsyncDnssecClient::builder(dns_muxer)
             .trust_anchor(trust_anchor)
             .build()
             .await?;
+
         task::spawn(future::select(shutdown.to_signal(), background.fuse()));
 
         Ok(Self {
@@ -129,8 +142,13 @@ impl Client<AsyncDnssecClient> {
 impl Client<AsyncClient> {
     pub async fn connect(name_server: SocketAddr) -> Result<Self, DnsClientError> {
         let shutdown = Shutdown::new();
-        let stream = UdpClientStream::<UdpSocket>::new(name_server);
-        let (client, background) = AsyncClient::connect(stream).await?;
+
+        // TODO: make configurable
+        let timeout = Duration::from_secs(5);
+        let (stream, handle) =
+            TcpClientStream::<AsyncIoTokioAsStd<tokio::net::TcpStream>>::with_timeout(name_server, timeout);
+
+        let (client, background) = AsyncClient::with_timeout(stream, handle, timeout, None).await?;
         task::spawn(future::select(shutdown.to_signal(), background.fuse()));
 
         Ok(Self {
@@ -148,6 +166,7 @@ where C: DnsHandle<Error = ProtoError>
             .inner
             .query(query.name().clone(), query.query_class(), query.query_type())
             .await?;
+
         Ok(client_resp)
     }
 }

diff --git a/base_layer/p2p/src/dns/error.rs b/base_layer/p2p/src/dns/error.rs
@@ -28,4 +28,6 @@ pub enum DnsClientError {
     ClientError(#[from] ClientError),
     #[error("DNS Protocol error: {0}")]
     ProtoError(#[from] ProtoError),
+    #[error("DNS timeout error")]
+    Timeout,
 }
diff --git a/base_layer/p2p/src/peer_seeds.rs b/base_layer/p2p/src/peer_seeds.rs
@@ -201,6 +201,7 @@ mod test {
                 client: DnsClient::connect("1.1.1.1:53".parse().unwrap()).await.unwrap(),
             };
             let seeds = resolver.resolve("seeds.weatherwax.tari.com").await.unwrap();
+            println!("{:?}", seeds);
             assert!(!seeds.is_empty());
         }