ileitch-hijack 0.1.7 → 0.1.8

data/README.rdoc

@@ -6,10 +6,6 @@ Hijack allows you to connect to any ruby process and execute code as if it were
 
 Hijack uses DRb over a unix socket file, so you need to be on the same machine as the process you want to hijack. This is by design for security reasons. You also need to run the hijack client as the same user as the remote process.
 
-== WARNING
-
-Hijack is new code, I'd think twice about trying it out on your critical production systems. I'd love to get some feedback though so if you have any development or staging systems to try it out on then please do!
-
 == Using Hijack
 
   $ hijack 16451
@@ -104,12 +100,7 @@ Back in hijack you'll see your browsing activity:
   2009/08/22 14:24:53 - 127.0.0.1 - /login
   2009/08/22 14:24:54 - 127.0.0.1 - /signup
 
-Instead of pasting your code into hijack, you can pass hijack the -e option at startup to execute from a file:
-
-  $ hijack -e examples/rails_dispatcher.rb 61565
-  => Hijacked 61565 (/opt/local/bin/thin) (ruby 1.8.7 [i686-darwin9])
-  => Executing examples/rails_dispatcher.rb... done!
-  >> 2009/08/22 14:46:36 - 127.0.0.1 - /
+Instead of pasting your code into hijack, you can pass hijack the -e option execute a local file on the target process.
 
 == Process Output
 
@@ -120,6 +111,8 @@ By default hijack will forward your process output to the hijack client. This ca
   >> hijack_unmute
   => true
 
+For ease of use, hijack helper methods are discoverable with tab completion. hi<tab><tab> will give you a list of available helpers.
+
 == Process Mirroring
 
 DRb cannot dump objects to the hijack client for types that are not loaded in the client process. E.g if the remote process had required ActiveRecord and you tried to dump ActiveRecord::Base back to the client, DRb would instead return a DRb::Unknown object as ActiveRecord

data/TODO

@@ -1,5 +1,5 @@
 * Use thread local stdout & stderr capture.
 * assigning a variable doesn't work
 * Improve startup experience
-* Check if attached process is in fact a ruby process
 * Require actual remote script if possible so that if it defines any classes we can dump those too.
+* Add a hijack_exec helper to execute a local .rb on the target

data/bin/hijack

@@ -11,8 +11,9 @@ new_argv.delete(pid)
 
 new_argv.options do |opts|
   opts.banner = usage
-  opts.on("--gdb-debug", "Print gdb activity to the console.") { |v| options[:gdb_debug] = v }
-  opts.on("-e", "--execute=FILE", String, "Execute the specified file in the remote process.") { |v| options[:execute] = v }
+  opts.on("--gdb-debug", "Print gdb activity to the console.") { |v| options[:gdb_debug] = true }
+  opts.on("--mute", "Ignore stdout/stderr writes from the remote process.") { |v| options[:mute] = true }
+  opts.on("-e", "--execute=FILE", String, "Execute the specified file in the remote process and then disconnect.") { |v| options[:execute] = v }
   opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
   opts.parse!
 end

data/lib/hijack/console.rb

@@ -15,7 +15,7 @@ module Hijack
       mirror_process
       banner
       execute_file
-      start_output_receiver
+      OutputReceiver.start(@remote) unless Hijack.options[:mute]
       start_irb
     end
 
@@ -36,7 +36,7 @@ module Hijack
       Process.kill('USR2', @pid.to_i)
       loop do
         break if File.exists?(Hijack.socket_path_for(@pid))
-        sleep 0.1
+        sleep 0.01
       end
     end
 
@@ -45,30 +45,32 @@ module Hijack
     end
 
     module OutputReceiver
-      @@mute = false
+      class << self
+        def mute
+          @mute = true
+        end
 
-      def self.mute
-        @@mute = true
-      end
+        def unmute(remote)
+          start(remote) unless @started
+          @mute = false
+        end
 
-      def self.unmute
-        @@mute = false
-      end
+        def write(where, str)
+          Object.const_get(where.upcase).write(str) unless @mute
+        end
 
-      def self.write(where, str)
-        Object.const_get(where.upcase).write(str) unless @@mute
-      end
+        def puts(where, str)
+          Object.const_get(where.upcase).puts(str) unless @mute
+        end
 
-      def self.puts(where, str)
-        Object.const_get(where.upcase).puts(str) unless @@mute
+        def start(remote)
+          DRb.start_service(Hijack.socket_for(Process.pid), self)
+          remote.evaluate("__hijack_output_receiver_ready_#{Process.pid}")
+          @started = true
+        end
       end
     end
 
-    def start_output_receiver
-      DRb.start_service(Hijack.socket_for(Process.pid), OutputReceiver)
-      @remote.evaluate("__hijack_output_receiver_ready_#{Process.pid}")
-    end
-
     def mirror_process
       # Attempt to require all files currently loaded by the remote process so DRb can dump as many objects as possible.
       #
@@ -130,6 +132,7 @@ module Hijack
           $stdout.flush
           @remote.evaluate(File.read(Hijack.options[:execute]))
           puts "done!"
+          exit
         else
           puts "=> Can't find #{Hijack.options[:execute]} to execute!"
         end

data/lib/hijack/gdb.rb

@@ -10,8 +10,11 @@ module Hijack
     end
 
     def attached_to_ruby_process?
-      # TODO: Implement me
-      true
+      backtrace.any? {|line| line =~ /ruby_run/}
+    end
+
+    def main_thread_blocked_by_join?
+      backtrace.any? {|line| line =~ /rb_thread_join/}
     end
 
     def eval(cmd)
@@ -29,6 +32,10 @@ module Hijack
     end
 
   protected
+    def backtrace
+      @backtrace ||= exec('bt').reverse
+    end
+
     def set_trap_pending
       exec("set variable (int)rb_trap_pending=1")
     end
@@ -50,7 +57,7 @@ module Hijack
     end
 
     def exec(str)
-      puts("(gdb) #{str}")  if @verbose
+      puts("(gdb) #{str}") if @verbose
       @gdb.puts(str)
       wait
     end
@@ -70,6 +77,7 @@ module Hijack
         end
       end
       puts lines.map { |l| "> #{l}" } if @verbose
+      lines
     end
   end
 end

data/lib/hijack/helper.rb

@@ -20,7 +20,7 @@ module Hijack
       end
 
       def hijack_unmute(remote)
-        Hijack::Console::OutputReceiver.unmute
+        Hijack::Console::OutputReceiver.unmute(remote)
         true
       end
 

data/lib/hijack/payload.rb

@@ -4,6 +4,13 @@ module Hijack
       gdb = GDB.new(pid)
       unless gdb.attached_to_ruby_process?
         puts "\n=> #{pid} doesn't appear to be a Ruby process!"
+        gdb.detach
+        exit 1
+      end
+      if gdb.main_thread_blocked_by_join?
+        puts "\n=> Unable to hijack #{pid} because the main thread is blocked waiting for another thread to join."
+        puts "=> Check that you are using the most recent version of hijack, a newer version may have solved this shortcoming."
+        gdb.detach
         exit 1
       end
       gdb.eval(payload(pid))

data/tasks/gem.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'yaml'
 
-HIJACK_VERSION = '0.1.7'
+HIJACK_VERSION = '0.1.8'
 
 task :clean => :clobber_package
 

data/test/test.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/ruby
 
+class SomeClass
+end
+
 def do_shit(i)
   puts i
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ileitch-hijack
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Ian Leitch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 21:00:00 -07:00
+date: 2009-09-16 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,8 @@ files:
 - examples/rails_dispatcher.rb
 has_rdoc: true
 homepage: http://github.com/ileitch/hijack
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -61,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Provides an irb session to an existing ruby process.