RUBY-3722 Properly handle SocketError

lib/mongo/address.rb

@@ -237,7 +237,7 @@ def socket(socket_timeout, opts = {})
         # (multiple identical items in the returned array). It does not make
         # sense to try to connect to the same address more than once, thus
         # eliminate duplicates here.
-        infos = ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
+        infos = getaddrinfo(host, family)
         results = infos.map do |info|
           [info[4], info[3]]
         end.uniq
@@ -276,6 +276,12 @@ def to_s
 
     private
 
+    # This is a simple wrapper around Socket.getaddrinfo added to
+    # make testing easier.
+    def getaddrinfo(host, family)
+      ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
+    end
+
     def parse_host_port
       address = seed.downcase
       case address
@@ -305,7 +311,7 @@ def map_exceptions(csot)
         else
           raise e
         end
-      rescue IOError, SystemCallError => e
+      rescue IOError, SystemCallError, ::SocketError => e
         raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
       rescue OpenSSL::SSL::SSLError => e
         raise Error::SocketError, "#{e.class}: #{e} (for #{self})"

lib/mongo/socket.rb

@@ -609,7 +609,7 @@ def map_exceptions
         yield
       rescue Errno::ETIMEDOUT => e
         raise Error::SocketTimeoutError, "#{e.class}: #{e} (for #{human_address})"
-      rescue IOError, SystemCallError => e
+      rescue IOError, SystemCallError, ::SocketError => e
         raise Error::SocketError, "#{e.class}: #{e} (for #{human_address})"
       rescue OpenSSL::SSL::SSLError => e
         raise Error::SocketError, "#{e.class}: #{e} (for #{human_address})"

spec/lite_spec_helper.rb

@@ -97,7 +97,7 @@ module Mrss
 require 'mrss/session_registry'
 require 'support/local_resource_registry'
 
-if SpecConfig.instance.mri? && !SpecConfig.instance.windows?
+if SpecConfig.instance.mri? && (SpecConfig.instance.linux? || SpecConfig.instance.macos?)
   require 'timeout_interrupt'
 else
   require 'timeout'

spec/mongo/address_spec.rb

@@ -319,6 +319,17 @@
         end
       end
     end
+    context 'when a SocketError occurs' do
+      before do
+        allow(address).to receive(:getaddrinfo).and_raise(::SocketError)
+      end
+
+      it 'raises a Mongo::Error::SocketError' do
+        expect {
+          address.socket(0.0)
+        }.to raise_error(Mongo::Error::SocketError)
+      end
+    end
   end
 
   describe '#to_s' do

spec/mongo/server/monitor/connection_spec.rb

@@ -153,7 +153,7 @@
         expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
         lambda do
           connection.connect!
-        end.should raise_error(SocketError, 'Test exception')
+        end.should raise_error(Mongo::Error::SocketError, /SocketError: Test exception/)
       end
     end
   end

spec/mongo/socket_spec.rb

@@ -53,6 +53,14 @@
         end
       end.to raise_error(Mongo::Error::SocketError, 'OpenSSL::SSL::SSLError: Test error (for fake-address)')
     end
+
+    it 'maps SocketError and preserves message' do
+      expect do
+        socket.send(:map_exceptions) do
+          raise SocketError.new('Test error')
+        end
+      end.to raise_error(Mongo::Error::SocketError, 'SocketError: Test error (for fake-address)')
+    end
   end
 
   describe '#read' do