one_gadget 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f1c8cde974d024db8e485e9891dd01a8bc0d35
-  data.tar.gz: d8a48feb0e8ca9fa3df8aac6083161deb9f091e8
+  metadata.gz: 46423a7d1fbe920deb0a0c86e877395c28a26516
+  data.tar.gz: 37ad2dba4c8bcd0350e7e5c30abc58780ebc59c8
 SHA512:
-  metadata.gz: 8a649c1390edf31cab22b5affbea70f30a565ab80c5ab919dad9d1d4a9af35cc66e86012e7f888989f24602b412fcfde18cb2aeb268e8917fc7238e0e49133a3
-  data.tar.gz: ee422f8b2fa9fb1c0afdfb393678d78e956baf6ecd8b3c4cbd48b0556bcf54642729065e15a92b88115172b9acb8b29fe34b6315a59923919e4915e14799837c
+  metadata.gz: 3f7b28afa0e63fedd2cb5c052775025dbae9a5325686aaaa0f648851ca2ae925f97d9221fb56cffabcaf6fd186328e6eab2103b07a51ee0b8d2a55f8e4af24ed
+  data.tar.gz: 0e58a88ad35c44aebbfc816d15ad9fab1fd08231ed87809fa90f49d7d90c35f2356658904a5b4b96b15fc35e31a005c35bf9b6c05bb996b409d3462255073f02

data/README.md

@@ -8,11 +8,11 @@
 
 ## One Gadget
 
-When playing ctf pwn challenges we usually needs the one-gadget of `execve('/bin/sh', NULL, NULL)`.
+When playing ctf pwn challenges we usually need the one-gadget of `execve('/bin/sh', NULL, NULL)`.
 
 This gem provides such gadget finder, no need to use IDA-pro every time like a fool.
 
-Also provides the command-line tool `one_gadget` for easy usage.
+This work provides the command-line tool `one_gadget` for easy usage.
 
 Note: Supports amd64 and i386!
 

data/bin/one_gadget

@@ -1,4 +1,4 @@
-#!/usr/bun/env ruby
+#!/usr/bin/env ruby
 require 'one_gadget'
 require 'optionparser'
 

data/lib/one_gadget/fetchers/i386.rb

@@ -1,5 +1,6 @@
 require 'one_gadget/fetchers/base'
 require 'one_gadget/emulators/i386'
+require 'elftools'
 
 module OneGadget
   module Fetcher
@@ -109,9 +110,9 @@ module OneGadget
       end
 
       def rw_offset
+        elf = ELFTools::ELFFile.new(File.open(file))
         # How to find this offset correctly..?
-        line = `readelf -d #{file}|grep PLTGOT`
-        line.scan(/0x[\da-f]+/).last.to_i(16) & -0x1000
+        elf.segment_by_type(:dynamic).tag_by_type(:pltgot).header.d_val & -0x1000
       end
 
       def should_null(str)

data/lib/one_gadget/helper.rb

@@ -1,8 +1,9 @@
-require 'pathname'
-require 'shellwords'
+require 'elftools'
 require 'net/http'
 require 'openssl'
+require 'pathname'
 require 'tempfile'
+
 require 'one_gadget/logger'
 
 module OneGadget
@@ -28,10 +29,7 @@ module OneGadget
       #   build_id_of('/lib/x86_64-linux-gnu/libc-2.23.so')
       #   #=> '60131540dadc6796cab33388349e6e4e68692053'
       def build_id_of(path)
-        cmd = 'readelf -n ' + ::Shellwords.escape(path)
-        bid = `#{cmd}`.scan(/Build ID: (#{BUILD_ID_FORMAT})$/).first
-        return nil if bid.nil?
-        bid.first
+        ELFTools::ELFFile.new(File.open(path)).build_id
       end
 
       # Disable colorize
@@ -131,9 +129,10 @@ module OneGadget
       # @return [String]
       #   Only supports :amd64, :i386 now.
       def architecture(file)
-        str = `readelf -h #{::Shellwords.escape(file)}`
+        str = ELFTools::ELFFile.new(File.open(file)).machine
         return :amd64 if str.include?('X86-64')
         return :i386 if str.include?('Intel 80386')
+      rescue ELFTools::ELFError # not a valid ELF
         :unknown
       end
 

data/lib/one_gadget/version.rb

@@ -1,3 +1,3 @@
 module OneGadget
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.3'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: one_gadget
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: elftools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement