rex-socket 0.1.52 → 0.1.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a97cac39e77ee44665aa30e9b9d5d30fa490c1cbb0909cfeda49bce7ca1414
-  data.tar.gz: 3e76c09d2320265208f8a91c8bd93730d4d4698d1940b8a654d7ec553c008b6d
+  metadata.gz: f4e2765900a58243437c2588d16bc2c3fcd65b58f042707a1ebca28d2240786d
+  data.tar.gz: b7e46d8ab59b275872e48c418de39f07c615a2fdc480ad7ce0a8cf033eb5297f
 SHA512:
-  metadata.gz: 475846de509a2f145142566a729b7fa4bf1d67d0d993c2cff20edb2bf7418c64930136d5e34f8a05a717da610c3dc734d4b631cb66611d3725a173f53a6d3001
-  data.tar.gz: 355abe15808629534099238aad2fee65e4588573108aa4307aa6bc45b1addca4bc6422d48bb77b288945d8b33956be4503a842f74f8e14c0ecc283fcaa45ca9b
+  metadata.gz: 87cdca34534ff3ba9c085659200b40f71802ea51bc023e82bd918df19c3e5b70b2f9132dd954d121655d21a90e2a32bbea0fbed48543877f22ca404cac4d3ee9
+  data.tar.gz: 3bb326d55b4b6c3f6741df0bcf6073b329bba6934e5a5ac45cae1a6716b53301f1d8b3bebc80d40de0ed1c55a67e5c6fc37846fe5eb9524f294d373b6fc984c8

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.52"
+    VERSION = "0.1.53"
   end
 end

data/lib/rex/socket.rb

@@ -122,6 +122,9 @@ module Socket
   end
 
   #
+  # Cache our resolver
+  @@resolver = nil
+
   # Determine whether this is an IPv4 address
   #
   def self.is_ipv4?(addr)
@@ -216,7 +219,11 @@ module Socket
       return [hostname]
     end
 
-    res = ::Addrinfo.getaddrinfo(hostname, 0, ::Socket::AF_UNSPEC, ::Socket::SOCK_STREAM)
+    if @@resolver
+      res = self.rex_getaddrinfo(hostname)
+    else
+      res = ::Addrinfo.getaddrinfo(hostname, 0, ::Socket::AF_UNSPEC, ::Socket::SOCK_STREAM)
+    end
 
     res.map! do |address_info|
       address_info.ip_address
@@ -248,7 +255,7 @@ module Socket
       host, _ = host.split('%', 2)
     end
 
-    ::Socket.gethostbyname(host)
+    @@resolver ? self.rex_gethostbyname(host) : ::Socket.gethostbyname(host)
   end
 
   #
@@ -719,6 +726,15 @@ module Socket
     return [lsock, rsock]
   end
 
+  #
+  # Install Rex::Proto::DNS::CachedResolver, or similar, to pivot DNS
+  #
+  # @param res [Rex::Proto::DNS::CachedResolver] Resolver object to handle DNS requests
+  # @return [Rex::Proto::DNS::CachedResolver] The installed resolver
+  def self._install_global_resolver(res)
+    @@resolver = res
+  end
+
 
   ##
   #
@@ -844,6 +860,89 @@ protected
   attr_writer :context # :nodoc:
   attr_writer :ipv # :nodoc:
 
+  #
+  # @param name [String] The hostname to lookup via the resolver
+  # @param resolver [Rex::Proto::DNS::CachedResolver] Resolver to query for the name
+  # @return [Array] Array mimicking the native gethostbyname return type
+  def self.rex_gethostbyname(name, resolver: @@resolver)
+    v4, v6 = self.rex_resolve_hostname(name, resolver: resolver)
+    # Build response array
+    hostbyname = [name, []]
+    unless v4.empty?
+      hostbyname << ::Socket::AF_INET
+      hostbyname += v4.map(&:address).map(&:address)
+      hostbyname << v6[0].address.address unless v6.empty?
+    else
+      hostbyname << ::Socket::AF_INET6
+      hostbyname += v6.map(&:address).map(&:address)
+    end
+    return hostbyname
+  end
+
+  #
+  # @param name [String] The hostname to lookup via the resolver
+  # @param resolver [Rex::Proto::DNS::CachedResolver] Resolver to query for the name
+  # @return [Array] Array mimicking the native getaddrinfo return type
+  def self.rex_getaddrinfo(name, resolver: @@resolver)
+    v4, v6 = self.rex_resolve_hostname(name, resolver: resolver)
+    # Build response array
+    getaddrinfo = []
+    v4.each do |a4|
+      getaddrinfo << Addrinfo.new(
+        self.to_sockaddr(a4.address.to_s, 0),
+        ::Socket::AF_INET,
+        ::Socket::SOCK_STREAM,
+        ::Socket::IPPROTO_TCP,
+      ) unless v4.empty?
+    end
+    v6.each do |a6|
+      getaddrinfo << Addrinfo.new(
+        self.to_sockaddr(a6.address.to_s, 0),
+        ::Socket::AF_INET6,
+        ::Socket::SOCK_STREAM,
+        ::Socket::IPPROTO_TCP,
+      ) unless v6.empty?
+    end
+    return getaddrinfo
+  end
+
+
+  # @param name [String] The hostname to lookup via the resolver
+  # @param resolver [Rex::Proto::DNS::CachedResolver] Resolver to query for the name
+  # @return [Array] Array of Dnsruby::Message responses for consumers to reformat
+  def self.rex_resolve_hostname(name, resolver: @@resolver)
+    raise ::SocketError.new(
+      "Rex::Socket internal DNS resolution requires passing/setting a resolver"
+    ) unless resolver
+    raise ::SocketError.new(
+      "Rex::Socket internal DNS resolution requires passing a String name to resolve"
+    ) unless name.is_a?(String)
+    # Pull both record types
+    v4 = begin
+      resolver.send(name, ::Net::DNS::A).answer.select do |a|
+        a.type == Dnsruby::Types::A
+      end.sort_by do |a|
+        self.addr_ntoi(a.address.address)
+      end
+    rescue
+      []
+    end
+    v6 = begin
+      resolver.send(name, ::Net::DNS::AAAA).answer.select do |a|
+        a.type == Dnsruby::Types::AAAA
+      end.sort_by do |a|
+        self.addr_ntoi(a.address.address)
+      end
+    rescue
+      []
+    end
+    # Emulate ::Socket's error if no responses found
+    if v4.empty? and v6.empty?
+      raise ::SocketError.new('getaddrinfo: Name or service not known')
+    end
+    # Ensure response types (depending on underlying library used) provide required methods
+    return v4, v6
+  end
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.52
+  version: 0.1.53
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake