rex-core 0.1.20 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cacc2616718c8056c7ff5ecf2626562f71ac9efd0a6ae69c80cd21565824b666
-  data.tar.gz: e6ed793586462b6cc826be77b533030e45a7bce1ae4fd0bdb2cbaf62ed6e17dd
+  metadata.gz: 879343c39c0c1769143a3d0b5c61ce102e26ac898a50e5eec9581bc2bee47c91
+  data.tar.gz: fca03a370a59dc3d03369fb29f47a0fb5e42dcb66db9d6e7b4f3b0824e9620f7
 SHA512:
-  metadata.gz: a7367cb540a9638f4f64e5756f3c9761e3ebe05f15444ee2d4ae8e6f6af94888f50e2813cc89e7ef3bc7492335f20c31ccc98c8c3ba4b2a55e61995b174c8497
-  data.tar.gz: 4dbd3f07ec237c23ca088bbbdc2f67e2a59bcf5167bcebe841550877fc99f1e81ef3a9c763ddb9c7d8478844676e08ee3f706188c721049be00fbe2b3350ef89
+  metadata.gz: fda24ae80de4cfda9e66f3bfe45b93bee23e4b35b57bb55f1fca0784721fa333154c8d6972a01594794a3b479e3a07c7809c0911a573b79315dfa8d01148faea
+  data.tar.gz: a6c8d8c2783a611b50f240e664ab2011da5e6ec5d46b3d7353e12cae0e56140f0ec33973fa7d25c0e10226a12b53815bc76fa3de6363678eb6b8e72cc2e7a569

data/.github/workflows/verify.yml

@@ -0,0 +1,45 @@
+name: Verify
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 40
+
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby:
+          - 2.6
+          - 2.7
+          - 3.0
+        test_cmd:
+          - bundle exec rspec
+
+    env:
+      RAILS_ENV: test
+
+    name: Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: ${{ matrix.test_cmd }}
+        run: |
+          echo "${CMD}"
+          bash -c "${CMD}"
+        env:
+          CMD: ${{ matrix.test_cmd }}

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.20"
+    VERSION = "0.1.24"
   end
 end

data/lib/rex/io/socket_abstraction.rb

@@ -4,202 +4,192 @@ require 'socket'
 require 'fcntl'
 
 module Rex
-module IO
-
-###
-#
-# This class provides an abstraction to a stream based
-# connection through the use of a streaming socketpair.
-#
-###
-module SocketAbstraction
-
-  ###
-  #
-  # Extension information for required Stream interface.
-  #
-  ###
-  module Ext
-
-    #
-    # Initializes peer information.
+  module IO
+    ###
     #
-    def initinfo(peer,local)
-      @peer = peer
-      @local = local
-    end
-
+    # This class provides an abstraction to a stream based
+    # connection through the use of a streaming socketpair.
     #
-    # Symbolic peer information.
-    #
-    def peerinfo
-      (@peer || "Remote Pipe")
-    end
+    ###
+    module SocketAbstraction
+      ###
+      #
+      # Extension information for required Stream interface.
+      #
+      ###
+      module Ext
+        #
+        # Initializes peer information.
+        #
+        def initinfo(peer, local)
+          @peer = peer
+          @local = local
+        end
 
-    #
-    # Symbolic local information.
-    #
-    def localinfo
-      (@local || "Local Pipe")
-    end
-  end
-
-  #
-  # Override this method to init the abstraction
-  #
-  def initialize_abstraction
-    self.lsock, self.rsock = Rex::Compat.pipe
-  end
-
-  #
-  # This method cleans up the abstraction layer.
-  #
-  def cleanup_abstraction
-    self.lsock.close if (self.lsock and !self.lsock.closed?)
-    self.rsock.close if (self.rsock and !self.rsock.closed?)
-
-    self.lsock = nil
-    self.rsock = nil
-  end
-
-  #
-  # Low-level write to the local side.
-  #
-  def syswrite(buffer)
-    lsock.syswrite(buffer)
-  end
-
-  #
-  # Low-level read from the local side.
-  #
-  def sysread(length)
-    lsock.sysread(length)
-  end
-
-  #
-  # Shuts down the local side of the stream abstraction.
-  #
-  def shutdown(how)
-    lsock.shutdown(how)
-  end
-
-  #
-  # Closes both sides of the stream abstraction.
-  #
-  def close
-    cleanup_abstraction
-    super
-  end
-
-  #
-  # Symbolic peer information.
-  #
-  def peerinfo
-    "Remote-side of Pipe"
-  end
-
-  #
-  # Symbolic local information.
-  #
-  def localinfo
-    "Local-side of Pipe"
-  end
-
-  #
-  # The left side of the stream.
-  #
-  attr_reader :lsock
-  #
-  # The right side of the stream.
-  #
-  attr_reader :rsock
-
-protected
-
-  def monitor_rsock(threadname = "SocketMonitorRemote")
-    self.monitor_thread = Rex::ThreadFactory.spawn(threadname, false) {
-      loop do
-        closed = false
-        buf    = nil
-
-        if not self.rsock
-          wlog("monitor_rsock: the remote socket is nil, exiting loop")
-          break
+        #
+        # Symbolic peer information.
+        #
+        def peerinfo
+          (@peer || 'Remote Pipe')
         end
 
-        begin
-          s = Rex::ThreadSafe.select( [ self.rsock ], nil, nil, 0.2 )
-          if( s == nil || s[0] == nil )
-            next
-          end
-        rescue Exception => e
-          wlog("monitor_rsock: exception during select: #{e.class} #{e}")
-          closed = true
+        #
+        # Symbolic local information.
+        #
+        def localinfo
+          (@local || 'Local Pipe')
         end
+      end
 
-        if( closed == false )
-          begin
-            buf = self.rsock.sysread( 32768 )
-            if buf == nil
-              closed = true
-              wlog("monitor_rsock: closed remote socket due to nil read")
+      #
+      # Override this method to init the abstraction
+      #
+      def initialize_abstraction
+        self.lsock, self.rsock = Rex::Compat.pipe
+      end
+
+      #
+      # This method cleans up the abstraction layer.
+      #
+      def cleanup_abstraction
+        lsock.close if lsock and !lsock.closed?
+        rsock.close if rsock and !rsock.closed?
+
+        self.lsock = nil
+        self.rsock = nil
+      end
+
+      #
+      # Low-level write to the local side.
+      #
+      def syswrite(buffer)
+        lsock.syswrite(buffer)
+      end
+
+      #
+      # Low-level read from the local side.
+      #
+      def sysread(length)
+        lsock.sysread(length)
+      end
+
+      #
+      # Shuts down the local side of the stream abstraction.
+      #
+      def shutdown(how)
+        lsock.shutdown(how)
+      end
+
+      #
+      # Closes both sides of the stream abstraction.
+      #
+      def close
+        cleanup_abstraction
+        super
+      end
+
+      #
+      # Symbolic peer information.
+      #
+      def peerinfo
+        'Remote-side of Pipe'
+      end
+
+      #
+      # Symbolic local information.
+      #
+      def localinfo
+        'Local-side of Pipe'
+      end
+
+      #
+      # The left side of the stream.
+      #
+      attr_reader :lsock
+      #
+      # The right side of the stream.
+      #
+      attr_reader :rsock
+
+      protected
+
+      def monitor_rsock(threadname = 'SocketMonitorRemote')
+        self.monitor_thread = Rex::ThreadFactory.spawn(threadname, false) do
+          loop do
+            closed = false
+            buf = nil
+
+            unless rsock
+              wlog('monitor_rsock: the remote socket is nil, exiting loop')
+              break
             end
-          rescue EOFError => e
-            closed = true
-            dlog("monitor_rsock: EOF in rsock")
-          rescue ::Exception => e
-            closed = true
-            wlog("monitor_rsock: exception during read: #{e.class} #{e}")
-          end
-        end
 
-        if( closed == false )
-          total_sent   = 0
-          total_length = buf.length
-          while( total_sent < total_length )
             begin
-              data = buf[total_sent, buf.length]
-
-              # Note that this must be write() NOT syswrite() or put() or anything like it.
-              # Using syswrite() breaks SSL streams.
-              sent = self.write( data )
+              s = Rex::ThreadSafe.select([rsock], nil, nil, 0.2)
+              next if s.nil? || s[0].nil?
+            rescue Exception => e
+              wlog("monitor_rsock: exception during select: #{e.class} #{e}")
+              closed = true
+            end
 
-              # sf: Only remove the data off the queue is write was successfull.
-              #     This way we naturally perform a resend if a failure occured.
-              #     Catches an edge case with meterpreter TCP channels where remote send
-              #     failes gracefully and a resend is required.
-              if (sent.nil?)
+            unless closed
+              begin
+                buf = rsock.sysread(32_768)
+                if buf.nil?
+                  closed = true
+                  wlog('monitor_rsock: closed remote socket due to nil read')
+                end
+              rescue EOFError => e
                 closed = true
-                wlog("monitor_rsock: failed writing, socket must be dead")
-                break
-              elsif (sent > 0)
-                total_sent += sent
+                dlog('monitor_rsock: EOF in rsock')
+              rescue ::Exception => e
+                closed = true
+                wlog("monitor_rsock: exception during read: #{e.class} #{e}")
               end
-            rescue ::IOError, ::EOFError => e
-              closed = true
-              wlog("monitor_rsock: exception during write: #{e.class} #{e}")
-              break
             end
-          end
-        end
 
-        if( closed )
-          begin
-            self.close_write if self.respond_to?('close_write')
-          rescue IOError
+            unless closed
+              total_sent = 0
+              total_length = buf.length
+              while total_sent < total_length
+                begin
+                  data = buf[total_sent, buf.length]
+
+                  # Note that this must be write() NOT syswrite() or put() or anything like it.
+                  # Using syswrite() breaks SSL streams.
+                  sent = write(data)
+
+                  # sf: Only remove the data off the queue is write was successfull.
+                  #     This way we naturally perform a resend if a failure occured.
+                  #     Catches an edge case with meterpreter TCP channels where remote send
+                  #     failes gracefully and a resend is required.
+                  if sent.nil?
+                    closed = true
+                    wlog('monitor_rsock: failed writing, socket must be dead')
+                    break
+                  elsif sent > 0
+                    total_sent += sent
+                  end
+                rescue ::IOError, ::EOFError => e
+                  closed = true
+                  wlog("monitor_rsock: exception during write: #{e.class} #{e}")
+                  break
+                end
+              end
+            end
+
+            next unless closed
+
+            begin
+              close_write if respond_to?('close_write')
+            rescue IOError
+            end
+            break
           end
-          break
         end
       end
-    }
-  end
-
-protected
-  attr_accessor :monitor_thread
-  attr_writer :lsock
-  attr_writer :rsock
-
-end
-
-end; end
 
+      attr_accessor :monitor_thread
+      attr_writer :lsock, :rsock
+    end
+  end; end

data/lib/rex/io/stream_server.rb

@@ -1,228 +1,208 @@
 # -*- coding: binary -*-
-require 'thread'
 
 module Rex
-module IO
-
-###
-#
-# This mixin provides the framework and interface for implementing a streaming
-# server that can listen for and accept stream client connections.  Stream
-# servers extend this class and are required to implement the following
-# methods:
-#
-#   accept
-#   fd
-#
-###
-module StreamServer
-
-  ##
-  #
-  # Abstract methods
-  #
-  ##
-
-  ##
-  #
-  # Default server monitoring and client management implementation follows
-  # below.
-  #
-  ##
-
-  #
-  # This callback is notified when a client connects.
-  #
-  def on_client_connect(client)
-    if (on_client_connect_proc)
-      on_client_connect_proc.call(client)
-    end
-  end
-
-  #
-  # This callback is notified when a client connection has data that needs to
-  # be processed.
-  #
-  def on_client_data(client)
-    if (on_client_data_proc)
-      on_client_data_proc.call(client)
-    end
-  end
-
-  #
-  # This callback is notified when a client connection has closed.
-  #
-  def on_client_close(client)
-    if (on_client_close_proc)
-      on_client_close_proc.call(client)
-    end
-  end
-
-  #
-  # Start monitoring the listener socket for connections and keep track of
-  # all client connections.
-  #
-  def start
-    self.clients = []
-    self.client_waiter = ::Queue.new
-
-    self.listener_thread = Rex::ThreadFactory.spawn("StreamServerListener", false) {
-      monitor_listener
-    }
-    self.clients_thread = Rex::ThreadFactory.spawn("StreamServerClientMonitor", false) {
-      monitor_clients
-    }
-  end
-
-  #
-  # Terminates the listener monitoring threads and closes all active clients.
-  #
-  def stop
-    self.listener_thread.kill
-    self.clients_thread.kill
-
-    self.clients.each { |cli|
-      close_client(cli)
-    }
-  end
+  module IO
+    ###
+    #
+    # This mixin provides the framework and interface for implementing a streaming
+    # server that can listen for and accept stream client connections.  Stream
+    # servers extend this class and are required to implement the following
+    # methods:
+    #
+    #   accept
+    #   fd
+    #
+    ###
+    module StreamServer
+      ##
+      #
+      # Abstract methods
+      #
+      ##
+
+      ##
+      #
+      # Default server monitoring and client management implementation follows
+      # below.
+      #
+      ##
+
+      #
+      # This callback is notified when a client connects.
+      #
+      def on_client_connect(client)
+        on_client_connect_proc.call(client) if on_client_connect_proc
+      end
 
-  #
-  # This method closes a client connection and cleans up the resources
-  # associated with it.
-  #
-  def close_client(client)
-    if (client)
-      detach_client(client)
-
-      begin
-        client.close
-      rescue IOError
+      #
+      # This callback is notified when a client connection has data that needs to
+      # be processed.
+      #
+      def on_client_data(client)
+        on_client_data_proc.call(client) if on_client_data_proc
       end
-    end
-  end
 
-  #
-  # Detach a client. You are now responsible for it, not us
-  #
-  def detach_client(client)
-    self.clients.delete(client)
-  end
+      #
+      # This callback is notified when a client connection has closed.
+      #
+      def on_client_close(client)
+        on_client_close_proc.call(client) if on_client_close_proc
+      end
 
-  #
-  # This method waits on the server listener thread
-  #
-  def wait
-    self.listener_thread.join if self.listener_thread
-  end
+      #
+      # Start monitoring the listener socket for connections and keep track of
+      # all client connections.
+      #
+      def start
+        self.clients = []
+        self.client_waiter = ::Queue.new
 
-  ##
-  #
-  # Callback procedures.
-  #
-  ##
-
-  #
-  # This callback procedure can be set and will be called when new clients
-  # connect.
-  #
-  attr_accessor :on_client_connect_proc
-  #
-  # This callback procedure can be set and will be called when clients
-  # have data to be processed.
-  #
-  attr_accessor :on_client_data_proc
-  #
-  # This callback procedure can be set and will be called when a client
-  # disconnects from the server.
-  #
-  attr_accessor :on_client_close_proc
-
-  attr_accessor :clients # :nodoc:
-  attr_accessor :listener_thread, :clients_thread # :nodoc:
-  attr_accessor :client_waiter
-
-protected
-
-  #
-  # This method monitors the listener socket for new connections and calls
-  # the +on_client_connect+ callback routine.
-  #
-  def monitor_listener
-
-    while true
-      begin
-        cli = accept
-        if not cli
-          elog("The accept() returned nil in stream server listener monitor:  #{fd.inspect}")
-          ::IO.select(nil, nil, nil, 0.10)
-          next
+        self.listener_thread = Rex::ThreadFactory.spawn('StreamServerListener', false) do
+          monitor_listener
         end
+        self.clients_thread = Rex::ThreadFactory.spawn('StreamServerClientMonitor', false) do
+          monitor_clients
+        end
+      end
 
-        # Append to the list of clients
-        self.clients << cli
+      #
+      # Terminates the listener monitoring threads and closes all active clients.
+      #
+      def stop
+        listener_thread.kill
+        clients_thread.kill
 
-        # Initialize the connection processing
-        on_client_connect(cli)
+        clients.each do |cli|
+          close_client(cli)
+        end
+      end
 
-        # Notify the client monitor
-        self.client_waiter.push(cli)
+      #
+      # This method closes a client connection and cleans up the resources
+      # associated with it.
+      #
+      def close_client(client)
+        if client
+          detach_client(client)
+
+          begin
+            client.close
+          rescue IOError
+          end
+        end
+      end
 
-      # Skip exceptions caused by accept() [ SSL ]
-      rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
-      rescue ::Interrupt
-        raise $!
-      rescue ::Exception
-        elog("Error in stream server server monitor: #{$!}")
-        rlog(ExceptionCallStack)
-        break
+      #
+      # Detach a client. You are now responsible for it, not us
+      #
+      def detach_client(client)
+        clients.delete(client)
       end
-    end
-  end
 
-  #
-  # This method monitors client connections for data and calls the
-  # +on_client_data+ routine when new data arrives.
-  #
-  def monitor_clients
-    begin
-
-      # Wait for a notify if our client list is empty
-      if (clients.length == 0)
-        self.client_waiter.pop
-        next
+      #
+      # This method waits on the server listener thread
+      #
+      def wait
+        listener_thread.join if listener_thread
       end
 
-      sd = Rex::ThreadSafe.select(clients, nil, nil, nil)
+      ##
+      #
+      # Callback procedures.
+      #
+      ##
+
+      #
+      # This callback procedure can be set and will be called when new clients
+      # connect.
+      #
+      attr_accessor :on_client_connect_proc
+      #
+      # This callback procedure can be set and will be called when clients
+      # have data to be processed.
+      #
+      attr_accessor :on_client_data_proc
+      #
+      # This callback procedure can be set and will be called when a client
+      # disconnects from the server.
+      #
+      attr_accessor :on_client_close_proc
+
+      attr_accessor :clients, :listener_thread, :clients_thread, :client_waiter # :nodoc: # :nodoc:
+
+      protected
+
+      #
+      # This method monitors the listener socket for new connections and calls
+      # the +on_client_connect+ callback routine.
+      #
+      def monitor_listener
+        while true
+          begin
+            cli = accept
+            unless cli
+              elog("The accept() returned nil in stream server listener monitor:  #{fd.inspect}")
+              ::IO.select(nil, nil, nil, 0.10)
+              next
+            end
+
+            # Append to the list of clients
+            clients << cli
+
+            # Initialize the connection processing
+            on_client_connect(cli)
+
+            # Notify the client monitor
+            client_waiter.push(cli)
+
+          # Skip exceptions caused by accept() [ SSL ]
+          rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
+          rescue ::Interrupt
+            raise $!
+          rescue ::Exception
+            elog("Error in stream server server monitor: #{$!}")
+            rlog(ExceptionCallStack)
+            break
+          end
+        end
+      end
 
-      sd[0].each { |cfd|
+      #
+      # This method monitors client connections for data and calls the
+      # +on_client_data+ routine when new data arrives.
+      #
+      def monitor_clients
         begin
-          on_client_data(cfd) if clients.include? cfd
-        rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
-          on_client_close(cfd)
-          close_client(cfd)
+          # Wait for a notify if our client list is empty
+          if clients.length == 0
+            client_waiter.pop
+            next
+          end
+
+          sd = Rex::ThreadSafe.select(clients, nil, nil, nil)
+
+          sd[0].each do |cfd|
+            on_client_data(cfd) if clients.include? cfd
+          rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
+            on_client_close(cfd)
+            close_client(cfd)
+          rescue ::Interrupt
+            raise $!
+          rescue ::Exception
+            close_client(cfd)
+            elog("Error in stream server client monitor: #{$!}")
+            rlog(ExceptionCallStack)
+          end
+        rescue ::Rex::StreamClosedError => e
+          # Remove the closed stream from the list
+          detach_client(e.stream)
         rescue ::Interrupt
           raise $!
         rescue ::Exception
-          close_client(cfd)
           elog("Error in stream server client monitor: #{$!}")
           rlog(ExceptionCallStack)
-
-        end
-      }
-
-    rescue ::Rex::StreamClosedError => e
-      # Remove the closed stream from the list
-      detach_client(e.stream)
-    rescue ::Interrupt
-      raise $!
-    rescue ::Exception
-      elog("Error in stream server client monitor: #{$!}")
-      rlog(ExceptionCallStack)
-    end while true
+        end while true
+      end
+    end
   end
-
 end
-
-end
-end
-

data.tar.gz.sig

@@ -1 +1 @@
-��.�bU��P"���Mjf�c`��a�Mہ��Z��]��ǒ	mGOF���f���U^��
+cc=�:,ۥq���<NS)�-�'����X)���ݥ��ߋb깋��]w\ܷ�IQ��lG�Z�����t��_ڑ�0
�EY���<.y�\Bn��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.24
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,6 +132,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/verify.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"