patchelf 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0268e11ae1f743826ab85b81245876d13ec987f4bf9b530f399260447b939aa
-  data.tar.gz: f8fca7603e33bdea3d44c328076a64a37172d61c49d1fd7a7915fe5b4d9ddba3
+  metadata.gz: f510dcd400f1ea47ee4f7740f7f64a01e392b1e8230c4065aa3456541446ca6a
+  data.tar.gz: 3196e51a7a26fe50d83341a8552645e6855f880d2ba6ca337dc856424ec0bbdd
 SHA512:
-  metadata.gz: 462df528984a4f51efb4f9b0f589b0378ff4b28a1008357c0f7b7b4cdaa4a41739402c3821cc6b06a1dccd7292e02c1f2e1d9513a7926e9708b56e0abc66ba84
-  data.tar.gz: acddd987c408cf26dc323a6873d5db81aba3635ffba5e9eb6a3d4ca76f2d0d5cfe395739073f0594307274be756e5f270b162cbc952ac5d4797672b321ddeb5f
+  metadata.gz: 4a7595a75b43139c254f2b25c1f2a3effd97d4e0c8ad0227c6493eee043904a6ee73bdc16fd46ff2276bcd6b3b595878f1ea8e2bdba8b1c34e85131379db7687
+  data.tar.gz: b766c4045369095334d768002a07ff9a2d8b7193134b865e0b0d2e9443716cfc92927ca980fcf7e3053314d17ef1a63cc5fff017a5bcb8805a69ca2aae5c953a

data/README.md

@@ -134,4 +134,4 @@ patcher.save('ls.patch')
 
 ## Environment
 
-patchelf.rb is implemented in pure Ruby, so it should work in all environments include Linux, maxOS, and Windows!
+patchelf.rb is implemented in pure Ruby, so it should work in all environments include Linux, macOS, and Windows!

data/lib/patchelf/cli.rb

@@ -34,9 +34,24 @@ module PatchELF
       return $stdout.puts option_parser unless parse(argv)
 
       # Now the options are (hopefully) valid, let's process the ELF file.
-      patcher = PatchELF::Patcher.new(@options[:in_file])
+      begin
+        @patcher = PatchELF::Patcher.new(@options[:in_file])
+      rescue ELFTools::ELFError, Errno::ENOENT => e
+        return PatchELF::Logger.error(e.message)
+      end
       patcher.use_rpath! if @options[:force_rpath]
-      # TODO: Handle ELFTools::ELFError
+      readonly
+      patch_requests
+      patcher.save(@options[:out_file])
+    end
+
+    private
+
+    def patcher
+      @patcher
+    end
+
+    def readonly
       @options[:print].uniq.each do |s|
         content = patcher.__send__(s)
         next if content.nil?
@@ -44,7 +59,9 @@ module PatchELF
         s = :rpath if @options[:force_rpath] && s == :runpath
         $stdout.puts "#{s}: #{Array(content).join(' ')}"
       end
+    end
 
+    def patch_requests
       @options[:set].each do |sym, val|
         patcher.__send__("#{sym}=".to_sym, val)
       end
@@ -52,12 +69,8 @@ module PatchELF
       @options[:needed].each do |type, val|
         patcher.__send__("#{type}_needed".to_sym, *val)
       end
-
-      patcher.save(@options[:out_file])
     end
 
-    private
-
     def parse(argv)
       remain = option_parser.permute(argv)
       return false if remain.first.nil?

data/lib/patchelf/exceptions.rb

@@ -0,0 +1,9 @@
+# encoding: ascii-8bit
+# frozen_string_literal: true
+
+require 'elftools/exceptions'
+
+module PatchELF
+  # Raised on an error during ELF modification.
+  class PatchError < ELFTools::ELFError; end
+end

data/lib/patchelf/mm.rb

@@ -25,7 +25,8 @@ module PatchELF
     #   1. Set ELF headers' attributes (with ELFTools)
     #   2. Invoke {Saver#inline_patch}
     def malloc(size, &block)
-      # TODO: check size > 0
+      raise ArgumentError, 'malloc\'s size most be positive.' if size <= 0
+
       @request << [size, block]
     end
 
@@ -133,6 +134,7 @@ module PatchELF
       nil
     end
 
+    # TODO
     def new_load_method
       raise NotImplementedError
     end

data/lib/patchelf/patcher.rb

@@ -3,6 +3,7 @@
 
 require 'elftools/elf_file'
 
+require 'patchelf/exceptions'
 require 'patchelf/logger'
 require 'patchelf/saver'
 
@@ -15,11 +16,14 @@ module PatchELF
     # Instantiate a {Patcher} object.
     # @param [String] filename
     #   Filename of input ELF.
-    def initialize(filename)
+    # @param [Boolean] logging
+    #   Whether to use a (stderr-initialized) logger for errors
+    def initialize(filename, logging: true)
       @in_file = filename
       @elf = ELFTools::ELFFile.new(File.open(filename))
       @set = {}
       @rpath_sym = :runpath
+      @logging = logging
     end
 
     # @return [String?]
@@ -156,9 +160,15 @@ module PatchELF
 
     private
 
+    def log_or_raise(msg)
+      raise PatchELF::PatchError, msg unless @logging
+
+      PatchELF::Logger.warn(msg)
+    end
+
     def interpreter_
       segment = @elf.segment_by_type(:interp)
-      return PatchELF::Logger.warn('No interpreter found.') if segment.nil?
+      return log_or_raise 'No interpreter found.' if segment.nil?
 
       segment.interp_name
     end
@@ -191,14 +201,14 @@ module PatchELF
       return if segment.nil?
 
       tag = segment.tag_by_type(type)
-      return PatchELF::Logger.warn(log_msg) if tag.nil?
+      return log_or_raise log_msg if tag.nil?
 
       tag.name
     end
 
     def dynamic_or_log
       @elf.segment_by_type(:dynamic).tap do |s|
-        PatchELF::Logger.warn('DYNAMIC segment not found, might be a statically-linked ELF?') if s.nil?
+        log_or_raise 'DYNAMIC segment not found, might be a statically-linked ELF?' if s.nil?
       end
     end
   end

data/lib/patchelf/saver.rb

@@ -189,9 +189,10 @@ module PatchELF
       @mm.malloc(need_size) do |off, vaddr|
         new_str = strtab_string + @strtab_extend_requests.map(&:first).join("\x00") + "\x00"
         inline_patch(off, new_str)
+        cur = strtab_string.size
         @strtab_extend_requests.each do |str, block|
-          # TODO: make here more efficient
-          block.call(new_str.index(str + "\x00"))
+          block.call(cur)
+          cur += str.size + 1
         end
         # Now patching strtab header
         strtab.header.d_val = vaddr

data/lib/patchelf/version.rb

@@ -2,5 +2,5 @@
 
 module PatchELF
   # Current gem version.
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchelf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elftools
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: tty-platform
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,7 @@ files:
 - bin/patchelf.rb
 - lib/patchelf.rb
 - lib/patchelf/cli.rb
+- lib/patchelf/exceptions.rb
 - lib/patchelf/helper.rb
 - lib/patchelf/logger.rb
 - lib/patchelf/mm.rb
@@ -140,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: patchelf