rex-core 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12eeafcdb4a07f89d5bab2bc024f330896c62ab9df2c45eadedeea0a85cfa7cb
-  data.tar.gz: de9d82d23705151fe95b40df2781522110e13d31c9dc9deff2093a8c8ec7c940
+  metadata.gz: 00105f554d3867d9592962e1947385e8a4c24993a282e68aeb783b9577723d18
+  data.tar.gz: '094b794760fc51748acd69ee3eb84e0116e8c70fe62dac39c9369eef7bdb61f6'
 SHA512:
-  metadata.gz: 5b0bcea0b20d319598931bc2a4e8111d940019f22995fe12b84a66856d7835318cfa8ce5ad4e330a4a2100408dfe4cfd615a9cfea552a4215fac1541fa2e4a9a
-  data.tar.gz: b605d32386312678d923c239a9a855c13b9a7137fa249a77ebd96e5a5ce5dc9d0a5c67b3b5280c708eceeb392e43ca937e28f950584d54bcd4af3b0522df0520
+  metadata.gz: d6bfacda21b3c5f5dfdef68f9b82e0dabd703c4f429fa6df3582516babe96876a735c4597f2d52e74a57e8bc769b68db89bc82e751f602e6f99c73601f464b6e
+  data.tar.gz: '0159dd0334f7ac82d5c8df4d09b9b6b27126ae085a0557baf87e1eafd43487d6575d45e995d0f9f46d6bc0dc75585adeb37c2a0393d2bd9260070020be393045'

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.14"
+    VERSION = "0.1.18"
   end
 end

data/lib/rex/exceptions.rb

@@ -145,9 +145,10 @@ end
 #
 ###
 module HostCommunicationError
-  def initialize(addr = nil, port = nil)
-    self.host = addr
-    self.port = port
+  def initialize(addr = nil, port = nil, reason: nil)
+    @host = addr
+    @port = port
+    @reason = reason
   end
 
   #
@@ -156,7 +157,7 @@ module HostCommunicationError
   #
   def addr_to_s
     if host and port
-      "(#{host}:#{port})"
+      host.include?(':') ? "([#{host}]:#{port})" : "(#{host}:#{port})"
     elsif host
       "(#{host})"
     else
@@ -164,7 +165,13 @@ module HostCommunicationError
     end
   end
 
-  attr_accessor :host, :port
+  def to_s
+    str = super
+    str << " #{@reason}" if @reason
+    str
+  end
+
+  attr_accessor :host, :port, :reason
 end
 
 
@@ -186,7 +193,9 @@ end
 ###
 class ConnectionRefused < ConnectionError
   def to_s
-    "The connection was refused by the remote host #{addr_to_s}."
+    str = "The connection was refused by the remote host #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -198,7 +207,9 @@ end
 ###
 class HostUnreachable < ConnectionError
   def to_s
-    "The host #{addr_to_s} was unreachable."
+    str = "The host #{addr_to_s} was unreachable."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -209,7 +220,9 @@ end
 ###
 class ConnectionTimeout < ConnectionError
   def to_s
-    "The connection timed out #{addr_to_s}."
+    str = "The connection with #{addr_to_s} timed out."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -220,18 +233,17 @@ end
 #
 ###
 class InvalidDestination < ConnectionError
-  include SocketError
-  include HostCommunicationError
-
   def to_s
-    "The destination is invalid: #{addr_to_s}."
+    str = "The destination is invalid: #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
 ###
 #
 # This exception is raised when an attempt to use an address or port that is
-# already in use or onot available occurs. such as binding to a host on a
+# already in use or not available occurs. such as binding to a host on a
 # given port that is already in use, or when a bind address is specified that
 # is not available to the host.
 #
@@ -241,7 +253,9 @@ class BindFailed < ::ArgumentError
   include HostCommunicationError
 
   def to_s
-    "The address is already in use or unavailable: #{addr_to_s}."
+    str = "The address is already in use or unavailable: #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 
@@ -255,11 +269,10 @@ end
 #
 ##
 class AddressInUse < ConnectionError
-  include SocketError
-  include HostCommunicationError
-
   def to_s
-    "The address is already in use or unavailable: #{addr_to_s}."
+    str = "The address is already in use or unavailable: #{addr_to_s}."
+    str << " #{@reason}" unless @reason.nil?
+    str
   end
 end
 

data/lib/rex/file.rb

@@ -130,7 +130,7 @@ module Find
     paths.collect!{|d| d.dup}
     while file = paths.shift
       catch(:prune) do
-        yield file.dup.taint
+        yield file.dup
         next unless File.exist? file
         begin
           if File.stat(file).directory? then
@@ -145,7 +145,7 @@ module Find
                 else
                   f = File.join(file, f)
                 end
-                paths.unshift f.untaint
+                paths.unshift f
               end
             ensure
               d.close

data/lib/rex/io/stream.rb

@@ -25,6 +25,22 @@ module Stream
   #
   ##
 
+  #
+  # Initialize synchronization for this stream. This should be used if the
+  # stream will be written to, read or closed from multiple threads.
+  #
+  def initialize_synchronization
+    self.stream_lock = Rex::ReadWriteLock.new
+    self.close_resource = false
+  end
+
+  def close
+    self.close_resource = true
+    synchronize_update {
+      super
+    }
+  end
+
   #
   # This method writes the supplied buffer to the stream.  This method
   # intelligent reduces the size of supplied buffers so that ruby doesn't get
@@ -37,28 +53,31 @@ module Stream
     total_length = buf.length
     block_size   = 32768
 
-    begin
-      while( total_sent < total_length )
-        s = Rex::ThreadSafe.select( nil, [ fd ], nil, 0.2 )
-        if( s == nil || s[0] == nil )
-          next
-        end
-        data = buf[total_sent, block_size]
-        sent = fd.write_nonblock( data )
-        if sent > 0
-          total_sent += sent
+    synchronize_access {
+      begin
+        while( total_sent < total_length )
+          s = Rex::ThreadSafe.select( nil, [ fd ], nil, 0.2 )
+          if( s == nil || s[0] == nil )
+            next
+          end
+          data = buf[total_sent, block_size]
+          sent = fd.write_nonblock( data )
+          if sent > 0
+            total_sent += sent
+          end
         end
+      rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
+        return nil if self.close_resource
+        # Sleep for a half a second, or until we can write again
+        Rex::ThreadSafe.select( nil, [ fd ], nil, 0.5 )
+        # Decrement the block size to handle full sendQs better
+        block_size = 1024
+        # Try to write the data again
+        retry
+      rescue ::IOError, ::Errno::EPIPE
+        return nil
       end
-    rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
-      # Sleep for a half a second, or until we can write again
-      Rex::ThreadSafe.select( nil, [ fd ], nil, 0.5 )
-      # Decrement the block size to handle full sendQs better
-      block_size = 1024
-      # Try to write the data again
-      retry
-    rescue ::IOError, ::Errno::EPIPE
-      return nil
-    end
+    }
 
     total_sent
   end
@@ -67,17 +86,19 @@ module Stream
   # This method reads data of the supplied length from the stream.
   #
   def read(length = nil, opts = {})
-
-    begin
-      return fd.read_nonblock( length )
-    rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
-      # Sleep for a half a second, or until we can read again
-      Rex::ThreadSafe.select( [ fd ], nil, nil, 0.5 )
-      # Decrement the block size to handle full sendQs better
-      retry
-    rescue ::IOError, ::Errno::EPIPE
-      return nil
-    end
+    synchronize_access {
+      begin
+        return fd.read_nonblock( length )
+      rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
+        return nil if self.close_resource
+        # Sleep for a half a second, or until we can read again
+        Rex::ThreadSafe.select( [ fd ], nil, nil, 0.5 )
+        # Decrement the block size to handle full sendQs better
+        retry
+      rescue ::IOError, ::Errno::EPIPE
+        return nil
+      end
+    }
   end
 
   #
@@ -304,8 +325,47 @@ module Stream
     16384
   end
 
+  #
+  # Synchronize non-state changing access to the stream such as read and write
+  # operations. If synchronization has not been initialized, this doesn't do
+  # anything.
+  #
+  def synchronize_access
+    self.stream_lock.lock_read unless self.stream_lock.nil?
+    begin
+      yield
+    ensure
+      self.stream_lock.unlock_read unless self.stream_lock.nil?
+    end
+  end
+
+  #
+  # Synchronize state changing operations to the stream such as closing it.
+  # If synchronization has not been initialized, this doesn't do anything.
+  #
+  def synchronize_update
+    self.stream_lock.lock_write unless self.stream_lock.nil?
+    begin
+      yield
+    ensure
+      self.stream_lock.unlock_write unless self.stream_lock.nil?
+    end
+  end
+
 protected
 
+  #
+  # The read-write lock used to synchronize access to the stream. This is only
+  # set when synchronization has been initialized as performed by
+  # #initialize_synchronization.
+  #
+  attr_accessor :stream_lock
+
+  #
+  # A boolean flag indicating that the resource is to be closed. Blocking
+  # operations that are synchronized (such as #read and #write) should evaluate
+  # this flag and exit appropriately when there is no data to be processed.
+  attr_accessor :close_resource
 end
 
 end end

data/lib/rex/io/stream_abstraction.rb

@@ -19,10 +19,14 @@ module StreamAbstraction
   #
   def initialize_abstraction
     self.lsock, self.rsock = Rex::Socket.tcp_socket_pair()
+
     self.lsock.extend(Rex::IO::Stream)
     self.lsock.extend(Ext)
     self.rsock.extend(Rex::IO::Stream)
 
+    self.lsock.initialize_synchronization
+    self.rsock.initialize_synchronization
+
     self.monitor_rsock("StreamMonitorRemote")
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.18
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake