rex-socket 0.1.56 → 0.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a2eeaa43fcd931469e95e513127b480a2ba55dd7f8ada8986b076191c22ad9
-  data.tar.gz: '09dc66492bfdddd8227b015c51ba5f41b3bf263001f1564cf4ae2ef75b80b2f8'
+  metadata.gz: fb38ba9938df81a01bc5fbfffe8055b10d09a8bbb3d19e3955904d70e6577e1b
+  data.tar.gz: f26d820ced28fc1d88120e3d60f4a3ad08440f69f12973754e3fa4d93bcaceec
 SHA512:
-  metadata.gz: e614ceccfda078dbdf7cf75e68c79f47b8a663752cfe84e49909b4b1c1545284a98fc22b1003181fcb773da5785bfb5fbaf79beb6c292caa0b38153399217592
-  data.tar.gz: 44b09208c1de7dfdfb93d1b6b44426466a229434ba7c1c9412e28847e1c00a1896b9e80da8c62ec6bff8f349f591faee37a6e2e93535c5110441989fc5c78094
+  metadata.gz: e5b90f41b5ae712f69c467202d72d211e1e35b4b4a86dc49b80a2e369e716f002bb85189edf0e3e4618579af681fe69d8f98e638854694e0a4ad6e3ca582b685
+  data.tar.gz: e2b28c496f4c3cc30eb8d235aa2657084c338d6f782f1e22eb5a040c4b4285bd709f274fae3c2bb366923f1d619471ecd54cccf4518f33c198b8ddb2825c5ed0

data/.github/workflows/verify.yml

@@ -37,10 +37,11 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
         os:
           - ubuntu-20.04
           - windows-2019
-          - macos-11
+          - macos-13
           - ubuntu-latest
         exclude:
           - { os: ubuntu-latest, ruby: '2.7' }

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.56"
+    VERSION = "0.1.58"
   end
 end

data/lib/rex/socket.rb

@@ -4,6 +4,7 @@ require 'socket'
 require 'thread'
 require 'resolv'
 require 'rex/exceptions'
+require 'dnsruby'
 
 module Rex
 
@@ -85,7 +86,7 @@ module Socket
   #
 
   # see: https://debugpointer.com/regex/regex-for-dns-name
-  MATCH_DNS_NAME = /^(((?!-))(xn--)?([a-z0-9][a-z0-9\-]{0,59})?[a-z0-9]\.)*(xn--)?([a-z0-9\-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,})$/i
+  MATCH_DNS_NAME = /^(((?!-))(xn--)?([a-z0-9_][a-z0-9_\-]{0,59})?[a-z0-9_]\.)*(xn--)?([a-z0-9_\-]{1,61}|[a-z0-9_-]{1,30}\.[a-z]{2,})$/i
 
   MATCH_IPV6 = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/
 
@@ -133,7 +134,7 @@ module Socket
   #
   def self.is_name?(name)
     return false if name.length > 253
-    name =~ MATCH_DNS_NAME ? (name =~ /\s/).nil? : false
+    name.delete_suffix('.') =~ MATCH_DNS_NAME ? (name =~ /\s/).nil? : false
   end
 
   #
@@ -939,26 +940,30 @@ protected
   # @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?
+    v4_sockaddrs = []
+    v6_sockaddrs = []
+
+    if name =~ /\A\d+\Z/ && name.to_i.between?(0, 0xffffffff)
+      v4_sockaddrs << self.to_sockaddr(name.to_i, 0)
+    elsif name =~ /\A0x[0-9a-fA-F]+\Z/ && name.to_i(16).between?(0, 0xffffffff)
+      v4_sockaddrs << self.to_sockaddr(name.to_i(16), 0)
+    elsif self.is_ipv4?(name)
+      v4_sockaddrs << self.to_sockaddr(name, 0)
+    elsif self.is_ipv6?(name)
+      v6_sockaddrs << self.to_sockaddr(name, 0)
+    else
+      v4, v6 = self.rex_resolve_hostname(name, resolver: resolver)
+      v4.each do |a4|
+        v4_sockaddrs << self.to_sockaddr(a4.address.to_s, 0)
+      end
+      v6.each do |a6|
+        v6_sockaddrs << self.to_sockaddr(a6.address.to_s, 0)
+      end
     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?
+
+    (v4_sockaddrs.map { |sa| [sa, ::Socket::AF_INET] } + v6_sockaddrs.map { |sa| [sa, ::Socket::AF_INET6] }).map do |sa, family|
+      Addrinfo.new(sa, family, ::Socket::SOCK_STREAM, ::Socket::IPPROTO_TCP)
     end
-    return getaddrinfo
   end
 
 
@@ -974,21 +979,21 @@ protected
     ) unless name.is_a?(String)
     # Pull both record types
     v4 = begin
-      resolver.send(name, ::Net::DNS::A).answer.select do |a|
+      resolver.send(name, ::Dnsruby::Types::A).answer.select do |a|
         a.type == Dnsruby::Types::A
       end.sort_by do |a|
         self.addr_ntoi(a.address.address)
       end
-    rescue
+    rescue StandardError
       []
     end
     v6 = begin
-      resolver.send(name, ::Net::DNS::AAAA).answer.select do |a|
+      resolver.send(name, Dnsruby::Types::AAAA).answer.select do |a|
         a.type == Dnsruby::Types::AAAA
       end.sort_by do |a|
         self.addr_ntoi(a.address.address)
       end
-    rescue
+    rescue StandardError
       []
     end
     # Emulate ::Socket's error if no responses found
@@ -1012,7 +1017,7 @@ protected
     if attribute.nil?
       raise ArgumentError, "Invalid typeclass: #{typeclass}"
     end
-    const = ::Net::DNS.const_get(typeclass)
+    const = Dnsruby::Types.const_get(typeclass)
 
     resources = begin
       resolver.send(name, const).answer.select do |a|

data/rex-socket.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "rex-core"
+  spec.add_runtime_dependency "dnsruby"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.58
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -34,7 +34,7 @@ cert_chain:
   DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
   Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
   -----END CERTIFICATE-----
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dnsruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "The Ruby Exploitation (Rex) Socket Abstraction Library. This library\n
   \                         includes all of the code needed to turn sockets into Rex::Sockets
   with the functionality\n                          for things like L3 pivoting used