ragweed 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/ragweed/debugger32.rb

@@ -37,9 +37,7 @@ class Ragweed::Debugger32
     def addr; @addr; end
     
     def install
-        if @addr == 0 or @deferred == true
-          return
-        end
+        return if @addr == 0 or @deferred == true
 
         o = @process.read8(@addr)
 
@@ -146,9 +144,7 @@ class Ragweed::Debugger32
   # breakpoints are always re-set after firing. If you don't want them to be
   # re-set, unset them manually.
   def breakpoint_set(ip, callable=nil, &block)
-    if not callable and block_given?
-      callable = block
-    end
+    callable = block if not callable and block_given?
 
     def_status = false
 
@@ -229,10 +225,10 @@ class Ragweed::Debugger32
 
   # FIX: this method should be a bit more descriptive in its naming
   def get_dll_name(ev)
-    name = Ragweed::Wrap32::get_mapped_filename(@p.handle, ev.base_of_dll, 256)
+    name = Ragweed::Wrap32::get_mapped_filename(@p.handle, ev.base_of_dll, 1024)
     name.gsub!(/[\n]+/,'')
     name.gsub!(/[^\x21-\x7e]/,'')
-    i = name.index('0')
+    i = name.index('\0')
     i ||= name.size
     return name[0, i]
   end
@@ -240,19 +236,20 @@ class Ragweed::Debugger32
   def on_load_dll(ev)
     dll_name = get_dll_name(ev)
 
-    @breakpoints.each_pair do |k,bp|
-        if !bp.addr.kind_of?String
-            next
-        end
+    ## Temporary breakpoint dup is used because
+    ## Ruby 1.9 will not support insertion into
+    ## @breakpoints while iterating through it
+    tmp_bp = @breakpoints.dup
+    tmp_bp.each_pair do |k,bp|
+        ## If the bp is a string its probably deferred
+        next if !bp.addr.kind_of?String
 
         m,f = bp.addr.split('!')
 
         if dll_name =~ /#{m}/i
             deferred = bp.deferred
 
-            if deferred == true
-                bp.deferred = false
-            end
+            bp.deferred = false if deferred == true
 
             new_addr = bp.deferred_install(ev.file_handle, ev.base_of_dll)
 

data/lib/ragweed/debuggertux.rb

@@ -109,6 +109,9 @@ class Ragweed::Debuggertux
     @installed = false
   end
 
+  def installed?; @installed; end
+  def attached?; @attached; end
+
   # This has not been fully tested yet
   def set_options(option)
     r = Ragweed::Wraptux::ptrace(Ragweed::Wraptux::Ptrace::SETOPTIONS, @pid, 0, option)

data/lib/ragweed/utils.rb

@@ -108,6 +108,7 @@ class String
   # String#trim
   def asciiz
     begin
+      return self if self.index("\x00") == nil
       self[0..self.index("\x00")-1]
     rescue
       self

data/lib/ragweed/wrap32/process.rb

@@ -49,26 +49,18 @@ class Ragweed::Process
   # that have just been loaded and detected by a LOAD_DLL
   # event. It is called from on_load_dll() -> deferred_install()
   def get_deferred_proc_remote(name, handle, base_of_dll)
-    if !name.kind_of?String
-      return name
-    end
+    return name if !name.kind_of?String
 
     mod, meth = name.split "!"
 
-    if mod.nil? or meth.nil?
-        raise "can not set this breakpoint: #{name}"
-    end
+    raise "can not set this breakpoint: #{name}" if mod.nil? or meth.nil?
 
     modh = handle
 
     # Location is an offset
     if is_hex(meth)
         baseaddr = 0
-        modules.each do |m|
-            if m.szModule == mod
-                break
-            end
-        end
+        modules.each { |m| break if m.szModule == mod }
 
         ret = base_of_dll + meth.hex
     else
@@ -99,7 +91,7 @@ class Ragweed::Process
     if is_hex(meth)
         baseaddr = 0
         modules.each do |m|
-            if m.szModule == mod
+            if m.szModule.to_s.match(/#{mod}/)
                 baseaddr = m.modBaseAddr
                 break
             end

data/lib/ragweed/wrap32/wrap32.rb

@@ -67,6 +67,29 @@ module Ragweed::Wrap32
     GENERIC_ALL = 0x10000000
   end
 
+  module PipeOpenMode
+    PIPE_ACCESS_DUPLEX = 0x00000003
+    PIPE_ACCESS_INBOUND = 0x00000001
+    PIPE_ACCESS_OUTBOUND = 0x00000002
+    FILE_FLAG_FIRST_PIPE_INSTANCE = 0x00080000
+    FILE_FLAG_WRITE_THROUGH = 0x80000000
+    FILE_FLAG_OVERLAPPED = 0x40000000
+    WRITE_DAC = 0x00040000
+    WRITE_OWNER = 0x00080000
+    ACCESS_SYSTEM_SECURITY = 0x01000000
+  end
+
+  module PipeMode
+    PIPE_TYPE_BYTE = 0x00000000
+    PIPE_TYPE_MESSAGE = 0x00000004
+    PIPE_READMODE_BYTE = 0x00000000
+    PIPE_READMODE_MESSAGE = 0x00000002
+    PIPE_WAIT = 0x00000000
+    PIPE_NOWAIT = 0x00000001
+    PIPE_ACCEPT_REMOTE_CLIENTS = 0x00000000
+    PIPE_REJECT_REMOTE_CLIENTS = 0x00000008
+  end
+
   module FormatArgs
     FROM_SYSTEM = 4096
     ALLOCATE_BUFFER = 256
@@ -108,6 +131,7 @@ module Ragweed::Wrap32
     attach_function 'Sleep', [ :long ], :long
     attach_function 'DuplicateHandle', [ :long, :long, :long, :pointer, :long, :long, :long ], :long
     attach_function 'CreateFileA', [ :pointer, :long, :long, :pointer, :long, :long, :pointer ], :long
+    attach_function 'CreateNamedPipeA', [ :pointer, :long, :long, :long, :long, :long, :long, :pointer ], :long
     attach_function 'OpenEventA', [ :long, :long, :pointer ], :long
     attach_function 'CreateEventA', [ :long, :long, :long, :pointer ], :long
     attach_function 'SetEvent', [ :long ], :long
@@ -466,10 +490,20 @@ module Ragweed::Wrap32
       opts[:access] ||= FileAccess::GENERIC_ALL
       opts[:flags] ||= 0
 
-      r = Win.CreateFileA(name, opts[:access], opts[:sharing], NULL, opts[:disposition], opts[:flags], NULL)
+      r = Win.CreateFileA(name, opts[:access], opts[:sharing], FFI::Pointer::NULL, opts[:disposition], opts[:flags], FFI::Pointer::NULL)
       raise WinX.new(:create_file) if r == -1
       return r
     end
+
+    def create_named_pipe(name, opts={})
+      opts[:open_mode] ||= PipeOpenMode::PIPE_ACCESS_DUPLEX | PipeOpenMode::FILE_FLAG_OVERLAPPED
+      opts[:pipe_mode] ||= PipeMode::PIPE_TYPE_MESSAGE | PipeMode::PIPE_READMODE_MESSAGE | PipeMode::PIPE_WAIT
+      opts[:max_inst] ||= 4
+      opts[:def_timeout] ||= 5000
+      r = Win.CreateNamedPipeA(name, opts[:open_mode], opts[:pipe_mode], opts[:max_inst], opts[:out_buf_sz], opts[:in_buf_sz], opts[:def_timeout], FFI::Pointer::NULL)
+      raise WinX.new(:create_named_pipe) if r == -1
+      return r
+    end
     
     # i haven't made this work, but named handles are kind of silly anyways
     def open_event(name)
@@ -533,7 +567,7 @@ module Ragweed::Wrap32
       return buf, outw.unpack("L").first
     end
 
-    def device_io_control(h, code, inbuf, outbuf, overlapped=NULL)
+    def device_io_control(h, code, inbuf, outbuf, overlapped=FFI::Pointer::NULL)
       overlapped = overlapped.to_s if overlapped
       outw = "\x00" * 4
       r = Win.DeviceIoControl(h, code, inbuf, inbuf.size, outbuf, outbuf.size, outw, overlapped)

data/ragweed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ragweed}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{tduehr}, %q{struct}, %q{tqbf}]
-  s.date = %q{2011-07-31}
+  s.date = %q{2011-12-06}
   s.description = %q{General debugging tool written in Ruby for OSX/Win32/Linux}
   s.email = %q{td@matasano.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ragweed
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - tduehr
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 Z
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi