rex-core 0.1.19 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2bbdcc1a0301230c6fdd17df19375ba3ee885852b14b7096736294539d566b
-  data.tar.gz: f474c211aa36c95dc0dbdf5b05b591d2fd1cc98bd1cec5c877deea37fe2986e2
+  metadata.gz: a0378775512fe632afba68913d5d3eed8fc39ff2eeaf5a849b4101dbbab49026
+  data.tar.gz: 8d2cde8487dcb4c9d2c7102eddd0f5777f9ba6bd67ea58649a8fe8ff03203a4c
 SHA512:
-  metadata.gz: 247e60760168cfaeebce318e982939b6100f7ea2fe278914a11261b9eaf9933db6f5754b1b4afd859ec4aa2d7fb4379065a7505a1d5bae0565b5c10f56d56b4f
-  data.tar.gz: 234380d838b2687ea3b80575f406430daebed9cfd3292be43db94b3ebb6c948a909d309cb6a20901d27daef423179f8ee92c548cd78ed078dcd2a5815d6969cf
+  metadata.gz: 7f88261f6d1982c3b2903224776481a21c16b3336e0c448a934f0daf3b073ae7ebe76f7a6f2e6b5c7aacbd3639a184c559b99c2e8f14091c15a68a3790ba0399
+  data.tar.gz: 42de568303940c9a7a28ccaa19954d21e05e85b204cb0f4febd761dc150d682fbf6f3a76da5bca9804b082dbc2989e3bcb2013aa65294db6271ee7add0e157cd

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-d[>"��6o)��o���:��N�'�v����4��e�
6�&u�͂ב�f$D�	���S)^��
-�aH�V
�
-�Z `�LGt���<�����K��~����{*^��R�}�$0�V?B>rm�RΕI���/&�KM��e͉�
+oUc�)��w>�AǸ��EaĚ%�&�
M9�����g�A�fw�Q$�y�\
+�yI!����)
+�M^������`�t�R��?�)���b��5�D�Y�������������{���
a��{j���P4�������ݘL�����#��P

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.19"
+    VERSION = "0.1.23"
   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/stopwatch.rb

@@ -1,16 +1,21 @@
-module Rex
+module Rex::Stopwatch
 
   # This provides a correct way to time an operation provided within a block.
   #
   # @see https://blog.dnsimple.com/2018/03/elapsed-time-with-ruby-the-right-way/
+  # @see https://ruby-doc.org/core-2.7.1/Process.html#method-c-clock_gettime
+  #
+  # @param [Symbol] unit The unit of time in which to measure the duration. The
+  #   argument is passed to Process.clock_gettime which defines the acceptable
+  #   values.
   #
   # @yield [] The block whose operation should be timed.
   #
-  # @return Returns the result of the block and the elapsed time in seconds.
-  def self.stopwatch
-    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  # @return Returns the result of the block and the elapsed time in the specified unit.
+  def self.elapsed_time(unit: :float_second)
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
     ret = yield
-    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit) - start
 
     [ret, elapsed]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.23
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-11-15 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"