forward dns resolution errors for downstream handling

nymtech · Jan 27, 2025 · 81fced6 · 81fced6
1 parent 91a8687
commit 81fced6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/common/client-core/src/error.rs b/common/client-core/src/error.rs
@@ -39,6 +39,9 @@ pub enum ClientCoreError {
     #[error("Invalid URL: {0}")]
     InvalidUrl(String),
 
+    #[error("resolution failed: {0}")]
+    ResolutionFailed(#[from] nym_http_api_client::HickoryDnsError),
+
     #[error("no gateways on network")]
     NoGatewaysOnNetwork,
 

diff --git a/common/client-core/src/init/websockets.rs b/common/client-core/src/init/websockets.rs
@@ -3,7 +3,7 @@ use crate::error::ClientCoreError;
 use nym_http_api_client::HickoryDnsResolver;
 use tokio::net::TcpStream;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
-use tungstenite::{error::UrlError, handshake::client::Response};
+use tungstenite::handshake::client::Response;
 use url::{Host, Url};
 
 use std::net::SocketAddr;
@@ -29,13 +29,7 @@ pub(crate) async fn connect_async(
             // Do a DNS lookup for the domain using our custom DNS resolver
             resolver
                 .resolve_str(domain)
-                .await
-                .map_err(|_| {
-                    // failed to resolve
-                    ClientCoreError::GatewayConnectionFailure {
-                        source: UrlError::NoPathOrQuery.into(),
-                    }
-                })?
+                .await?
                 .into_iter()
                 .map(|a| SocketAddr::new(a, port))
                 .collect()

diff --git a/common/client-libs/gateway-client/src/client/websockets.rs b/common/client-libs/gateway-client/src/client/websockets.rs
@@ -3,7 +3,7 @@ use crate::error::GatewayClientError;
 use nym_http_api_client::HickoryDnsResolver;
 use tokio::net::TcpStream;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
-use tungstenite::{error::UrlError, handshake::client::Response};
+use tungstenite::handshake::client::Response;
 use url::{Host, Url};
 
 use std::net::SocketAddr;
@@ -30,14 +30,7 @@ pub(crate) async fn connect_async(
             // Do a DNS lookup for the domain using our custom DNS resolver
             resolver
                 .resolve_str(domain)
-                .await
-                .map_err(|_| {
-                    // failed to resolve
-                    GatewayClientError::NetworkConnectionFailed {
-                        address: endpoint.to_owned(),
-                        source: UrlError::NoPathOrQuery.into(),
-                    }
-                })?
+                .await?
                 .into_iter()
                 .map(|a| SocketAddr::new(a, port))
                 .collect()

diff --git a/common/client-libs/gateway-client/src/error.rs b/common/client-libs/gateway-client/src/error.rs
@@ -46,6 +46,9 @@ pub enum GatewayClientError {
     #[error("Invalid URL: {0}")]
     InvalidUrl(String),
 
+    #[error("resolution failed: {0}")]
+    ResolutionFailed(#[from] nym_http_api_client::HickoryDnsError),
+
     #[error("No shared key was provided or obtained")]
     NoSharedKeyAvailable,
 

diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
@@ -40,6 +40,7 @@ struct SocketAddrs {
 
 #[derive(Debug, thiserror::Error)]
 #[error("hickory-dns resolver error: {hickory_error}")]
+/// Error occurring while resolving a hostname into an IP address. 
 pub struct HickoryDnsError {
     #[from]
     hickory_error: ResolveError,

diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
@@ -22,7 +22,7 @@ pub use user_agent::UserAgent;
 #[cfg(not(target_arch = "wasm32"))]
 mod dns;
 #[cfg(not(target_arch = "wasm32"))]
-pub use dns::HickoryDnsResolver;
+pub use dns::{HickoryDnsResolver, HickoryDnsError};
 
 // The timeout is relatively high as we are often making requests over the mixnet, where latency is
 // high and chatty protocols take a while to complete.