rex-core 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879343c39c0c1769143a3d0b5c61ce102e26ac898a50e5eec9581bc2bee47c91
-  data.tar.gz: fca03a370a59dc3d03369fb29f47a0fb5e42dcb66db9d6e7b4f3b0824e9620f7
+  metadata.gz: 92383c2b5e9cf999abfc198c12992d176cfdf262fbd782886ef1ea1a705f2fd6
+  data.tar.gz: 584ffd804e8c5b1d3b96c5cf90580553fb12513c958362d93238cf92545c7184
 SHA512:
-  metadata.gz: fda24ae80de4cfda9e66f3bfe45b93bee23e4b35b57bb55f1fca0784721fa333154c8d6972a01594794a3b479e3a07c7809c0911a573b79315dfa8d01148faea
-  data.tar.gz: a6c8d8c2783a611b50f240e664ab2011da5e6ec5d46b3d7353e12cae0e56140f0ec33973fa7d25c0e10226a12b53815bc76fa3de6363678eb6b8e72cc2e7a569
+  metadata.gz: fc7aa81e629107d66ceefdee7fcde2f7620fd95aff8bb2f163eacd31387835e84f123bdda4666b5e4c6a3390db5a9ddb4a55e8a15850c670ad0610c479ac2816
+  data.tar.gz: 5d4b2fd53ec1cb320a5d503d97ff4f478f330368f98c3230cc1918edf1d07a9f950c2bef7d0210074e52ce1ee16097f3e32703b4476cd16d7d3edb651c26e35e

data/lib/rex/core/version.rb

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

data/lib/rex/io/socket_abstraction.rb

@@ -53,6 +53,9 @@ module Rex
       #
       def cleanup_abstraction
         lsock.close if lsock and !lsock.closed?
+
+        monitor_thread.join if monitor_thread&.alive?
+
         rsock.close if rsock and !rsock.closed?
 
         self.lsock = nil
@@ -111,19 +114,36 @@ module Rex
       #
       attr_reader :rsock
 
+      module MonitoredRSock
+        def close
+          @close_requested = true
+          @monitor_thread.join
+          nil
+        end
+
+        def sysclose
+          self.class.instance_method(:close).bind(self).call
+        end
+
+        attr_reader :close_requested
+        attr_writer :monitor_thread
+      end
+
       protected
 
       def monitor_rsock(threadname = 'SocketMonitorRemote')
-        self.monitor_thread = Rex::ThreadFactory.spawn(threadname, false) do
+        rsock.extend(MonitoredRSock)
+        rsock.monitor_thread = self.monitor_thread = Rex::ThreadFactory.spawn(threadname, false) do
           loop do
-            closed = false
-            buf = nil
+            closed = rsock.nil? || rsock.close_requested
 
-            unless rsock
-              wlog('monitor_rsock: the remote socket is nil, exiting loop')
+            if closed
+              wlog('monitor_rsock: the remote socket has been closed, exiting loop')
               break
             end
 
+            buf = nil
+
             begin
               s = Rex::ThreadSafe.select([rsock], nil, nil, 0.2)
               next if s.nil? || s[0].nil?
@@ -159,10 +179,10 @@ module Rex
                   # 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.
+                  # sf: Only remove the data off the queue is write was successful.
+                  #     This way we naturally perform a resend if a failure occurred.
                   #     Catches an edge case with meterpreter TCP channels where remote send
-                  #     failes gracefully and a resend is required.
+                  #     fails gracefully and a resend is required.
                   if sent.nil?
                     closed = true
                     wlog('monitor_rsock: failed writing, socket must be dead')
@@ -182,14 +202,18 @@ module Rex
 
             begin
               close_write if respond_to?('close_write')
-            rescue IOError
+            rescue StandardError
             end
+
             break
           end
+
+          rsock.sysclose
         end
       end
 
       attr_accessor :monitor_thread
       attr_writer :lsock, :rsock
     end
-  end; end
+  end
+end

data/lib/rex/io/stream_server.rb

@@ -141,7 +141,7 @@ module Rex
           begin
             cli = accept
             unless cli
-              elog("The accept() returned nil in stream server listener monitor:  #{fd.inspect}")
+              elog('The accept() returned nil in stream server listener monitor')
               ::IO.select(nil, nil, nil, 0.10)
               next
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Metasploit Hackers