rubypwn 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf422884fedea20a4e5333215889316c4b0def9
-  data.tar.gz: 6af0c1423b2f3be68fb4582d556fde27eddc0c07
+  metadata.gz: fdbfa39fcd07f0f3e67209c9a003dd00cc7b4b94
+  data.tar.gz: a0abc8b6851725653437381ecbfc328509a3ba97
 SHA512:
-  metadata.gz: 8dea9f3490428d7878404d8eadc82a9dee7f840a390f8ba507fe1605732aa8db070188cfea53fa995f2d62567f9cb953f5f82df9467340ec18521632dd21af89
-  data.tar.gz: 35f02a7e251653d738db0617b3bf8bc1b907e8afdf35cdb64ef13df00f2be0b527268b6bfdcfaa67f6f32df45575592a2ac6d1947b31bc60ac6e339c51d188c8
+  metadata.gz: a33b7b98a23449ac36c0bea51a1bb0bafab344f6d2717e1cfa21ff6eb12f2b199fe5a617124bab6d652ee18ccfbb3046272f1207e6a282e0eca61177b2b88825
+  data.tar.gz: f6ff1e327082bb8c3c21d71a45814cfe76d684ad8477ab0491f9079837a6d5af5bbfa07236d24733bd801678c01ca7325304eb6b8b82776bef5ed5f812a3fb18

data/docs/source/asm.rst

@@ -3,10 +3,10 @@ class Asm
 
 Used to compile assembly code ::
 
-    2.2.2 :002 > Asm.compile("mov eax, 1")
-     => "b801000000"
-    2.2.2 :003 > Asm.compile("mov rax, 1", "amd64", "c")
-     => "\\x48\\xc7\\xc0\\x01\\x00\\x00\\x00"
-    2.2.2 :004 > Asm.compile("mov r15, r14", "arm", "binary")
-     => "\x0E\xF0\xA0\xE1"
+    2.2.3 :004 > Asm.compile "push eax"
+     => "50"
+    2.2.3 :005 > Asm.compile "push rax", arch: "amd64"
+     => "50"
+    2.2.3 :012 > Asm.compile "mov r15, r14", arch: "arm", format: "c"
+     => "\\x0e\\xf0\\xa0\\xe1"
 

data/docs/source/elf.rst

@@ -4,11 +4,11 @@ class Elf
 Used to get some constant value from the binary::
 
     2.2.2 :001 > require 'pp'
-    2.2.2 :001 > require 'rubypwn'
+    2.2.2 :002 > require 'rubypwn'
      => true
-    2.2.2 :002 > e = Elf.new "traveller"
-    2.2.2 :003 > pp Elf.new "traveller"
-    #<Elf:0x007fdd23c3b510
+    2.2.2 :003 > e = Elf.new "traveller"
+    2.2.2 :004 > pp e
+    #<Elf:0x007fb498862550
      @arch="x86",
      @bits=32,
      @dynamic=
@@ -34,6 +34,32 @@ Used to get some constant value from the binary::
        "puts"=>134521260,
        "kill"=>134521264,
        "__sigsetjmp"=>134521268,
-       "exit"=>134521272}>
-    2.2.2 :007 > puts "%08x" % e.got['kill']
-    0804a1b0
+       "exit"=>134521272},
+     @sections=
+      {""=>{"offset"=>0, "flag"=>"r--"},
+       ".interp"=>{"offset"=>134512948, "flag"=>"r--"},
+       ".note.ABI-tag"=>{"offset"=>134512968, "flag"=>"r--"},
+       ".hash"=>{"offset"=>134513000, "flag"=>"r--"},
+       ".dynsym"=>{"offset"=>134513160, "flag"=>"r--"},
+       ".dynstr"=>{"offset"=>134513496, "flag"=>"r--"},
+       ".gnu.version"=>{"offset"=>134513728, "flag"=>"r--"},
+       ".gnu.version_r"=>{"offset"=>134513772, "flag"=>"r--"},
+       ".rel.dyn"=>{"offset"=>134513820, "flag"=>"r--"},
+       ".rel.plt"=>{"offset"=>134513844, "flag"=>"r--"},
+       ".init"=>{"offset"=>134513980, "flag"=>"r-x"},
+       ".plt"=>{"offset"=>134514028, "flag"=>"r-x"},
+       ".text"=>{"offset"=>134514320, "flag"=>"r-x"},
+       ".fini"=>{"offset"=>134515932, "flag"=>"r-x"},
+       ".rodata"=>{"offset"=>134515960, "flag"=>"r--"},
+       ".eh_frame_hdr"=>{"offset"=>134516408, "flag"=>"r--"},
+       ".eh_frame"=>{"offset"=>134516508, "flag"=>"r--"},
+       ".ctors"=>{"offset"=>134520972, "flag"=>"rw-"},
+       ".dtors"=>{"offset"=>134520980, "flag"=>"rw-"},
+       ".jcr"=>{"offset"=>134520988, "flag"=>"rw-"},
+       ".dynamic"=>{"offset"=>134520992, "flag"=>"rw-"},
+       ".got"=>{"offset"=>134521192, "flag"=>"rw-"},
+       ".got.plt"=>{"offset"=>134521196, "flag"=>"rw-"},
+       ".data"=>{"offset"=>134521276, "flag"=>"rw-"},
+       ".bss"=>{"offset"=>134521312, "flag"=>"rw-"},
+       ".comment"=>{"offset"=>0, "flag"=>"r--"},
+       ".shstrtab"=>{"offset"=>0, "flag"=>"r--"}}>

data/lib/asm.rb

@@ -4,7 +4,7 @@ require 'base64'
 
 class Asm
     # Supported Format: hex, c, binary
-    def self.compile(code, arch="i386", format="hex")
+    def self.compile(code, arch:"i386", format:"hex")
         r = RestClient.post 'http://atdog.tw/asm/compile', :code => code, :arch => arch, :format => format
         r = JSON.parse r
         if r['result'] == 1

data/lib/elf.rb

@@ -300,11 +300,16 @@ class Elf
     def parse_section_name(binary, elf)
         strtab_offset = elf.sh[elf.e_shstrndx].sh_offset.to_i
         strtab = binary[(strtab_offset)..-1]
-        @sections = {}
+        @sections = Hash.new{|h, k| h[k] = Hash.new }
         elf.e_shnum.times do |i|
             sh_name = elf.sh[i].sh_name.to_i
             elf.sh[i].name_str.assign BinData::Stringz.read strtab[sh_name..-1]
-            @sections[elf.sh[i].name_str.to_s] = elf.sh[i].sh_addr.to_i
+            flag = "r"
+            flag += (elf.sh[i].sh_flags & 1) > 0 ? "w" : "-"
+            flag += (elf.sh[i].sh_flags & 4) > 0 ? "x" : "-"
+
+            @sections[elf.sh[i].name_str.to_s]["offset"] = elf.sh[i].sh_addr.to_i
+            @sections[elf.sh[i].name_str.to_s]["flag"] = flag
         end
     end
 
@@ -325,7 +330,7 @@ class Elf
         @dynamic = {}
         dynamic.each do |d|
             # PLTREL
-            if d.d_tag == 20 
+            if d.d_tag == 20
                 if d.d_val == 7
                     @dynamic["rel_type"]= "RELA"
                 elsif d.d_val == 17
@@ -417,7 +422,7 @@ class Elf
                 end
             end
         end
-        
+
         # extract information
         @got = {}
         rel.each do |r|

data/rubypwn.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'rubypwn'
-  s.version     = '0.0.11'
-  s.date        = '2015-09-08'
+  s.version     = '0.0.12'
+  s.date        = '2015-09-09'
   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.11
+  version: 0.0.12
 platform: ruby
 authors:
 - atdog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow