pwn 0.5.657 → 0.5.658

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af75906b3c582dea27fb9ec31f19c7d3774aabcc928549cee27df74ad75220f3
-  data.tar.gz: c3424966d7b298c78b3edac59a777ee8e927f130ecefbf84fd0a46371256900e
+  metadata.gz: 84155e448029c5d41ebd8dda5e4c00147a3283ebf8258c42f2fdf7cb3f159616
+  data.tar.gz: ceecb743a07ddf4d0a2f45434f1b7816e859754762d60f8932f9dd1f4a83d80a
 SHA512:
-  metadata.gz: 396a1f16a96e071396689cdfde74364ee9bae88544275f037137007b5ddd94dc1fc37f181a99ef239db5339b5fb24ecf750605ba67dd28bd62969ec9360ed5f6
-  data.tar.gz: 976c310a1e93bac33b383bcb7702a6350f2268062e71a0bb73ee28454d6ea23798fc654744b88dad048472d721d2417713d5664e81f39e819ddd2ccefe51c555
+  metadata.gz: 5cb1bf7948fa027253fa5e2aeb2204d917bf51ab4ebf2710073b8ca3c4fa07f53012a3e8f98e5db5f3dabda050b405119dadf78b7a5583476da35fd11af5c5c7
+  data.tar.gz: 07e6832ea6946949d3042f62b03930d5e6f882dd8f246449f314c994459b4f16ce4e32700ab4467b55d44e01f5ba35dbc3788f742d44a7fd79b36026b2d61ccf

data/lib/pwn/ai/agent/tools/shell.rb

@@ -6,6 +6,13 @@ require 'pwn/ai/agent/registry'
 
 # Run a shell command on the pwn host. Lifted from the bash branch of the
 # legacy :pwn_ai_hook (repl.rb).
+#
+# Timeout path must NOT leave Open3's pipe-reader threads racing a closed
+# pipe — that surfaces as noisy:
+#   #<Thread:0x... open3.rb:664 run> terminated with exception
+#   (report_on_exception is true): IOError stream closed in another thread
+# Fix: own the popen3 lifecycle, process-group kill on timeout, and silence
+# report_on_exception on the reader threads before closing pipes.
 PWN::AI::Agent::Registry.register(
   name: 'shell',
   toolset: 'terminal',
@@ -29,16 +36,84 @@ PWN::AI::Agent::Registry.register(
     timeout = (args[:timeout] || 120).to_i
     raise ArgumentError, 'command is required' if cmd.strip.empty?
 
-    stdout = stderr = ''
-    status = nil
-    begin
-      Timeout.timeout(timeout) do
-        stdout, stderr, status = Open3.capture3(cmd)
+    stdout = +''
+    stderr = +''
+    exitstatus = nil
+    timed_out = false
+
+    # pgroup: true => child is session/process-group leader; kill(-pid)
+    # reaps the whole tree (shell + grandchildren) on timeout.
+    Open3.popen3(cmd, pgroup: true) do |stdin, out_io, err_io, wait_thr|
+      stdin.close
+      pid = wait_thr.pid
+
+      out_reader = Thread.new { out_io.read.to_s }
+      err_reader = Thread.new { err_io.read.to_s }
+      # Prevent Ruby from dumping IOError to $stderr when we close pipes
+      # out from under these readers on the timeout path.
+      out_reader.report_on_exception = false
+      err_reader.report_on_exception = false
+
+      begin
+        Timeout.timeout(timeout) do
+          # Wait for the child; readers drain pipes concurrently.
+          wait_thr.value
+        end
+      rescue Timeout::Error
+        timed_out = true
+        begin
+          Process.kill('TERM', -pid)
+        rescue Errno::ESRCH, Errno::EPERM
+          nil
+        end
+        # Brief grace, then hard kill the process group.
+        sleep 0.2
+        begin
+          Process.kill('KILL', -pid)
+        rescue Errno::ESRCH, Errno::EPERM
+          nil
+        end
+        begin
+          wait_thr.value
+        rescue StandardError
+          nil
+        end
+      end
+
+      # Ensure pipes are closed so readers unblock even if the child
+      # ignored signals or left descendants holding fds.
+      begin
+        out_io.close unless out_io.closed?
+      rescue StandardError
+        nil
+      end
+      begin
+        err_io.close unless err_io.closed?
+      rescue StandardError
+        nil
+      end
+
+      # Join readers; swallow the IOError that arrives when the pipe was
+      # closed mid-read (timeout path). report_on_exception is already off.
+      begin
+        stdout = out_reader.value.to_s
+      rescue StandardError
+        stdout = +''
+      end
+      begin
+        stderr = err_reader.value.to_s
+      rescue StandardError
+        stderr = +''
+      end
+
+      unless timed_out
+        status = wait_thr.value
+        exitstatus = status&.exitstatus
       end
-    rescue Timeout::Error
-      return { stdout: stdout, stderr: stderr, exit: nil, error: "timeout after #{timeout}s" }
     end
 
-    { stdout: stdout, stderr: stderr, exit: status&.exitstatus }
+    return { stdout: stdout, stderr: stderr, exit: nil, error: "timeout after #{timeout}s" } if timed_out
+
+    { stdout: stdout, stderr: stderr, exit: exitstatus }
   }
 )

data/lib/pwn/banner/white_rabbit.rb

@@ -15,7 +15,7 @@ module PWN
             / \     / \
            {   }   {   }
            {   {   }   }
-            \   \ /   /
+            \   \ /   /   R.I.P. Houdini
              \   Y   /
              .-"`"`"-.
            ,`         `.

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.657'
+  VERSION = '0.5.658'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.657
+  version: 0.5.658
 platform: ruby
 authors:
 - 0day Inc.