rex-socket 0.1.57 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3813cfab9315c8efee87b3104d1270a7f9c542cbd012b97b5155650d78f2f98b
-  data.tar.gz: 15962d9201caa7cfb3c90a80457b0988913f35007126b15669114632842fa465
+  metadata.gz: e949497936b6f26c1c6da1830a2673f8708706e89598765b26ddf05179dceee0
+  data.tar.gz: 49e42e30d773df6f4b52539d360748fe77e51dd49bb1f1e2782a35217839eef3
 SHA512:
-  metadata.gz: 0b0a6fb36088a4a299583325ff7ebe74363efd2587a0ed32ac8769b99ba8937a31b09042277d0349142e19b12bcbb7a16738d53b26b14a4d490261da3eeddad5
-  data.tar.gz: 32e6b77da1e059619c9aca489c6eb7cba8116e2069f79af276646db40b0fd949b4cc82d73eee4d7198e19d5fa5e06b100d3ded0aae644dbe8d6573bf318ba836
+  metadata.gz: c8ea54f52f4f10c8050e181980de4caf16bc5443657c55cf0ce5ef1d20b1a5bca84448515ab502ab79c4bc3eef66b1a199ada9e095304a42c25150ee9d3062fe
+  data.tar.gz: aec32cadf5c60108aba67155731cf5eba9da3dba310f37fa6f6941f04a9e167762bae8953c05b5dfa7c6b096c8fdc44616b42a3f80e910a4cbc2b2e8c438308f

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/comm/local.rb

@@ -9,6 +9,7 @@ require 'rex/socket/udp'
 require 'rex/socket/sctp'
 require 'rex/socket/sctp_server'
 require 'rex/socket/ip'
+require 'rex/socket/proxies'
 require 'timeout'
 
 ###
@@ -353,7 +354,7 @@ class Rex::Socket::Comm::Local
 
   def self.proxy(sock, type, host, port)
     case type.downcase
-    when 'sapni'
+    when Rex::Socket::Proxies::ProxyType::SAPNI
       packet_type = 'NI_ROUTE'
       route_info_version = 2
       ni_version = 39
@@ -422,7 +423,7 @@ class Rex::Socket::Comm::Local
         raise Rex::ConnectionProxyError.new(host, port, type, "Connection to #{host}:#{port} failed (Unknown fail)")
       end
 
-    when 'http'
+    when Rex::Socket::Proxies::ProxyType::HTTP
       setup = "CONNECT #{host}:#{port} HTTP/1.0\r\n\r\n"
       size = sock.put(setup)
       if size != setup.length
@@ -445,7 +446,7 @@ class Rex::Socket::Comm::Local
       if resp.code != 200
         raise Rex::ConnectionProxyError.new(host, port, type, "The proxy returned a non-OK response"), caller
       end
-    when 'socks4'
+    when Rex::Socket::Proxies::ProxyType::SOCKS4
       supports_ipv6 = false
       setup = [4,1,port.to_i].pack('CCn') + Rex::Socket.resolv_nbo(host, supports_ipv6) + Rex::Text.rand_text_alpha(rand(8)+1) + "\x00"
       size = sock.put(setup)
@@ -465,7 +466,7 @@ class Rex::Socket::Comm::Local
       if ret[1,1] != "\x5a"
         raise Rex::ConnectionProxyError.new(host, port, type, "Proxy responded with error code #{ret[0,1].unpack("C")[0]}"), caller
       end
-    when 'socks5'
+    when Rex::Socket::Proxies::ProxyType::SOCKS5
       auth_methods = [5,1,0].pack('CCC')
       size = sock.put(auth_methods)
       if size != auth_methods.length

data/lib/rex/socket/parameters.rb

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 require 'rex/socket'
+require 'rex/socket/proxies'
 
 ###
 #
@@ -163,7 +164,7 @@ class Rex::Socket::Parameters
     end
 
     if hash['Proxies']
-      self.proxies = hash['Proxies'].split(',').map{|a| a.strip}.map{|a| a.split(':').map{|b| b.strip}}
+      self.proxies = Rex::Socket::Proxies.parse(hash['Proxies'])
     end
 
     # The protocol this socket will be using

data/lib/rex/socket/proxies.rb

@@ -0,0 +1,24 @@
+# -*- coding: binary -*-
+
+module Rex
+  module Socket
+    module Proxies
+      module ProxyType
+        SAPNI = 'sapni'
+        HTTP = 'http'
+        SOCKS4 = 'socks4'
+        SOCKS5 = 'socks5'
+      end
+
+      # @param [String,nil] value A proxy chain of format {type:host:port[,type:host:port][...]}
+      # @return [Array] The array of proxies, i.e. {[['type', 'host', 'port']]}
+      def self.parse(value)
+        value.to_s.strip.split(',').map { |a| a.strip }.map { |a| a.split(':').map { |b| b.strip } }
+      end
+
+      def self.supported_types
+        ProxyType.constants.map { |c| ProxyType.const_get(c) }
+      end
+    end
+  end
+end

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.57"
+    VERSION = "0.1.59"
   end
 end

data/lib/rex/socket.rb

@@ -4,6 +4,7 @@ require 'socket'
 require 'thread'
 require 'resolv'
 require 'rex/exceptions'
+require 'dnsruby'
 
 module Rex
 
@@ -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.57
+  version: 0.1.59
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -34,7 +34,7 @@ cert_chain:
   DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
   Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
   -----END CERTIFICATE-----
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-12-05 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
@@ -104,6 +118,7 @@ files:
 - lib/rex/socket/comm/local.rb
 - lib/rex/socket/ip.rb
 - lib/rex/socket/parameters.rb
+- lib/rex/socket/proxies.rb
 - lib/rex/socket/range_walker.rb
 - lib/rex/socket/sctp.rb
 - lib/rex/socket/sctp_server.rb
@@ -137,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: The Ruby Exploitation (Rex) Socket Abstraction Library.