rex-core 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12eeafcdb4a07f89d5bab2bc024f330896c62ab9df2c45eadedeea0a85cfa7cb
-  data.tar.gz: de9d82d23705151fe95b40df2781522110e13d31c9dc9deff2093a8c8ec7c940
+  metadata.gz: 30d6d74b1603e11dd926c24e867db559a88c9294fc1b4dc88559d66366928044
+  data.tar.gz: 7484592c2f3429b4481700937395ae6f0457b61fdddaf4abd9b780ebfff1de85
 SHA512:
-  metadata.gz: 5b0bcea0b20d319598931bc2a4e8111d940019f22995fe12b84a66856d7835318cfa8ce5ad4e330a4a2100408dfe4cfd615a9cfea552a4215fac1541fa2e4a9a
-  data.tar.gz: b605d32386312678d923c239a9a855c13b9a7137fa249a77ebd96e5a5ce5dc9d0a5c67b3b5280c708eceeb392e43ca937e28f950584d54bcd4af3b0522df0520
+  metadata.gz: '0698ecc78c85cb0497065dc82521be98a264784e4e76951d24ac36d82ab7f3a3e7ade7c6993127e1db1513157826edfd137dfe33d4ca71fa139088235f5694c6'
+  data.tar.gz: 1b819f79ced4a1656120ceeca644d4a634b5e54923bc3c2887edf76b9e28ed1e4de85c917ffeeef4cce5c239913b398492ba4b3f20f058700ad2b5fc9304427c

data/lib/rex/core/version.rb

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

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
 
   #
@@ -306,6 +327,45 @@ module Stream
 
 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
+
+  #
+  # 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
 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.15
 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-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1 +1 @@
-vidN��G����4�E
��
+
�
]��q���Oc���|����`_����� ���u�n�΃w�&?���;󢜒��q�