rex-socket 0.1.52 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a97cac39e77ee44665aa30e9b9d5d30fa490c1cbb0909cfeda49bce7ca1414
-  data.tar.gz: 3e76c09d2320265208f8a91c8bd93730d4d4698d1940b8a654d7ec553c008b6d
+  metadata.gz: 0d6178ec17a488e30e67e5f38c47a37ef101779a01819acc9fe5f0e77e21137a
+  data.tar.gz: 850e34b302ac851ef01ed341fdb361e60c6256a3be7ebec6f52398046884b041
 SHA512:
-  metadata.gz: 475846de509a2f145142566a729b7fa4bf1d67d0d993c2cff20edb2bf7418c64930136d5e34f8a05a717da610c3dc734d4b631cb66611d3725a173f53a6d3001
-  data.tar.gz: 355abe15808629534099238aad2fee65e4588573108aa4307aa6bc45b1addca4bc6422d48bb77b288945d8b33956be4503a842f74f8e14c0ecc283fcaa45ca9b
+  metadata.gz: 0e6be5fbc26e756be673e373c521ddac5b1b98a999ee5c78d9d9d009a68d9de1d5a40f2915ebb226a0349c4dd097d76779c2181396be31756f2a95c77f0fabff
+  data.tar.gz: 9bcd47ba675dd95f6eb4d5164e94ed5c82d1ac0f36513a20b2c77a37089f6a3cbe0705027ad363e153a700e45e9493b449e6659dc73e6256d20e83188e15c089

data/.github/workflows/verify.yml

@@ -30,7 +30,7 @@ jobs:
     timeout-minutes: 40
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         ruby:
           - '2.7'
@@ -39,20 +39,20 @@ jobs:
           - '3.2'
         os:
           - ubuntu-20.04
+          - windows-2019
+          - macos-11
           - ubuntu-latest
         exclude:
           - { os: ubuntu-latest, ruby: '2.7' }
           - { os: ubuntu-latest, ruby: '3.0' }
-        test_cmd:
-          - bundle exec rspec
 
     env:
       RAILS_ENV: test
 
-    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -60,9 +60,6 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: ${{ matrix.test_cmd }}
+      - name: rspec
         run: |
-          echo "${CMD}"
-          bash -c "${CMD}"
-        env:
-          CMD: ${{ matrix.test_cmd }}
+          bundle exec rspec

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.52"
+    VERSION = "0.1.54"
   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
 
   #
@@ -665,37 +672,57 @@ module Socket
   #       is no concurrent use of the same locals and this is safe.
   def self.tcp_socket_pair
     lsock   = nil
+    last_child_error = nil
+    accept_timeout = 10
     rsock   = nil
     laddr   = '127.0.0.1'
     lport   = 0
     threads = []
     mutex   = ::Mutex.new
 
-    threads << Rex::ThreadFactory.spawn('TcpSocketPair', false) {
+    threads << Rex::ThreadFactory.spawn('TcpSocketPair', false) do
       server = nil
-      mutex.synchronize {
-        threads << Rex::ThreadFactory.spawn('TcpSocketPairClient', false) {
-          mutex.synchronize {
-            rsock = ::TCPSocket.new( laddr, lport )
-          }
-        }
-        server = ::TCPServer.new(laddr, 0)
-        if (server.getsockname =~ /127\.0\.0\.1:/)
-          # JRuby ridiculousness
-          caddr, lport = server.getsockname.split(":")
-          caddr = caddr[1,caddr.length]
-          lport = lport.to_i
+      begin
+        mutex.synchronize do
+          threads << Rex::ThreadFactory.spawn('TcpSocketPairClient', false) do
+            mutex.synchronize do
+              begin
+                rsock = ::TCPSocket.new( laddr, lport )
+              rescue => e
+                last_child_error = "#{e.class} - #{e.message}"
+                raise
+              end
+            end
+          end
+          server = ::TCPServer.new(laddr, 0)
+          if (server.getsockname =~ /127\.0\.0\.1:/)
+            # JRuby ridiculousness
+            caddr, lport = server.getsockname.split(":")
+            caddr = caddr[1,caddr.length]
+            lport = lport.to_i
+          else
+            # Sane implementations where Socket#getsockname returns a
+            # sockaddr
+            lport, caddr = ::Socket.unpack_sockaddr_in( server.getsockname )
+          end
+        end
+
+        readable, _writable, _errors = ::IO.select([server], nil, nil, accept_timeout)
+        if readable && readable.any?
+          lsock, _ = server.accept_nonblock
         else
-          # Sane implementations where Socket#getsockname returns a
-          # sockaddr
-          lport, caddr = ::Socket.unpack_sockaddr_in( server.getsockname )
+          raise RuntimeError, "rsock didn't connect in #{accept_timeout} seconds"
         end
-      }
-      lsock, _ = server.accept
-      server.close
-    }
+      ensure
+        server.close if server
+      end
+    end
 
-    threads.each { |t| t.join }
+    threads.each.with_index do |thread, i|
+      thread.join
+    rescue => e
+      raise "Thread #{i} - error #{e} - last child error: #{last_child_error}"
+    end
 
     return [lsock, rsock]
   end
@@ -719,6 +746,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 +880,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

data.tar.gz.sig

@@ -1 +1,3 @@
-+�Sl��N���ϱ`.e��	,Smt�mB��bvh����WQ�%�׆�����(y\�ԯ.��OW=�q���� �O刣�9�#�;���a%;(�����E!���dҨmZ��$�jI;0���G��|Z�$ID4��4|��s�|0�U�\5C�2 �����u�.���z���8��Q���Eڵ�_c1pjq�,%Z��vLI���ý�
N�&�����DI�������ӓ(!-���W�E��'�-�
+|
+�$�I(��p�x�Z��}����=;;�7���6pdN؊���m��sJ���3���!Aʊ!�Lo
+��U#&ܮ��}�a<M�5)1]#��G����M��>�ʹA��2v(�j��^��κ�����C��H)ު������l�`Vy���u�������"fӉwFQ�Yߒ
�F�z��̆�T�|�9���`�H̒��(��Jע

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.52
+  version: 0.1.54
 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-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake