one_gadget 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc34f437cb6bb8562f408c558c9d58f9c6b88658
-  data.tar.gz: 0604cd9f82c3c66500ce54b529255fa3fc323af3
+  metadata.gz: 43bf496ed69e442f3a6672eff7b0e3f7dffe9256
+  data.tar.gz: 2ef6da1b0f7173adf036ad43e99533fd98005606
 SHA512:
-  metadata.gz: 3ff369c093af7bffab44931cf6cac32e8f961f91576e435a48245d5cc7b3c6bec17b3ca5d450f337d86852c5339b010d56dc39e1ddc8e4828894ab12ab317f1e
-  data.tar.gz: 78d0f190661d5275ab4bb29d3063f8dd883fbe8a37422dead64c2b9fc0ad32bfe006dc13a2e52a3130deda3fba3488410bb58b85f4b0853c5d0a7aa0e4aafc45
+  metadata.gz: fa4a2851e9ad28b690c7f2d7c4bcb4c3797d4b587b0b5a02d130d06628576aabbc73812d837c8efd04ea099c98659f0b9447c3d184894781198deae234707a44
+  data.tar.gz: 76ff23514c99da82136f7f55d3ba44d7dfcf48a56dba3db853e994ad90bcd8f341d963cb5cf9fb53bebf562dcadf1819bab6d02fbbd5f80625ce9ac20f94504d

data/README.md

@@ -15,8 +15,6 @@ Also provides the command-line tool `one_gadget` for easy usage.
 
 Note: Supports amd64 and i386!
 
-Note2: still work in progress, the gem version might update frequently :p.
-
 ## Install
 
 Available on RubyGems.org!

data/lib/one_gadget/builds/libc-2.23-369de0e1d833caa693af17f17c83ba937f0a4dad.rb

@@ -0,0 +1,8 @@
+require 'one_gadget/gadget'
+# Ubuntu GLIBC 2.23-0ubuntu3
+# ELF 64-bit LSB shared object, x86-64
+build_id = File.basename(__FILE__, '.rb').split('-').last
+OneGadget::Gadget.add(build_id, 0x4525a, constraints: ['[rsp+0x30] == NULL'])
+OneGadget::Gadget.add(build_id, 0xef9f4, constraints: ['[rsp+0x50] == NULL'])
+OneGadget::Gadget.add(build_id, 0xf0897, constraints: ['[rsp+0x70] == NULL'])
+OneGadget::Gadget.add(build_id, 0xf5e40, constraints: ['[rbp-0xf8] == NULL', 'rcx == NULL'])

data/lib/one_gadget/builds/libc-2.23-926eb99d49cab2e5622af38ab07395f5b32035e9.rb

@@ -1,7 +1,7 @@
 require 'one_gadget/gadget'
 # Ubuntu GLIBC 2.23-0ubuntu5
 # ELF 32-bit LSB shared object, Intel 80386
-build_id = File.basename(__FILE__, '.rb').split('-').last + 'a'
+build_id = File.basename(__FILE__, '.rb').split('-').last
 rw_area_constraint = 'esi is the address of `rw-p` area of libc'
 OneGadget::Gadget.add(build_id, 0x3ac69, constraints: [rw_area_constraint, '[esp+0x34] == NULL'])
 OneGadget::Gadget.add(build_id, 0x5fbbe, constraints: [rw_area_constraint, 'eax == NULL'])

data/lib/one_gadget/builds/libc-2.23-edceed30099baad51871c5fc277daf9b74dc726a.rb

@@ -0,0 +1,8 @@
+require 'one_gadget/gadget'
+# Ubuntu GLIBC 2.23-0ubuntu5
+# ELF 32-bit LSB shared object, Intel 80386
+build_id = File.basename(__FILE__, '.rb').split('-').last
+rw_area_constraint = 'esi is the address of `rw-p` area of libc'
+OneGadget::Gadget.add(build_id, 0x3a7f9, constraints: [rw_area_constraint, '[esp+0x34] == NULL'])
+OneGadget::Gadget.add(build_id, 0x5ef3e, constraints: [rw_area_constraint, 'eax == NULL'])
+OneGadget::Gadget.add(build_id, 0x11dcb5, constraints: [rw_area_constraint, 'eax == NULL'])

data/lib/one_gadget/fetchers/amd64.rb

@@ -3,6 +3,8 @@ module OneGadget
   module Fetcher
     # Fetcher for amd64.
     class Amd64 < OneGadget::Fetcher::Base
+      # Gadgets for amd64 glibc.
+      # @return [Array<OneGadget::Gadget::Gadget>] Gadgets found.
       def find
         bin_sh_hex = str_offset('/bin/sh').to_s(16)
         cands = candidates do |candidate|

data/lib/one_gadget/fetchers/base.rb

@@ -4,12 +4,17 @@ module OneGadget
   module Fetcher
     # define common methods for gadget fetchers.
     class Base
+      # The absolute path of glibc.
+      # @return [String] The filename.
       attr_reader :file
+      # Instantiate a fetcher object.
       # @param [String] file Absolute path of target libc.
       def initialize(file)
         @file = ::Shellwords.escape(file)
       end
 
+      # Method need to be implemented in inheritors.
+      # @return [Array<OneGadget::Gadget::Gadget>] Gadgets found.
       def find; raise NotImplementedError
       end
 

data/lib/one_gadget/fetchers/i386.rb

@@ -3,6 +3,8 @@ module OneGadget
   module Fetcher
     # Fetcher for i386.
     class I386 < OneGadget::Fetcher::Base
+      # Gadgets for i386 glibc.
+      # @return [Array<OneGadget::Gadget::Gadget>] Gadgets found.
       def find
         rw_off = rw_offset
         bin_sh = str_offset('/bin/sh')

data/lib/one_gadget/helper.rb

@@ -68,10 +68,10 @@ module OneGadget
       # Fetch the latest release version's tag name.
       # @return [String] The tag name, in form +vx.x.x+.
       def latest_tag
-        latest = url_request('https://github.com/david942j/one_gadget/releases').scan(%r{/tree/v([\d.]+)"}).map do |tag|
+        releases_url = 'https://github.com/david942j/one_gadget/releases'
+        @latest_tag ||= 'v' + url_request(releases_url).scan(%r{/tree/v([\d.]+)"}).map do |tag|
           Gem::Version.new(tag.first)
         end.max.to_s
-        'v' + latest
       end
 
       # Get the url which can fetch +filename+ from remote repo.
@@ -97,14 +97,13 @@ module OneGadget
       # Get the latest builds list from repo.
       # @return [Array<String>] List of build ids.
       def remote_builds
-        url_request(url_of_file('builds_list')).lines.map(&:strip)
+        @remote_builds ||= url_request(url_of_file('builds_list')).lines.map(&:strip)
       end
 
       # Get request.
       # @param [String] url The url.
       # @return [String] The request response body.
       def url_request(url)
-        # TODO: add timeout to handle github crashed or in no network environment.
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
@@ -113,7 +112,11 @@ module OneGadget
         request = Net::HTTP::Get.new(uri.request_uri)
 
         response = http.request(request)
+        raise ArgumentError, "Fail to get response of #{url}" unless response.code == '200'
         response.body
+      rescue NoMethodError, SocketError, ArgumentError => e
+        p e
+        nil
       end
 
       # Show the message of ask user to update gem.

data/lib/one_gadget/logger.rb

@@ -14,6 +14,10 @@ module OneGadget
       "[#{OneGadget::Helper.colorize('OneGadget', sev: :reg)}] #{message.join}"
     end
 
+    # The logger info.
+    # @param [String] msg
+    #   Message to be logged.
+    # @return [void]
     def self.info(msg)
       @logger.info(msg)
     end

data/lib/one_gadget/version.rb

@@ -1,3 +1,3 @@
 module OneGadget
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one_gadget
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -97,8 +97,10 @@ files:
 - bin/one_gadget
 - lib/one_gadget.rb
 - lib/one_gadget/abi.rb
+- lib/one_gadget/builds/libc-2.23-369de0e1d833caa693af17f17c83ba937f0a4dad.rb
 - lib/one_gadget/builds/libc-2.23-60131540dadc6796cab33388349e6e4e68692053.rb
 - lib/one_gadget/builds/libc-2.23-926eb99d49cab2e5622af38ab07395f5b32035e9.rb
+- lib/one_gadget/builds/libc-2.23-edceed30099baad51871c5fc277daf9b74dc726a.rb
 - lib/one_gadget/fetcher.rb
 - lib/one_gadget/fetchers/amd64.rb
 - lib/one_gadget/fetchers/base.rb
@@ -107,15 +109,6 @@ files:
 - lib/one_gadget/helper.rb
 - lib/one_gadget/logger.rb
 - lib/one_gadget/version.rb
-- spec/data/libc-2.19-cf699a15caae64f50311fc4655b86dc39a479789.so
-- spec/data/libc-2.19-fd51b20e670e9a9f60dc3b06dc9761fb08c9358b.so
-- spec/data/libc-2.23-60131540dadc6796cab33388349e6e4e68692053.so
-- spec/data/libc-2.23-926eb99d49cab2e5622af38ab07395f5b32035e9.so
-- spec/gadget_spec.rb
-- spec/helper_spec.rb
-- spec/one_gadget_amd64_spec.rb
-- spec/one_gadget_i386_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/david942j/one_gadget
 licenses:
 - MIT
@@ -140,13 +133,4 @@ rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: one_gadget
-test_files:
-- spec/one_gadget_i386_spec.rb
-- spec/one_gadget_amd64_spec.rb
-- spec/data/libc-2.23-926eb99d49cab2e5622af38ab07395f5b32035e9.so
-- spec/data/libc-2.19-cf699a15caae64f50311fc4655b86dc39a479789.so
-- spec/data/libc-2.23-60131540dadc6796cab33388349e6e4e68692053.so
-- spec/data/libc-2.19-fd51b20e670e9a9f60dc3b06dc9761fb08c9358b.so
-- spec/spec_helper.rb
-- spec/helper_spec.rb
-- spec/gadget_spec.rb
+test_files: []

data/spec/gadget_spec.rb

@@ -1,22 +0,0 @@
-require 'one_gadget/gadget'
-require 'one_gadget/helper'
-describe OneGadget::Gadget do
-  before(:all) do
-    @build_id = 'fake_id'
-    OneGadget::Helper.color_off! # disable colorize for easy testing.
-    OneGadget::Gadget.add(@build_id, 0x1234, constraints: ['[rsp+0x30] == NULL', 'rax == 0'])
-  end
-
-  after(:all) do
-    OneGadget::Gadget::ClassMethods::BUILDS.delete @build_id
-  end
-
-  it 'inspect' do
-    expect(OneGadget::Gadget.builds(@build_id).map(&:inspect).join).to eq <<-EOS
-offset: 0x1234
-constraints:
-  [rsp+0x30] == NULL
-  rax == 0
-    EOS
-  end
-end

data/spec/helper_spec.rb

@@ -1,25 +0,0 @@
-require 'one_gadget/helper'
-
-describe OneGadget::Helper do
-  before(:all) do
-    OneGadget::Helper.color_on!
-    @libcpath = File.join(File.dirname(__FILE__), 'data', 'libc-2.23-60131540dadc6796cab33388349e6e4e68692053.so')
-  end
-  it 'abspath' do
-    expect(OneGadget::Helper.abspath('./spec/data/libc-2.23-60131540dadc6796cab33388349e6e4e68692053.so'))
-      .to eq @libcpath
-  end
-
-  it 'build_id_of' do
-    expect(OneGadget::Helper.build_id_of(@libcpath)).to eq '60131540dadc6796cab33388349e6e4e68692053'
-  end
-
-  it 'colorize' do
-    expect(OneGadget::Helper.colorize('123', sev: :integer)).to eq "\e[38;5;12m123\e[0m"
-  end
-
-  it 'architecture' do
-    expect(OneGadget::Helper.architecture(@libcpath)).to be :amd64
-    expect(OneGadget::Helper.architecture(__FILE__)).to be :unknown
-  end
-end

data/spec/one_gadget_amd64_spec.rb

@@ -1,31 +0,0 @@
-require 'one_gadget'
-
-describe 'one_gadget' do
-  before(:each) do
-    @build_id = '60131540dadc6796cab33388349e6e4e68692053'
-    @libcpath = File.join(File.dirname(__FILE__), 'data', 'libc-2.19-cf699a15caae64f50311fc4655b86dc39a479789.so')
-  end
-
-  it 'from file' do
-    expect(OneGadget.gadgets(file: @libcpath)).to eq [0x4647c, 0xe5765, 0xe66bd]
-  end
-
-  describe 'from build id' do
-    it 'normal' do
-      # only check not empty because the gadgets might add frequently.
-      expect(OneGadget.gadgets(build_id: @build_id)).not_to be_empty
-    end
-
-    it 'invalid' do
-      expect { OneGadget.gadgets(build_id: '^_^') }.to raise_error(ArgumentError, 'invalid BuildID format: "^_^"')
-    end
-
-    it 'fetch from remote' do
-      entry = OneGadget::Gadget::ClassMethods::BUILDS.delete(@build_id)
-      OneGadget::Gadget::ClassMethods::BUILDS[:a] = 1
-      expect(OneGadget.gadgets(build_id: @build_id)).not_to be_empty
-      OneGadget::Gadget::ClassMethods::BUILDS.delete(:a)
-      OneGadget::Gadget::ClassMethods::BUILDS[@build_id] = entry unless entry.nil?
-    end
-  end
-end

data/spec/one_gadget_i386_spec.rb

@@ -1,24 +0,0 @@
-require 'one_gadget'
-
-describe 'one_gadget' do
-  before(:each) do
-    @build_id = '926eb99d49cab2e5622af38ab07395f5b32035e9'
-    @libcpath19 = File.join(File.dirname(__FILE__), 'data', 'libc-2.19-fd51b20e670e9a9f60dc3b06dc9761fb08c9358b.so')
-    @libcpath23 = File.join(File.dirname(__FILE__), 'data', 'libc-2.23-926eb99d49cab2e5622af38ab07395f5b32035e9.so')
-  end
-
-  it 'from file libc-2.19' do
-    expect(OneGadget.gadgets(file: @libcpath19, force_file: true)).to eq [0x3fd27, 0x64c60, 0x1244a6]
-  end
-
-  it 'from file libc-2.23' do
-    expect(OneGadget.gadgets(file: @libcpath23, force_file: true)).to eq [0x3ac69, 0x5fbbe, 0x12036c]
-  end
-
-  describe 'from build id' do
-    it 'normal' do
-      # only check not empty because the gadgets might add frequently.
-      expect(OneGadget.gadgets(build_id: @build_id)).not_to be_empty
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,8 +0,0 @@
-require 'codeclimate-test-reporter'
-require 'simplecov'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-  [SimpleCov::Formatter::HTMLFormatter, CodeClimate::TestReporter::Formatter]
-)
-SimpleCov.start do
-  add_filter '/spec/'
-end