rex-socket 0.1.66 → 0.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71de87f105663943e10753e3a5b6189e28db3d0ee792b92669bda8f064d291d
-  data.tar.gz: bb9f07894fad3f5cbf111e2869e6213d852bf39f9f1e1cb6db8ffb01822a4041
+  metadata.gz: 27acb62e9f5a756af4be153428826989e9287a3c61cf42ab472f531459ce4e6a
+  data.tar.gz: 6aaf1a0a93ce1563f3c2c0d2fb02e2f8fca12767e0bdad54e2bac13a19381ee5
 SHA512:
-  metadata.gz: 801d1877c1841113ddb0981c5f195bb89c952de7400caef780a80c40df94758a55a142e25a9853fd8a54b94b4c4c8b94bd84481811b81cdae7e0b34bb848c775
-  data.tar.gz: a29bf5d722df87d7c736601b6cdb5b85586ef8fa8d13d2e8e99328f1c14a8bd2e97f6398d682d4c42321e17cb793763a0050c36635151083eab998cac005a37f
+  metadata.gz: '0481a40864ca7aad2d346f510024ccff891f218b3ebbcea572e9342424d730241829218b4d0eadb69812c79fd4fa9e5a6b9e03749ee8eb22ac61ee71278ed5a3'
+  data.tar.gz: 7de451e877c242251ab8a004dc806f4465849748696547b752168dbb58c24b48fb25e95771656da33a89a989f68b7030e58579f5b38a92f91bef35e50572c600

data/lib/rex/socket/comm/local.rb

@@ -264,7 +264,15 @@ class Rex::Socket::Comm::Local
           sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, true)
         end
 
-        sock.bind(Rex::Socket.to_sockaddr(param.localhost, param.localport))
+        if Rex::Socket.is_ip_addr?(param.localhost)
+          ip = param.localhost
+        elsif param.v6
+          ip = Rex::Socket.getaddresses(param.localhost, true).select { |address| Rex::Socket.is_ipv6?(address) }.sample
+        else
+          ip = Rex::Socket.getaddresses(param.localhost, false).select { |address| Rex::Socket.is_ipv4?(address) }.sample
+        end
+
+        sock.bind(Rex::Socket.to_sockaddr(ip, param.localport))
 
       rescue ::Errno::EADDRNOTAVAIL,::Errno::EADDRINUSE
         sock.close
@@ -343,7 +351,13 @@ class Rex::Socket::Comm::Local
           ip   = param.proxies.first.host
           port = param.proxies.first.port
         else
-          ip   = Rex::Socket.getaddress(param.peerhost)
+          if Rex::Socket.is_ip_addr?(param.peerhost)
+            ip = param.peerhost
+          elsif param.v6
+            ip = Rex::Socket.getaddresses(param.peerhost, true).select { |address| Rex::Socket.is_ipv6?(address) }.sample
+          else
+            ip = Rex::Socket.getaddresses(param.peerhost, false).select { |address| Rex::Socket.is_ipv4?(address) }.sample
+          end
           port = param.peerport
         end
 

data/lib/rex/socket/udp.rb

@@ -97,23 +97,41 @@ module Rex::Socket::Udp
   #
   # Sends a datagram to the supplied host:port with optional flags.
   #
+  # @deprecated Use {#send} with the stdlib 4-arg form send(mesg, flags, host, port) instead.
+  #   Note the argument order differs: sendto(gram, host, port, flags) vs send(mesg, flags, host, port).
+  #
   def sendto(gram, peerhost, peerport, flags = 0)
+    warn "#{self.class}#sendto is deprecated; use send(mesg, flags, host, port) instead", uplevel: 1
+    send(gram, flags, peerhost, peerport)
+  end
 
-    # Catch unconnected IPv6 sockets talking to IPv4 addresses
-    peer = Rex::Socket.resolv_nbo(peerhost)
-    if (peer.length == 4 and self.ipv == 6)
-      peerhost = Rex::Socket.getaddress(peerhost, true)
-      if peerhost[0,7].downcase != '::ffff:'
-        peerhost = '::ffff:' + peerhost
+  #
+  # Sends a datagram using the stdlib 4-arg form send(mesg, flags, host, port).
+  #
+  # The 4-arg form handles IPv6/IPv4 address mapping and dispatches via
+  # BasicSocket#send with a packed sockaddr, so channel/pivoted sockets that
+  # override sendto are not involved. Also accepts the 3-arg sockaddr form used
+  # by lower-level callers, and the 2-arg connected-socket form.
+  #
+  def send(mesg, flags, host = nil, port = nil)
+    if host && port
+      # Catch unconnected IPv6 sockets talking to IPv4 addresses
+      peer = Rex::Socket.resolv_nbo(host)
+      if peer.length == 4 && self.ipv == 6
+        host_address = Rex::Socket.getaddress(host, true)
+        host = '::ffff:' + host_address unless host_address.downcase.start_with?('::ffff:')
       end
+      begin
+        super(mesg, flags, Rex::Socket.to_sockaddr(host, port))
+      rescue ::Errno::EHOSTUNREACH, ::Errno::ENETDOWN, ::Errno::ENETUNREACH, ::Errno::ENETRESET,
+             ::Errno::EHOSTDOWN, ::Errno::EACCES, ::Errno::EINVAL, ::Errno::EADDRNOTAVAIL
+        nil
+      end
+    elsif host
+      super(mesg, flags, host)
+    else
+      super(mesg, flags)
     end
-
-    begin
-      send(gram, flags, Rex::Socket.to_sockaddr(peerhost, peerport))
-    rescue  ::Errno::EHOSTUNREACH,::Errno::ENETDOWN,::Errno::ENETUNREACH,::Errno::ENETRESET,::Errno::EHOSTDOWN,::Errno::EACCES,::Errno::EINVAL,::Errno::EADDRNOTAVAIL
-      return nil
-    end
-
   end
 
   #

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.66"
+    VERSION = "0.1.68"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.66
+  version: 0.1.68
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-21 00:00:00.000000000 Z
+date: 2026-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake