rex-core 0.1.35 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722c1d73aa2712e77940801d1f02e44565e0234944e7c50d8d82f6db845bce0f
-  data.tar.gz: 295ecbe54da2c7b54f6f19b7c8676140fcb2f18dcc660eaedfef7aa3c5633b9a
+  metadata.gz: c1b69ef9a2e48921a8f6102041c3ee29b4de5004e74874966827cc6707d0eb13
+  data.tar.gz: e6b9f06e4e58e33e448b4119e337bcc36a1a23724655119ffef9dba983c910b1
 SHA512:
-  metadata.gz: e2e5510ad24f1770fb127efd2cee8b0b08653be57eb15b7c44e51ef03a1fc6d23c5636259c632544a1d7ed17fa08dca289ee2dc3161c730803ab852a63ec677f
-  data.tar.gz: a5998d868389e099d9108dcdf9a4f86d0e91b6053f2cc3cb2fea75e84e3f5ddfa86136d018f70cd150817e86d12a455f4bce9ddcf0794f1ab512a64c606c4f40
+  metadata.gz: fbda8aea3da6fd99b2a80ffb0164d3af1f156f1b36823ed5e3816bd65583b280e7d51651a5f89d9702cdb5fe8b086d9393e8ece32606b89a7cd2822a6ad34b25
+  data.tar.gz: e521512ef7be86e68d46afb39497c2d128033a5642140327a7d723b391dc848a40579112c2c2a7d8acea12ab8a7b8f7a5bf79510f489f50094c1725588adaa37

data/lib/rex/core/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Core
-    VERSION = "0.1.35"
+    VERSION = "0.1.37"
   end
 end

data/lib/rex/io/fiber_scheduler.rb

@@ -15,29 +15,25 @@ module IO
       @ready = []
       @pending = []
       @blocking = 0
-      @urgent = Rex::Compat.pipe
+      @urgent = nil
       @mutex = Mutex.new
     end
 
     # This allows the fiber to be scheduled in the #run thread from another thread
     def schedule_fiber(&block)
       @mutex.synchronize do
+        @urgent ||= Rex::Compat.pipe
         @pending << block
+        # Wake up the scheduler while holding the same lock used by #reset! so
+        # the signaling pipe cannot be replaced between lookup and write.
+        @urgent.last.write_nonblock('.', exception: false)
       end
-      # Wake up the scheduler
-      @urgent.last.write_nonblock('.') rescue nil
     end
 
     def run
       while @readable.any? or @writable.any? or @waiting.any? or @blocking.positive? or @ready.any? or @pending.any?
         # Start any pending fibers
-        pending_blocks = []
-        @mutex.synchronize do
-          pending_blocks = @pending.dup
-          @pending.clear
-        end
-
-        pending_blocks.each do |block|
+        while (block = @mutex.synchronize { @pending.shift })
           fiber = Fiber.new(blocking: false, &block)
           fiber.resume
         end
@@ -75,8 +71,7 @@ module IO
           end
         end
 
-        ready, @ready = @ready, []
-        ready.each do |fiber|
+        while (fiber = @mutex.synchronize { @ready.shift })
           fiber.resume
         end
       end
@@ -118,19 +113,52 @@ module IO
     end
 
     def unblock(blocker, fiber)
-      @ready << fiber
-      io = @urgent.last
-      io.write_nonblock('.')
+      @mutex.synchronize do
+        return false unless @urgent
+
+        @ready << fiber
+        @urgent.last.write_nonblock('.', exception: false)
+      end
     end
 
     def close
-      run
-      @urgent.each(&:close)
-      @urgent = nil
+      first_error = nil
+
+      loop do
+        begin
+          run
+          break
+        rescue StandardError => e
+          first_error ||= e
+          break unless work_pending?
+        end
+      end
+
+      raise first_error if first_error
+    ensure
+      close_urgent_pipe
     end
 
     def closed?
-      @urgent.nil?
+      @mutex.synchronize { @urgent.nil? }
+    end
+
+    def work_pending?
+      @mutex.synchronize do
+        @readable.any? || @writable.any? || @waiting.any? || @blocking.positive? || @ready.any? || @pending.any?
+      end
+    end
+
+    def reset!
+      @mutex.synchronize do
+        @readable.clear
+        @writable.clear
+        @waiting.clear
+        @ready.clear
+        @pending.clear
+        @blocking = 0
+        close_urgent_pipe_without_lock
+      end
     end
 
     def fiber(&block)
@@ -141,6 +169,15 @@ module IO
 
     private
 
+    def close_urgent_pipe
+      @mutex.synchronize { close_urgent_pipe_without_lock }
+    end
+
+    def close_urgent_pipe_without_lock
+      @urgent&.each { |io| io.close unless io.closed? }
+      @urgent = nil
+    end
+
     def current_time
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
@@ -153,4 +190,4 @@ module IO
   end
 
 end
-end
+end

data/lib/rex/io/relay_manager.rb

@@ -11,6 +11,10 @@ class RelayManager
   def initialize
     @thread = nil
     @scheduler = FiberScheduler.new
+    @mutex = Mutex.new
+    @teardown_condition = ConditionVariable.new
+    @tearing_down = false
+    @running = false
   end
 
   # Add a IO relay to the manager. This will start relaying data from the source
@@ -26,11 +30,24 @@ class RelayManager
   # @param name [String] A human-friendly name for the relay used in debug output.
   # @param on_exit [#call] A callback to be invoked when sink can no longer be read from.
   def add_relay(sock, sink: nil, name: nil, on_exit: nil)
-    @scheduler.schedule_fiber do
-      relay_fiber(sock, sink, name, on_exit: on_exit)
+    @mutex.synchronize do
+      # An external caller that arrives during worker teardown waits until the
+      # scheduler is reusable. A callback on the worker itself must remain
+      # nonblocking; the scheduler's final run will process its accepted work.
+      while @tearing_down && Thread.current != @thread
+        @teardown_condition.wait(@mutex)
+      end
+
+      start_gate = start unless running?
+
+      begin
+        @scheduler.schedule_fiber do
+          relay_fiber(sock, sink, name, on_exit: on_exit)
+        end
+      ensure
+        start_gate << true if start_gate
+      end
     end
-
-    start unless running?
   end
 
   # Write all data to the specified IO. This is intended to be used in scenarios
@@ -51,25 +68,66 @@ class RelayManager
   private
 
   def running?
-    @thread && @thread.alive?
+    @running
   end
 
   def start
-    return false if running?
+    return nil if running?
 
-    @thread = Thread.new { run }
-    true
+    start_gate = Queue.new
+    @running = true
+    @thread = Thread.new do
+      start_gate.pop
+      run
+    end
+    start_gate
+  rescue StandardError
+    @running = false
+    raise
   end
 
   def run
+    teardown_started = false
     old_scheduler = Fiber.scheduler
     # A fiber scheduler can be set per-thread
     Fiber.set_scheduler(@scheduler)
 
-    # Run the scheduler (blocks here)
-    @scheduler.run
+    loop do
+      # Run the scheduler (blocks here)
+      @scheduler.run
+
+      # #add_relay schedules and tests @running while holding this same lock.
+      # If it won the race after the scheduler observed an empty queue, process
+      # its accepted work before committing this worker to teardown.
+      teardown_started = @mutex.synchronize do
+        if @scheduler.work_pending?
+          false
+        else
+          @tearing_down = true
+          true
+        end
+      end
+      break if teardown_started
+    end
   ensure
-    Fiber.set_scheduler(old_scheduler)
+    # On an exceptional exit, commit to teardown before removing the scheduler.
+    # External submissions then wait; callbacks on this worker remain able to
+    # schedule work for the scheduler's final run.
+    @mutex.synchronize { @tearing_down = true } unless teardown_started
+
+    begin
+      Fiber.set_scheduler(old_scheduler)
+    ensure
+      begin
+        @scheduler.reset!
+      ensure
+        @mutex.synchronize do
+          @running = false
+          @tearing_down = false
+          @teardown_condition.broadcast
+        end
+      end
+    end
   end
 
   def relay_fiber(sock, sink, name, on_exit: nil)
@@ -110,4 +168,4 @@ class RelayManager
 end
 
 end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rex-core
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.37
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake