rex-socket 0.1.51 → 0.1.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8f90acc30e263d824f20d2b1286a5520a483945985f3f229a58bfcf5b9cde1
-  data.tar.gz: 41bd0a0c06187b1be6a0b7672b3efd36d100b74ced4dfd9709aeca71cc7c91cc
+  metadata.gz: f4e2765900a58243437c2588d16bc2c3fcd65b58f042707a1ebca28d2240786d
+  data.tar.gz: b7e46d8ab59b275872e48c418de39f07c615a2fdc480ad7ce0a8cf033eb5297f
 SHA512:
-  metadata.gz: dd89e2260a36ebc22e7eb69a1035078f8aceb96c664dde36f7849a76020f8cf8fd276686cc01e857b5a203a59624b34818271dcdd5c01a6789475cf22cadccf1
-  data.tar.gz: d2e464106473a60359fa268bbe00b1eafac147c9c35b2ef82503824534c5c85fa223bd17decf0dd05d29daa5c36101398ab9a99e8b6afb4000ab01e249262a77
+  metadata.gz: 87cdca34534ff3ba9c085659200b40f71802ea51bc023e82bd918df19c3e5b70b2f9132dd954d121655d21a90e2a32bbea0fbed48543877f22ca404cac4d3ee9
+  data.tar.gz: 3bb326d55b4b6c3f6741df0bcf6073b329bba6934e5a5ac45cae1a6716b53301f1d8b3bebc80d40de0ed1c55a67e5c6fc37846fe5eb9524f294d373b6fc984c8

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.51"
+    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)
@@ -157,7 +160,33 @@ module Socket
     (support_ipv6? && addr =~ MATCH_IPV6) || (addr =~ MATCH_IPV4)
   end
 
+  # Checks to see if an address is an IPv6 address and if so, converts it into its
+  # square bracket format for addressing as noted in RFC 6874 which states that an IPv6
+  # address literal in a URL is always embedded between [ and ]. Please also refer to
+  # RFC5952, RFC3986, and RFC6874 for more info.
+  #
+  # RFC3986 section 3.2.2 specifically notes "A host identified by an Internet Protocol literal address, version 6
+  # [RFC3513] or later, is distinguished by enclosing the IP literal
+  # within square brackets ("[" and "]").  This is the only place where
+  # square bracket characters are allowed in the URI syntax."
+  #
+  # RFC6874 reinforces this in section 2 where it notes "In a URI, a literal IPv6 address
+  # is always embedded between '[' and ']'".
   #
+  # @param host [String] IP address or hostname to convert to a URI authority.
+  # @param port [Integer] Port number to include within the URI authority.
+  # @return [String] Returns the URI authority string.
+  # @raise [ArgumentError] This function will raise an ArgumentError if the host parameter is not a String.
+  def self.to_authority(host, port=nil)
+    unless host.kind_of?(String)
+      raise ArgumentError.new("Expected a string for the host parameter!")
+    end
+    host = "[#{host}]" if is_ipv6?(host)
+    host += ":#{port}" if port
+    host
+  end
+
+
   # Return true if +addr+ is within the ranges specified in RFC1918, or
   # RFC5735/RFC3927
   #
@@ -190,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
@@ -222,7 +255,7 @@ module Socket
       host, _ = host.split('%', 2)
     end
 
-    ::Socket.gethostbyname(host)
+    @@resolver ? self.rex_gethostbyname(host) : ::Socket.gethostbyname(host)
   end
 
   #
@@ -693,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
+
 
   ##
   #
@@ -818,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.51
+  version: 0.1.53
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake