rex-core 0.1.24 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879343c39c0c1769143a3d0b5c61ce102e26ac898a50e5eec9581bc2bee47c91
-  data.tar.gz: fca03a370a59dc3d03369fb29f47a0fb5e42dcb66db9d6e7b4f3b0824e9620f7
+  metadata.gz: 2aa029e6b51914e6b125525408d3b691ba3b3f3d714a95cc3b5a7759eddda95d
+  data.tar.gz: 7895ffdabf047757db4a42af53cb3d97888bc3756963217a267ad513679a078d
 SHA512:
-  metadata.gz: fda24ae80de4cfda9e66f3bfe45b93bee23e4b35b57bb55f1fca0784721fa333154c8d6972a01594794a3b479e3a07c7809c0911a573b79315dfa8d01148faea
-  data.tar.gz: a6c8d8c2783a611b50f240e664ab2011da5e6ec5d46b3d7353e12cae0e56140f0ec33973fa7d25c0e10226a12b53815bc76fa3de6363678eb6b8e72cc2e7a569
+  metadata.gz: 498bba8dce9ef27f6314affa367949c9a011428e9dabb06ef3a0f56d7a1c00f12321ef31e49b5a9442eed5a39ae3f30fcfecbc1b4c5adf57a3856d4fb3c9dcd4
+  data.tar.gz: bde42deb8d8798570dd5ac6504242194dc0857e88a18c14ccaf50a79ad6f9722f4b3f31dcbd1e75e2bcafcebd17ef159c171121445f4698c9c9a9f2415080574

data/lib/rex/compat.rb

@@ -133,6 +133,7 @@ def self.open_browser(url='http://google.com/')
   when /darwin/
     system("open #{url}")
   when /android/
+    url = "file://#{url}" if url.to_s.start_with?('/')
     system("am start --user 0 -a android.intent.action.VIEW -d #{url}")
   else
     # Search through the PATH variable (if it exists) and chose a browser
@@ -190,6 +191,7 @@ def self.open_webrtc_browser(url='http://google.com/')
       end
     end
   when /android/
+    url = "file://#{url}" if url.to_s.start_with?('/')
     system("am start --user 0 -a android.intent.action.VIEW -d #{url}")
   else
     if defined? ENV['PATH']

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.24"
+    VERSION = "0.1.27"
   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

data/lib/rex/sync/ref.rb

@@ -10,11 +10,38 @@ module Rex
 #
 ###
 module Ref
+  #
+  # Raises a TypeError to prevent cloning.
+  #
+  def clone
+    raise TypeError, "can't clone instance of Ref #{self.class}"
+  end
+
+  #
+  # Raises a TypeError to prevent duping.
+  #
+  def dup
+    raise TypeError, "can't dup instance of Ref #{self.class}"
+  end
+
+  #
+  # Ensures that the Ref is correctly initialized when extended on an object:
+  # ```
+  # arbitrary_resource = Resource.new
+  # arbitrary_resource.extend(::Rex::Ref)
+  # ```
+  #
+  # @param instance [object] the instance that has just extended the Ref module
+  def self.extended(instance)
+    instance.refinit
+  end
 
   #
   # Initializes the reference count to one.
   #
   def refinit
+    return if defined?(@_references)
+
     @_references       = 1
     @_references_mutex = Mutex.new
 

data.tar.gz.sig

@@ -1 +1,3 @@
-cc=�:,ۥq���<NS)�-�'����X)���ݥ��ߋb깋��]w\ܷ�IQ��lG�Z�����t��_ڑ�0
�EY���<.y�\Bn��
+!�@��`���X)�	��
+��b���cpi������G�=M���E~{1���})���U�'��/��B�Тn\�?j���սwNT�f?/l6A�oon�Ad6���}W`5�����w��(6�]�T+�G��ܞ8s=ɼ߾�[VX�%��`�������,���Y�;�R{�|x
+}$Y�󞰸�i-Uj_��&ĚN�x�=G�����컔�r8��m��ޣk�o��0|hM��ݥD�T��n�uL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.27
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake