Added a check for DNS updates

redis-test/src/lib.rs

@@ -289,6 +289,10 @@ impl AioConnectionLike for MockRedisConnection {
     fn get_db(&self) -> i64 {
         0
     }
+
+    fn get_ip(&self) -> Option<String> {
+        None
+    }
 }
 
 #[cfg(test)]

redis/src/aio/connection.rs

@@ -35,6 +35,7 @@ pub struct Connection<C = Pin<Box<dyn AsyncStream + Send + Sync>>> {
     // This flag is checked when attempting to send a command, and if it's raised, we attempt to
     // exit the pubsub state before executing the new request.
     pubsub: bool,
+    ip: Option<String>,
 }
 
 fn assert_sync<T: Sync>() {}
@@ -52,13 +53,15 @@ impl<C> Connection<C> {
             decoder,
             db,
             pubsub,
+            ip,
         } = self;
         Connection {
             con: f(con),
             buf,
             decoder,
             db,
             pubsub,
+            ip,
         }
     }
 }
@@ -69,13 +72,18 @@ where
 {
     /// Constructs a new `Connection` out of a `AsyncRead + AsyncWrite` object
     /// and a `RedisConnectionInfo`
-    pub async fn new(connection_info: &RedisConnectionInfo, con: C) -> RedisResult<Self> {
+    pub async fn new(
+        connection_info: &RedisConnectionInfo,
+        con: C,
+        ip: Option<String>,
+    ) -> RedisResult<Self> {
         let mut rv = Connection {
             con,
             buf: Vec::new(),
             decoder: combine::stream::Decoder::new(),
             db: connection_info.db,
             pubsub: false,
+            ip,
         };
         authenticate(connection_info, &mut rv).await?;
         Ok(rv)
@@ -171,16 +179,16 @@ where
     /// Constructs a new `Connection` out of a `async_std::io::AsyncRead + async_std::io::AsyncWrite` object
     /// and a `RedisConnectionInfo`
     pub async fn new_async_std(connection_info: &RedisConnectionInfo, con: C) -> RedisResult<Self> {
-        Connection::new(connection_info, async_std::AsyncStdWrapped::new(con)).await
+        Connection::new(connection_info, async_std::AsyncStdWrapped::new(con), None).await
     }
 }
 
 pub(crate) async fn connect<C>(connection_info: &ConnectionInfo) -> RedisResult<Connection<C>>
 where
     C: Unpin + RedisRuntime + AsyncRead + AsyncWrite + Send,
 {
-    let con = connect_simple::<C>(connection_info).await?;
-    Connection::new(&connection_info.redis, con).await
+    let (con, ip) = connect_simple::<C>(connection_info).await?;
+    Connection::new(&connection_info.redis, con, ip).await
 }
 
 impl<C> ConnectionLike for Connection<C>
@@ -253,6 +261,10 @@ where
     fn get_db(&self) -> i64 {
         self.db
     }
+
+    fn get_ip(&self) -> Option<String> {
+        todo!()
+    }
 }
 
 /// Represents a `PubSub` connection.
@@ -382,7 +394,7 @@ pub(crate) async fn get_socket_addrs(
 
 pub(crate) async fn connect_simple<T: RedisRuntime>(
     connection_info: &ConnectionInfo,
-) -> RedisResult<T> {
+) -> RedisResult<(T, Option<String>)> {
     Ok(match connection_info.addr {
         ConnectionAddr::Tcp(ref host, port) => {
             let socket_addrs = get_socket_addrs(host, port).await?;
@@ -395,7 +407,10 @@ pub(crate) async fn connect_simple<T: RedisRuntime>(
                     |acc, socket_addr| async move {
                         match acc {
                             ok @ Ok(_) => ok,
-                            Err(_) => <T>::connect_tcp(socket_addr).await,
+                            Err(_) => {
+                                let conn = <T>::connect_tcp(socket_addr).await?;
+                                Ok((conn, Some(socket_addr.ip().to_string())))
+                            }
                         }
                     },
                 )
@@ -406,7 +421,7 @@ pub(crate) async fn connect_simple<T: RedisRuntime>(
         ConnectionAddr::TcpTls {
             ref host,
             port,
-            insecure,
+            insecure: _,
         } => {
             let socket_addrs = get_socket_addrs(host, port).await?;
             stream::iter(socket_addrs)
@@ -418,7 +433,10 @@ pub(crate) async fn connect_simple<T: RedisRuntime>(
                     |acc, socket_addr| async move {
                         match acc {
                             ok @ Ok(_) => ok,
-                            Err(_) => <T>::connect_tcp_tls(host, socket_addr, insecure).await,
+                            Err(_) => {
+                                let conn = <T>::connect_tcp(socket_addr).await?;
+                                Ok((conn, Some(socket_addr.ip().to_string())))
+                            }
                         }
                     },
                 )
@@ -434,7 +452,7 @@ pub(crate) async fn connect_simple<T: RedisRuntime>(
         }
 
         #[cfg(unix)]
-        ConnectionAddr::Unix(ref path) => <T>::connect_unix(path).await?,
+        ConnectionAddr::Unix(ref path) => (<T>::connect_unix(path).await?, None),
 
         #[cfg(not(unix))]
         ConnectionAddr::Unix(_) => {

redis/src/aio/connection_manager.rs

@@ -231,4 +231,8 @@ impl ConnectionLike for ConnectionManager {
     fn get_db(&self) -> i64 {
         self.client.connection_info().redis.db
     }
+
+    fn get_ip(&self) -> Option<String> {
+        None
+    }
 }

redis/src/aio/mod.rs

@@ -72,6 +72,10 @@ pub trait ConnectionLike {
     /// also might be incorrect if the connection like object is not
     /// actually connected.
     fn get_db(&self) -> i64;
+
+    /// Returns the connection's IP if it's a TCP connection and the connection is established,
+    /// otherwise returns None.
+    fn get_ip(&self) -> Option<String>;
 }
 
 async fn authenticate<C>(connection_info: &RedisConnectionInfo, con: &mut C) -> RedisResult<()>

redis/src/aio/multiplexed_connection.rs

@@ -1,7 +1,7 @@
 use super::ConnectionLike;
 use crate::aio::authenticate;
 use crate::cmd::Cmd;
-use crate::connection::RedisConnectionInfo;
+use crate::connection::ConnectionInfo;
 #[cfg(any(feature = "tokio-comp", feature = "async-std-comp"))]
 use crate::parser::ValueCodec;
 use crate::types::{RedisError, RedisFuture, RedisResult, Value};
@@ -311,6 +311,7 @@ where
 pub struct MultiplexedConnection {
     pipeline: Pipeline<Vec<u8>, Value, RedisError>,
     db: i64,
+    ip: Option<String>,
 }
 
 impl Debug for MultiplexedConnection {
@@ -326,8 +327,9 @@ impl MultiplexedConnection {
     /// Constructs a new `MultiplexedConnection` out of a `AsyncRead + AsyncWrite` object
     /// and a `ConnectionInfo`
     pub async fn new<C>(
-        connection_info: &RedisConnectionInfo,
+        connection_info: &ConnectionInfo,
         stream: C,
+        ip: Option<String>,
     ) -> RedisResult<(Self, impl Future<Output = ()>)>
     where
         C: Unpin + AsyncRead + AsyncWrite + Send + 'static,
@@ -348,10 +350,11 @@ impl MultiplexedConnection {
         let driver = boxed(driver);
         let mut con = MultiplexedConnection {
             pipeline,
-            db: connection_info.db,
+            db: connection_info.redis.db,
+            ip,
         };
         let driver = {
-            let auth = authenticate(connection_info, &mut con);
+            let auth = authenticate(&connection_info.redis, &mut con);
             futures_util::pin_mut!(auth);
 
             match futures_util::future::select(auth, driver).await {
@@ -419,4 +422,8 @@ impl ConnectionLike for MultiplexedConnection {
     fn get_db(&self) -> i64 {
         self.db
     }
+
+    fn get_ip(&self) -> Option<String> {
+        self.ip.clone()
+    }
 }

redis/src/client.rs

@@ -72,7 +72,7 @@ impl Client {
     /// Returns an async connection from the client.
     #[cfg(any(feature = "tokio-comp", feature = "async-std-comp"))]
     pub async fn get_async_connection(&self) -> RedisResult<crate::aio::Connection> {
-        let con = match Runtime::locate() {
+        let (con, ip) = match Runtime::locate() {
             #[cfg(feature = "tokio-comp")]
             Runtime::Tokio => {
                 self.get_simple_async_connection::<crate::aio::tokio::Tokio>()
@@ -85,7 +85,7 @@ impl Client {
             }
         };
 
-        crate::aio::Connection::new(&self.connection_info.redis, con).await
+        crate::aio::Connection::new(&self.connection_info.redis, con, ip).await
     }
 
     /// Returns an async connection from the client.
@@ -268,19 +268,21 @@ impl Client {
     where
         T: crate::aio::RedisRuntime,
     {
-        let con = self.get_simple_async_connection::<T>().await?;
-        crate::aio::MultiplexedConnection::new(&self.connection_info.redis, con).await
+        let (con, ip) = self.get_simple_async_connection::<T>().await?;
+        crate::aio::MultiplexedConnection::new(&self.connection_info, con, ip).await
     }
 
     async fn get_simple_async_connection<T>(
         &self,
-    ) -> RedisResult<Pin<Box<dyn crate::aio::AsyncStream + Send + Sync>>>
+    ) -> RedisResult<(
+        Pin<Box<dyn crate::aio::AsyncStream + Send + Sync>>,
+        Option<String>,
+    )>
     where
         T: crate::aio::RedisRuntime,
     {
-        Ok(crate::aio::connect_simple::<T>(&self.connection_info)
-            .await?
-            .boxed())
+        let (conn, ip) = crate::aio::connect_simple::<T>(&self.connection_info).await?;
+        Ok((conn.boxed(), ip))
     }
 
     #[cfg(feature = "connection-manager")]

redis/src/cluster_async/mod.rs

@@ -1110,13 +1110,40 @@ where
         }
     }
 
+    /// This function takes a node's address, examines if its host has encountered a DNS change, where the node's endpoint now leads to a different IP address.
+    /// If no socket addresses are discovered for the node's host address, or if it's a non-DNS address, it returns false.
+    /// In case the node's host address resolves to socket addresses and none of them match the current connection's IP, a DNS change is detected, resulting in a true return.
+    async fn is_dns_changed(addr: &str, curr_ip: &String) -> bool {
+        let (host, port) = match get_host_and_port_from_addr(addr) {
+            Some((host, port)) => (host, port),
+            None => return false,
+        };
+        let updated_addresses = match get_socket_addrs(host, port).await {
+            Ok(socket_addrs) => socket_addrs,
+            Err(_) => return false,
+        };
+        for socket_addr in updated_addresses {
+            if socket_addr.ip().to_string() == *curr_ip {
+                return false;
+            }
+        }
+        true
+    }
+
     async fn get_or_create_conn(
         addr: &str,
         conn_option: Option<ConnectionFuture<C>>,
         params: &ClusterParams,
     ) -> RedisResult<C> {
         if let Some(conn) = conn_option {
             let mut conn = conn.await;
+            if let Some(ip) = conn.get_ip() {
+                // Check for a DNS change
+                if Self::is_dns_changed(addr, &ip).await {
+                    // A DNS change is detected, create a new connection
+                    return connect_and_check(addr, params.clone()).await;
+                }
+            };
             match check_connection(&mut conn, params.connection_timeout.into()).await {
                 Ok(_) => Ok(conn),
                 Err(_) => connect_and_check(addr, params.clone()).await,
@@ -1289,7 +1316,12 @@ where
     fn get_db(&self) -> i64 {
         0
     }
+
+    fn get_ip(&self) -> Option<String> {
+        None
+    }
 }
+
 /// Implements the process of connecting to a Redis server
 /// and obtaining a connection handle.
 pub trait Connect: Sized {
@@ -1338,7 +1370,6 @@ async fn check_connection<C>(conn: &mut C, timeout: futures_time::time::Duration
 where
     C: ConnectionLike + Send + 'static,
 {
-    // TODO: Add a check to re-resolve DNS addresses to verify we that we have a connection to the right node
     crate::cmd("PING")
         .query_async::<_, String>(conn)
         .timeout(timeout)

redis/tests/support/mock_cluster.rs

@@ -28,6 +28,7 @@ static HANDLERS: Lazy<RwLock<HashMap<String, Handler>>> = Lazy::new(Default::def
 pub struct MockConnection {
     pub handler: Handler,
     pub port: u16,
+    pub ip: String,
 }
 
 #[cfg(feature = "cluster-async")]
@@ -50,6 +51,7 @@ impl cluster_async::Connect for MockConnection {
                 .unwrap_or_else(|| panic!("Handler `{name}` were not installed"))
                 .clone(),
             port,
+            ip: name.clone(),
         }))
     }
 }
@@ -73,6 +75,7 @@ impl cluster::Connect for MockConnection {
                 .unwrap_or_else(|| panic!("Handler `{name}` were not installed"))
                 .clone(),
             port,
+            ip: name.clone(),
         })
     }
 
@@ -225,6 +228,10 @@ impl aio::ConnectionLike for MockConnection {
     fn get_db(&self) -> i64 {
         0
     }
+
+    fn get_ip(&self) -> Option<String> {
+        None
+    }
 }
 
 impl redis::ConnectionLike for MockConnection {

redis/tests/test_cluster_async.rs

@@ -273,6 +273,10 @@ impl ConnectionLike for ErrorConnection {
     fn get_db(&self) -> i64 {
         self.inner.get_db()
     }
+
+    fn get_ip(&self) -> Option<String> {
+        None
+    }
 }
 
 #[test]