ragweed 0.2.0.pre3-java → 0.2.1-java

data/VERSION

@@ -1 +1 @@
-0.2.0.pre3
+0.2.1

data/lib/ragweed/debugger32.rb

@@ -312,7 +312,7 @@ class Ragweed::Debugger32
   def wait
     self.attach() if not @attached
 
-    event = ev = Ragweed::Wrap32::wait_for_debug_event
+    @event = ev = Ragweed::Wrap32::wait_for_debug_event
     return if not ev
     case ev.code
     when Ragweed::Wrap32::DebugCodes::CREATE_PROCESS

data/lib/ragweed/debuggerosx.rb

@@ -415,6 +415,35 @@ class Ragweed::Debuggerosx
     end
   end
 
+  # XXX watch this space for an object to hold this information
+  # Return a range via mapping name
+  def get_mapping_by_name name, exact = true
+    ret = []
+    IO.popen("vmmap -interleaved #{@pid}") do |pipe|
+      pipe.each_line do |line|
+        next if pipe.lineno < 5
+        break if line == "==== Legend\n"
+        rtype, saddr, eaddr, sz, perms, sm, purpose =
+          line.scan(/^([[:graph:]]+(?:\s[[:graph:]]+)?)\s+([[:xdigit:]]+)-([[:xdigit:]]+)\s+\[\s+([[:digit:]]+[A-Z])\s*\]\s+([-rwx\/]+)\s+SM=(COW|PRV|NUL|ALI|SHM|ZER|S\/A)\s+(.*)$/).
+            first
+        if exact && (rtype == name || purpose == name)
+          ret << [saddr, eaddr].map{|x| x.to_i(16)}
+        elsif rtype.match(name) || purpose.match(name)
+          ret << [saddr, eaddr].map{|x| x.to_i(16)}
+        end
+      end
+    end
+    ret
+  end
+  
+  def get_stack_ranges
+    get_mapping_by_name "Stack", false
+  end
+  
+  def get_heap_ranges
+    get_mapping_by_name "MALLOC", false
+  end
+
   private
 
   # sets instance automagic options to sane(ish) defaults when not given

data/lib/ragweed/debuggertux.rb

@@ -83,18 +83,15 @@ class Ragweed::Debuggertux
   end
 
   def self.find_by_regex(rx)
-    a = Dir.entries("/proc/")
-    a.delete_if { |x| x == '.' }
-    a.delete_if { |x| x == '..' }
-    a.delete_if { |x| x =~ /[a-z]/i }
-    
-    a.each do |x|
-      f = File.read("/proc/#{x}/cmdline")
-      if f =~ rx and x.to_i != Process.pid.to_i
-        return x
+    Dir.glob("/proc/*/cmdline").each do |x|
+      x.gsub(/^\/proc\/(\d+)\/cmdline$/) do |ln|
+        f = File.read(ln)
+        if f =~ rx and $1.to_i != ::Process.pid.to_i
+          return f
+        end
       end
     end
-	return nil
+    nil
   end
 
   def install_bps
@@ -134,78 +131,101 @@ class Ragweed::Debuggertux
   ## key = Start address of region
   ## value = Size of the region
   def mapped
-      @mapped_regions.clear if @mapped_regions
+    @mapped_regions.clear if @mapped_regions
 
-      File.read("/proc/#{pid}/maps").each_line do |l|
-        s,e = l.split('-')
-        e = e.split(' ').first
-        sz = e.to_i(16) - s.to_i(16)
-        @mapped_regions.store(s.to_i(16), sz)
+    File.open("/proc/#{pid}/maps") do |f|
+      f.each_line do |l|
+        e = l.split(' ',2).first
+        s,e = e.split('-').map{|x| x.to_i(16)}
+        sz = e - s
+        @mapped_regions.store(s, sz)
       end
+    end
+    @mapped_regions
   end
 
-  ## Return a name for a range if possible
+  # Return a name for a range if possible. greedy match
+  # returns the first found
   def get_mapping_name(val)
-    File.read("/proc/#{pid}/maps").each_line do |l|
-        base = l.split('-').first
-        max = l[0,17].split('-',2)[1]
-        if base.to_i(16) <= val && val <= max.to_i(16)
-            return l.split(' ').last
+    File.open("/proc/#{pid}/maps") do |f|
+      f.each_line do |l|
+        range, perms, offset, dev, inode, pathname  = l.chomp.split(" ")
+        base, max = range.split('-').map{|x| x.to_i(16)}
+        if base <= val && val <= max
+          return pathname
         end
+      end
     end
     nil
   end
+  alias mapping_name get_mapping_name
 
   ## Return a range via mapping name
-  def get_mapping_by_name(name)
-    File.read("/proc/#{pid}/maps").each_line do |l|
-        n = l.split(' ').last
-        if n == name
-            base = l.split('-').first
-            max = l[0,17].split('-',2)[1]
-            return [base, max]
+  def get_mapping_by_name(name, exact = true)
+    ret = []
+    File.open("/proc/#{pid}/maps") do |f|
+      f.each_line do |l|
+        range, perms, offset, dev, inode, pathname  = l.chomp.split(" ",6)
+        base, max = range.split('-').map{|x| x.to_i(16)}
+        if pathname
+          if exact && pathname == name
+            ret << range.split('-').map{|x| x.to_i(16)}
+          elsif pathname.match(name)
+            ret << range.split('-').map{|x| x.to_i(16)}
+          end
         end
+      end
     end
-    nil
+    ret
   end
+  alias mapping_by_name get_mapping_by_name
 
   ## Helper method for retrieving stack range
   def get_stack_range
-    return get_mapping_by_name("[stack]")
+    get_mapping_by_name('[stack]')
   end
+  alias stack_range get_stack_range
 
   ## Helper method for retrieving heap range
   def get_heap_range
-    return get_mapping_by_name("[heap]")
+    get_mapping_by_name('[heap]')
   end
+  alias heap_range get_heap_range
 
   ## Parse procfs and create a hash containing
   ## a listing of each mapped shared object
   def self.shared_libraries(p)
+    raise "pid is 0" if p.to_i == 0
 
-      raise "pid is 0" if p.to_i == 0
-
-      if @shared_objects
-        @shared_objects.clear
-      else
-        @shared_objects = Hash.new
-      end
+    if @shared_objects
+      @shared_objects.clear
+    else
+      @shared_objects = Hash.new
+    end
 
-      File.read("/proc/#{p}/maps").each_line do |l|
-          if l =~ /[a-zA-Z0-9].so/ && l =~ /xp /
-              lib = l.split(' ', 6)
-              sa = l.split('-', 0)
+    File.open("/proc/#{p}/maps") do |f|
+      f.each_line do |l|
+        if l =~ /[a-zA-Z0-9].so/ && l =~ /xp /
+          lib = l.split(' ', 6)
+          sa = l.split('-', 0)
 
-              if lib[5] =~ /vdso/
-                next
-              end
+          if lib[5] =~ /vdso/
+            next
+          end
 
-              lib = lib[5].strip
-              lib.gsub!(/[\s\n]+/, "")
-              @shared_objects.store(sa[0], lib)
-            end
+          lib = lib[5].strip
+          lib.gsub!(/[\s\n]+/, "")
+          @shared_objects.store(sa[0], lib)
         end
-    return @shared_objects
+      end
+    end
+    @shared_objects
+  end
+
+  # instance method for above
+  # returns a hash of the mapped shared libraries
+  def shared_libraries
+    self.class.shared_libraries(@pid)
   end
 
   ## Search a specific page for a value
@@ -227,15 +247,17 @@ class Ragweed::Debuggertux
   ## Search the heap for a value
   def search_heap(val)
     loc = Array.new
-    File.read("/proc/#{pid}/maps").each_line do |l|
-      if l =~ /\[heap\]/
-        s,e = l.split('-')
-        e = e.split(' ').first
-        s = s.to_i(16)
-        e = e.to_i(16)
-        sz = e - s
-        max = s + sz
-        loc = search_page(s, max, val)
+    File.open("/proc/#{pid}/maps") do |f|
+      f.each_line do |l|
+        if l =~ /\[heap\]/
+          s,e = l.split('-')
+          e = e.split(' ').first
+          s = s.to_i(16)
+          e = e.to_i(16)
+          sz = e - s
+          max = s + sz
+          loc = search_page(s, max, val)
+        end
       end
     end
     loc
@@ -266,7 +288,7 @@ class Ragweed::Debuggertux
   end
 
   def single_step
-	on_single_step
+    on_single_step
     ret = Ragweed::Wraptux::ptrace(Ragweed::Wraptux::Ptrace::STEP, @pid, 1, 0)
   end
 
@@ -392,14 +414,14 @@ class Ragweed::Debuggertux
   end
 
   def self.threads(pid)
-	begin
-	    a = Dir.entries("/proc/#{pid}/task/")
-	rescue
-		puts "No such PID: #{pid}"
-		return
-	end
-    a.delete_if { |x| x == '.' }
-    a.delete_if { |x| x == '..' }
+    a = []
+    begin
+      a = Dir.entries("/proc/#{pid}/task/")
+      a.delete_if {|x| x == '.' || x == '..'}
+    rescue
+      puts "No such PID: #{pid}"
+    end
+    a
   end
 
   def get_registers

data/lib/ragweed/wrap32/debugging.rb

@@ -14,7 +14,14 @@ module Ragweed::Wrap32
   end
 
   module PagePermissions
+    PAGE_NOACCESS = 0x1
+    PAGE_READONLY = 0x2
+    PAGE_READWRITE = 0x4
+    PAGE_WRITECOPY = 0x8
+    PAGE_EXECUTE = 0x10
+    PAGE_EXECUTE_READ = 0x20
     PAGE_EXECUTE_READWRITE = 0x40
+    PAGE_EXECUTE_WRITECOPY = 0x80
   end
 
   module ExceptionCodes
@@ -51,6 +58,34 @@ module Ragweed::Wrap32
   end
 end
 
+class Ragweed::Wrap32::StartupInfo < FFI::Struct
+    layout :cb, :ulong,
+    :reserved, :pointer,
+    :desktop, :pointer,
+    :title, :pointer,
+    :x, :ulong,
+    :y, :ulong,
+    :xsize, :ulong,
+    :ysize, :ulong,
+    :xcountchars, :ulong,
+    :ycountchars, :ulong,
+    :fillattr, :ulong,
+    :flags, :ulong,
+    :show_window, :short,
+    :breserved, :uint16,
+    :preserved, :uint8,
+    :std_input, :ulong,
+    :std_output, :ulong,
+    :std_error, :ulong
+end
+
+class Ragweed::Wrap32::ProcessInfo < FFI::Struct
+  layout :process_handle, :pointer,
+  :thread_handle, :pointer,
+  :pid, :ulong,
+  :thread_id, :ulong
+end
+
 class Ragweed::Wrap32::RipInfo < FFI::Struct
     include Ragweed::FFIStructInclude
     layout :error, :ulong,

data/lib/ragweed/wrap32/wrap32.rb

@@ -117,8 +117,8 @@ module Ragweed::Wrap32
     attach_function 'DeviceIoControl', [ :long, :long, :pointer, :long, :pointer, :long, :pointer, :pointer ], :long
     attach_function 'GetOverlappedResult', [ :long, :pointer, :pointer, :long ], :long
     attach_function 'WaitForMultipleObjects', [ :long, :pointer, :long, :long ], :long
-    attach_function 'CreateProcessA', [ :pointer, :pointer, :pointer, :pointer, :long, :long, :pointer, :pointer, :pointer, :pointer ], :long
-    attach_function 'CreateProcessW', [ :pointer, :pointer, :pointer, :pointer, :long, :long, :pointer, :pointer, :pointer, :pointer ], :long
+    attach_function 'CreateProcessA', [ :pointer, :pointer, :pointer, :pointer, :bool, :long, :pointer, :pointer, :pointer, :pointer ], :long
+    attach_function 'CreateProcessW', [ :pointer, :pointer, :pointer, :pointer, :bool, :long, :pointer, :pointer, :pointer, :pointer ], :long
 
     ffi_lib 'ntdll'
     ffi_convention :stdcall

data/lib/ragweed/wraptux/constants.rb

@@ -92,7 +92,10 @@ module Ragweed::Wraptux::Wait
 end
 
 module Ragweed::Wraptux::PagePermissions
+    PROT_NONE  = 0x0
     PROT_READ  = 0x1
     PROT_WRITE = 0x2
     PROT_EXEC  = 0x4
+    PROT_GROWSDOWN = 0x01000000
+    PROT_GROWSUP   = 0x02000000
 end

data/ragweed.gemspec

@@ -5,12 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ragweed}
-  s.version = "0.2.0.pre3"
-  s.platform = %q{java}
+  s.version = "0.2.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tduehr", "struct", "tqbf"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-04-13}
   s.description = %q{General debugging tool written in Ruby for OSX/Win32/Linux}
   s.email = %q{td@matasano.com}
   s.extra_rdoc_files = [
@@ -28,7 +27,6 @@ Gem::Specification.new do |s|
     "examples/hook_notepad.rb",
     "examples/snicker.rb",
     "examples/tux-example.rb",
-    "lib/.DS_Store",
     "lib/ragweed.rb",
     "lib/ragweed/arena.rb",
     "lib/ragweed/blocks.rb",
@@ -76,7 +74,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tduehr/ragweed}
   s.rdoc_options = ["--inline-source", "--line-numbers", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Scriptable debugger}
   s.test_files = [
     "examples/hittracertux.rb",
@@ -90,13 +88,15 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, ["~> 1.0"])
     else
+      s.add_dependency(%q<ffi>, ["~> 1.0"])
     end
   else
+    s.add_dependency(%q<ffi>, ["~> 1.0"])
   end
 end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ragweed
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-    - 0
-    - 2
-    - 0
-    - pre3
-  version: 0.2.0.pre3
+  prerelease: 
+  version: 0.2.1
 platform: java
 authors: 
   - tduehr
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -06:00
+date: 2011-04-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -41,7 +36,6 @@ files:
   - examples/hook_notepad.rb
   - examples/snicker.rb
   - examples/tux-example.rb
-  - lib/.DS_Store
   - lib/ragweed.rb
   - lib/ragweed/arena.rb
   - lib/ragweed/blocks.rb
@@ -98,25 +92,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Scriptable debugger