idb 2.9.0 → 2.9.1

data/lib/lib/device_ca_interface.rb

@@ -2,35 +2,29 @@ require_relative 'ca_interface'
 
 module Idb
   class DeviceCAInterface < CAInterface
-
-    def initialize device
+    def initialize(device)
       @device = device
       @device_store_path = "/private/var/Keychains/TrustStore.sqlite3"
       base_path = "#{$tmp_path}/device"
       FileUtils.mkdir_p base_path
       @db_path = "#{base_path}/TrustStore.sqlite3"
-
-
     end
 
-
-    def get_certs
+    def certs
       @device.ops.download @device_store_path, @db_path
       super
     end
 
-    def remove_cert cert
-      FileUtils.copy_file @db_path, "#{@db_path}-#{Time.now.to_s}"
+    def remove_cert(cert)
+      FileUtils.copy_file @db_path, "#{@db_path}-#{Time.now}"
       super cert
       @device.ops.upload @db_path, @device_store_path
     end
 
-    def add_cert cert_file
-      FileUtils.copy_file @db_path, "#{@db_path}-#{Time.now.to_s}"
+    def add_cert(cert_file)
+      FileUtils.copy_file @db_path, "#{@db_path}-#{Time.now}"
       super cert_file
       @device.ops.upload @db_path, @device_store_path
     end
-
-
   end
-end
+end

data/lib/lib/host_file_wrapper.rb

@@ -1,6 +1,5 @@
 module Idb
   class HostFileWrapper
-
     def initialize
       @cache_path = "#{$tmp_path}/device/hosts"
     end
@@ -9,19 +8,18 @@ module Idb
       FileUtils.mkpath "#{$tmp_path}/device" unless File.directory? "#{$tmp_path}/device"
       $device.ops.download "/etc/hosts", @cache_path
       begin
-        File.open(@cache_path,"r").read
+        File.open(@cache_path, "r").read
       rescue
-
+        $log.error "Could not open #{@cache_path}"
       end
     end
 
-    def save text
+    def save(text)
       # upload
-      File.open(@cache_path,"w") { |f|
+      File.open(@cache_path, "w") do |f|
         f.puts text
-      }
+      end
       $device.ops.upload(@cache_path, "/etc/hosts")
-
     end
   end
-end
+end

data/lib/lib/ios8_last_launch_services_map_wrapper.rb

@@ -1,32 +1,25 @@
 require 'plist4r'
 
 class IOS8LastLaunchServicesMapWrapper
-
-  def initialize plist_file
+  def initialize(plist_file)
     @plist_file = plist_file
 
     @plist_data = Plist4r.open @plist_file
   end
 
-  def entitlements_by_bundle_id bundle_id
-    begin
-      @plist_data.to_hash["User"][bundle_id]["Entitlements"]
-    rescue
-      $log.error "Could not read entitlements.."
-    end
+  def entitlements_by_bundle_id(bundle_id)
+    @plist_data.to_hash["User"][bundle_id]["Entitlements"]
+  rescue
+    $log.error "Could not read entitlements.."
   end
 
-
-  def data_path_by_bundle_id bundle_id
+  def data_path_by_bundle_id(bundle_id)
     @plist_data.to_hash["User"][bundle_id]["Container"]
   end
 
-
-  def keychain_access_groups_by_bundle_id bundle_id
-    begin
-      @plist_data.to_hash["User"][bundle_id]["Entitlements"]["keychain-access-groups"]
-    rescue
-      ""
-    end
+  def keychain_access_groups_by_bundle_id(bundle_id)
+    @plist_data.to_hash["User"][bundle_id]["Entitlements"]["keychain-access-groups"]
+  rescue
+    ""
   end
-end
+end

data/lib/lib/local_operations.rb

@@ -1,67 +1,59 @@
 module Idb
   class LocalOperations
-
-
-    def file? path
+    def file?(path)
       File.file? path
     end
 
-
-    def download a, b
-      FileUtils.copy_file(a,b)
-      return true
+    def download(a, b)
+      FileUtils.copy_file(a, b)
+      true
     end
 
-
-    def directory? path
-     File.directory? path
+    def directory?(path)
+      File.directory? path
     end
 
-    def mtime path
+    def mtime(path)
       File.mtime path
     end
 
-    def open path
-      begin
-        Launchy.open path
-        return true
-      rescue Exception => e
-        $log.error "Could not open file #{path}: #{e.message}"
-        $log.error e.backtrace
-        return false
-      end
+    def open(path)
+      Launchy.open path
+      return true
+    rescue StandardError => e
+      $log.error "Could not open file #{path}: #{e.message}"
+      $log.error e.backtrace
+      return false
     end
 
-    def list_dir path
+    def list_dir(path)
       Dir.entries path
     end
 
-    def list_dir_full path
+    def list_dir_full(path)
       Dir.entries path
     end
 
-    def dir_glob path, pattern
+    def dir_glob(path, pattern)
       full_path = "#{path}/#{pattern}"
       Dir.glob(full_path)
     end
 
-    def file_exists? file
-      File.exists? file
+    def file_exists?(file)
+      File.exist? file
     end
 
-    def execute cmd
+    def execute(cmd)
       `#{cmd}`
     end
 
-    def execute_fork cmd
+    def execute_fork(cmd)
       (pid = fork) ? Process.detach(pid) : exec(cmd)
     end
 
-    def launch_app command, app
+    def launch_app(command, app)
       $log.info "Executing #{command} #{app}"
-      self.execute_fork("#{command} \"#{app}\"")
+      execute_fork("#{command} \"#{app}\"")
     end
-
-
   end
-end
+end

data/lib/lib/otool_wrapper.rb

@@ -4,12 +4,14 @@ module Idb
   class OtoolWrapper
     attr_accessor :load_commands, :shared_libraries, :pie, :arc, :canaries
 
-    def initialize binary
+    def initialize(binary)
       @otool_path = "/usr/bin/otool"
       unless File.exist? @otool_path.to_s
         $log.error "otool not available. Some functions will not work properly."
         error = Qt::MessageBox.new
-        error.setInformativeText("This feature requires  otool to be installed on the host running idb. This is the default on OS X but it may not be available for other platforms.")
+        msg = "This feature requires  otool to be installed on the host running idb." \
+              " This is the default on OS X but it may not be available for other platforms."
+        error.setInformativeText(msg)
         error.setIcon(Qt::MessageBox::Critical)
         error.exec
         @otool_path = nil
@@ -24,17 +26,17 @@ module Idb
       process_symbol_table
     end
 
-
     private
+
     def parse_shared_libraries
       if @otool_path.nil?
-        @shared_libraries = Array.new
+        @shared_libraries = []
         @shared_libraries << "Error; otool not available"
         return
       end
       @raw_shared_libraries_output = `#{@otool_path} -L '#{@binary}'`
       lines = @raw_shared_libraries_output.split("\n")
-      @shared_libraries = lines[1,lines.size].map{ |x| x.strip} unless lines.nil?
+      @shared_libraries = lines[1, lines.size].map(&:strip) unless lines.nil?
     end
 
     def process_symbol_table
@@ -44,20 +46,19 @@ module Idb
         return
       end
       symbols = `#{@otool_path} -I -v '#{@binary}'`
-      if symbols.include? "stack_chk_fail" or symbols.include? "stack_chk_guard"
-        @canaries = true
-      else
-        @canaries = false
-      end
-
-      if symbols.include? "_objc_release"
-        @arc = true
-      else
-        @arc = false
-      end
+      @canaries = if symbols.include?("stack_chk_fail") || symbols.include?("stack_chk_guard")
+                    true
+                  else
+                    false
+                  end
+
+      @arc = if symbols.include? "_objc_release"
+               true
+             else
+               false
+             end
     end
 
-
     def hashify_otool_output(otool_output)
       # otool output may contain multiple mach headers
       mach_headers = otool_output.split("Mach header\n").map(&:strip)
@@ -65,7 +66,7 @@ module Idb
       # The newest otool version no longer echos the path of the binary being
       # inspected. Here we reject that line if it shows up in the output of
       # otool as well as any blank lines
-      mach_headers.reject!{|line| line == "" or line.include?(@binary)}
+      mach_headers.reject! { |line| (line == "") || line.include?(@binary) }
 
       # convert otool output to a hash
       mach_headers.map do |mach_header|
@@ -78,7 +79,6 @@ module Idb
       end
     end
 
-
     def parse_header
       if @otool_path.nil?
         @pie = "Error"
@@ -87,18 +87,17 @@ module Idb
       pie_flag = 0x00200000
       @raw_load_output = `#{@otool_path} -h '#{@binary}'`
 
-
       mach_hashes = hashify_otool_output(@raw_load_output)
       $log.info "Mach Hashes: #{mach_hashes}"
 
       # extract the Position Independent Executable (PIE) flag from the flags
       # value.
       mach_hashes.each do |mach_hash|
-        if (mach_hash["flags"].to_i(16) & pie_flag) == pie_flag
-          @pie = true
-        else
-          @pie = false
-        end
+        @pie = if (mach_hash["flags"].to_i(16) & pie_flag) == pie_flag
+                 true
+               else
+                 false
+               end
       end
     end
 
@@ -108,24 +107,22 @@ module Idb
         return
       end
       @raw_load_output = `#{@otool_path} -l '#{@binary}'`
-      delim = "Load command"
       regex_cmd = /Load command (\d+)/
       regex_parse_key_vals = /\s*(cmd|cryptid)\s(.+)/
 
-      @load_commands = Hash.new
+      @load_commands = {}
 
-      @raw_load_output.split("\n").each {|line|
-
-        if match = regex_cmd.match(line)
+      @raw_load_output.split("\n").each do |line|
+        if (match = regex_cmd.match(line))
           @load_commands[@cmd] = @command unless @cmd.nil?
           @cmd = match[1]
-          @command = Hash.new
+          @command = {}
         end
 
-        if match = regex_parse_key_vals.match(line)
+        if (match = regex_parse_key_vals.match(line))
           @command[match[1]] = match[2]
         end
-      }
+      end
     end
   end
 end

data/lib/lib/rsync_git_manager.rb

@@ -4,18 +4,19 @@ require 'expect'
 
 module Idb
   class RsyncGitManager
-    def initialize local_path
+    def initialize(local_path)
       @local_path = local_path
       FileUtils.mkdir_p @local_path unless Dir.exist? @local_path
 
       begin
-        @g = Git.open(local_path, :log => $log)
+        @g = Git.open(local_path, log: $log)
       rescue
-        $log.debug "Repository could not be opened. This is likely the first clone. Creating empty repo."
+        $log.debug "Repository could not be opened." \
+                   " This is likely the first clone. Creating empty repo."
         Git.init(local_path)
-        @g = Git.open(local_path, :log => $log)
+        @g = Git.open(local_path, log: $log)
         FileUtils.touch "#{local_path}/idb_dummy.placeholder"
-        @g.add(:all=>true)
+        @g.add(all: true)
         $log.debug "Committing placeholder to initialize the repo."
         begin
           @g.commit_all("Initial commit. Initializing the repo.")
@@ -26,49 +27,52 @@ module Idb
       end
     end
 
-
-    def sync_dir remote, local_relative
+    def sync_dir(remote, local_relative)
       local = @local_path + "/" + local_relative
       if $settings['device_connection_mode'] == "ssh"
-        cmd = "rsync -avz -e 'ssh -oStrictHostKeyChecking=no  -p #{$settings.ssh_port}'  #{$settings.ssh_username}@#{$settings.ssh_host}:#{Shellwords.escape(remote)}/ #{Shellwords.escape(local)}/"
+        cmd = "rsync -avz -e 'ssh -oStrictHostKeyChecking=no  -p #{$settings.ssh_port}'" \
+              "  #{$settings.ssh_username}@#{$settings.ssh_host}:#{Shellwords.escape(remote)}/" \
+              " #{Shellwords.escape(local)}/"
       else
-        cmd = "rsync -avz -e 'ssh -oStrictHostKeyChecking=no  -p #{$device.tool_port}'  root@localhost:#{Shellwords.escape(remote)}/ #{Shellwords.escape(local)}/"
+        cmd = "rsync -avz -e 'ssh -oStrictHostKeyChecking=no" \
+              "  -p #{$device.tool_port}'  root@localhost:#{Shellwords.escape(remote)}/" \
+              " #{Shellwords.escape(local)}/"
       end
 
       $log.info "Executing rsync command #{cmd}"
       begin
-        PTY.spawn(cmd) { |rsync_out, rsync_in, pid |
+        PTY.spawn(cmd) do |rsync_out, rsync_in, _pid|
           STDOUT.flush
           rsync_out.sync = true
           rsync_in.sync = true
           $expect_verbose = true
 
-          rsync_out.expect(/assword: /) { |x|
+          rsync_out.expect(/assword: /) do |_x|
             begin
               $log.info "Supplying password for rsync if required..."
               rsync_in.printf("#{$settings.ssh_password}\n")
             rescue
               $log.info "No password required for rsync...."
             end
-          }
+          end
 
-          rsync_out.each { |x|
+          rsync_out.each do |x|
             $log.info x
-          }
+          end
           PTY.check
-        }
+        end
       rescue
+        $log.error "Something went wrong"
       end
-
     end
 
-
     def commit_new_revision
       $log.info "Rsync Done. committing to git."
-      @g.add(:all=>true)
+      @g.add(all: true)
       begin
-        @g.commit_all("Snapshot from #{Time.now.to_s}")
+        @g.commit_all("Snapshot from #{Time.now}")
       rescue
+        $log.error "Something went wrong"
       end
     end
 
@@ -77,9 +81,9 @@ module Idb
       begin
         @g.reset_hard
       rescue
-        $log.error "Reset of repo failed. If this is the first time you run rsync+git for this app this may be okay."
+        $log.error "Reset of repo failed. If this is the first time you" \
+                   " run rsync+git for this app this may be okay."
       end
     end
-
   end
-end
+end