rubypwn 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dfb84772404f79d5f5175659ca307d2cbed9fb7
-  data.tar.gz: bf8ebf7647eae29666a1d07e2ec0e0cf950ca0cd
+  metadata.gz: d1cd3dd82e4fad21aa45c4e7e4a5057ad9682bb3
+  data.tar.gz: 4fcf224ad259314b30b5311e642ec4973abb996f
 SHA512:
-  metadata.gz: 7a231f3caf7f2fc28d1c026aa21ceab34fc6522aaa7940de76487438f82180fae2c35a47f2a14df3e6af391ff9ae3193c0869b09b643593f30a087ca792b7743
-  data.tar.gz: 1166e8c4abfe7d6269750398890e3da74ed0c0045069d1e58ccde16cbbf73d5903cc0b9c2ba83056339adf4589d960415ef02979ec7c7ade7ab58991a1dabfbe
+  metadata.gz: aa49d4daeb2ba2477ca156b7984670b9dce586bb673b0901894ac83df35be6067eb755e030ff22241054dac519e173c89c781fd57e4efefae914cd0e9d942a2e
+  data.tar.gz: ac3cc5bce1e70f24a6d0891bb661a336013c33c624d6fe8aafd0a1b2341d19ee0479fb8ee941be2718a3e87fc63435bd2e36e1a82c082d97a6b4ada7756d5677

data/docs/source/elf.rst

@@ -0,0 +1,14 @@
+class Elf
+====================================
+
+Used to get some constant value from the binary::
+
+    2.2.0 :001 > require 'rubypwn'
+     => true
+    2.2.0 :002 > e = Elf.new "/lib/i386-linux-gnu/libc.so.6"
+    2.2.0 :003 > e.gotplt.keys
+     => ["_Unwind_Find_FDE", "realloc", "malloc", "memalign", "_dl_find_dso_for_object", "calloc", "___tls_get_addr", "free", ""]
+    2.2.0 :004 > e.gotplt["malloc"]
+     => 1744916
+    2.2.0 :005 > puts "%08x" % e.gotplt["malloc"]
+    001aa014

data/docs/source/index.rst

@@ -1,7 +1,7 @@
 rubypwn
 ====================================
 
-test
+pwntools for ruby developer
 
 Getting Started
 ---------------
@@ -24,6 +24,7 @@ All documented module in rubypwn.
 
    basic
    asm
+   elf
 
 Indices and tables
 ==================

data/lib/elf.rb

@@ -187,6 +187,14 @@ class ElfParser < BinData::Record
         array 1, :type => :relaplt32, :initial_length => 0
         array 2, :type => :relaplt64, :initial_length => 0
     end
+    choice :reldyn, :selection => lambda{e_ident.ei_class} do
+        array 1, :type => :relplt32, :initial_length => 0
+        array 2, :type => :relplt64, :initial_length => 0
+    end
+    choice :reladyn, :selection => lambda{e_ident.ei_class} do
+        array 1, :type => :relaplt32, :initial_length => 0
+        array 2, :type => :relaplt64, :initial_length => 0
+    end
 
     def parse_bits(ei_class)
         ei_class == 1 ? 32 : 64
@@ -342,24 +350,40 @@ class Elf
     end
 
     def parse_relplt(binary, elf)
-        relplt = nil
+        plt = nil
         elf.e_shnum.times do |i|
             if elf.sh[i].name_str.to_s == ".rel.plt"
                 size = elf.sh[i].sh_size/elf.sh[i].sh_entsize
                 if elf.e_ident[:ei_class] == 1
-                    relplt = BinData::Array.new(:type => :relplt32, :initial_length => size)
+                    plt = BinData::Array.new(:type => :relplt32, :initial_length => size)
                 else
-                    relplt = BinData::Array.new(:type => :relplt64, :initial_length => size)
+                    plt = BinData::Array.new(:type => :relplt64, :initial_length => size)
                 end
-                elf.relplt.assign relplt.read binary[elf.sh[i].sh_offset, elf.sh[i].sh_size]
+                elf.relplt.assign plt.read binary[elf.sh[i].sh_offset, elf.sh[i].sh_size]
+            elsif elf.sh[i].name_str.to_s == ".rel.dyn"
+                size = elf.sh[i].sh_size/elf.sh[i].sh_entsize
+                if elf.e_ident[:ei_class] == 1
+                    plt = BinData::Array.new(:type => :relplt32, :initial_length => size)
+                else
+                    plt = BinData::Array.new(:type => :relplt64, :initial_length => size)
+                end
+                elf.reldyn.assign plt.read binary[elf.sh[i].sh_offset, elf.sh[i].sh_size]
             elsif elf.sh[i].name_str.to_s == ".rela.plt"
                 size = elf.sh[i].sh_size/elf.sh[i].sh_entsize
                 if elf.e_ident[:ei_class] == 1
-                    relplt = BinData::Array.new(:type => :relaplt32, :initial_length => size)
+                    plt = BinData::Array.new(:type => :relaplt32, :initial_length => size)
+                else
+                    plt = BinData::Array.new(:type => :relaplt64, :initial_length => size)
+                end
+                elf.relaplt.assign plt.read binary[elf.sh[i].sh_offset, elf.sh[i].sh_size]
+            elsif elf.sh[i].name_str.to_s == ".rela.dyn"
+                size = elf.sh[i].sh_size/elf.sh[i].sh_entsize
+                if elf.e_ident[:ei_class] == 1
+                    plt = BinData::Array.new(:type => :relaplt32, :initial_length => size)
                 else
-                    relplt = BinData::Array.new(:type => :relaplt64, :initial_length => size)
+                    plt = BinData::Array.new(:type => :relaplt64, :initial_length => size)
                 end
-                elf.relaplt.assign relplt.read binary[elf.sh[i].sh_offset, elf.sh[i].sh_size]
+                elf.reladyn.assign plt.read binary[elf.sh[i].sh_offset, elf.sh[i].sh_size]
             end
         end
     end
@@ -367,19 +391,26 @@ class Elf
     def gen_gotplt(elf)
         result = {}
         rel = nil
-        if elf.relplt.size > 0
-            rel = elf.relplt
-        elsif elf.relaplt.size > 0
-            rel = elf.relaplt
-        end
         
-        rel.each do |r|
+        elf.relplt.each do |r|
             result[elf.symtab[r.sym_index.to_i].name_str.to_s] = r.r_offset.to_i
         end
+
+        elf.relaplt.each do |r|
+            result[elf.symtab[r.sym_index.to_i].name_str.to_s] = r.r_offset.to_i
+        end
+
+        elf.reldyn.each do |r|
+            result[elf.symtab[r.sym_index.to_i].name_str.to_s] = elf.symtab[r.sym_index.to_i].st_value
+        end
+
+        elf.reladyn.each do |r|
+            result[elf.symtab[r.sym_index.to_i].name_str.to_s] = elf.symtab[r.sym_index.to_i].st_value
+        end
         result
     end
 end
 
 #require 'pp'
 #e = Elf.new ARGV[0]
-#pp e.gotplt["fgets"]
+#pp e.gotplt["__free_hook"]

data/rubypwn.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'rubypwn'
-  s.version     = '0.0.7'
-  s.date        = '2015-08-26'
+  s.version     = '0.0.8'
+  s.date        = '2015-09-06'
   s.summary     = "ruby pwn tools"
   s.description   = <<-DESCRIPTION.strip.gsub(/\s+/, " ")
     A simple library for CTF pwning challenges.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypwn
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - atdog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -106,6 +106,7 @@ files:
 - docs/source/asm.rst
 - docs/source/basic.rst
 - docs/source/conf.py
+- docs/source/elf.rst
 - docs/source/getting_started.rst
 - docs/source/index.rst
 - lib/asm.rb