ruby-macho 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce4c78f7559d54d07390f535cfe67da8b747ca9d
-  data.tar.gz: 5e1da197dae79a1d084781898e01c5576704b54e
+  metadata.gz: e6bf6b45bcf73b710246fe124075f4ca77c73070
+  data.tar.gz: 5713089fd72d423c6a25b90839e29a317072169b
 SHA512:
-  metadata.gz: 5534f18bf42c95de58c33abb7a98521496cc1258a99049784a1030d145efaaf59755575db792eab1ad714da02a003eebee0c97c9f7c8f301df12b794fabb4c48
-  data.tar.gz: e5f681c4c01f9105dfcb087d36d74870ea0fbef69336bfd5286ab8787d7e1c2555c049699510c38fa42c6ccb1bb876cbe177e3db7ebfec86334824721a7199e0
+  metadata.gz: a2aaa85277768159ee35ff7e44817afd1bad136884a2ced66dd471a39657e3827d4adbb7987fbca38c36aae25ef2ec3f8bfa5b9296d06013443f8f2e77db85fc
+  data.tar.gz: 20d89669d43b4fa964f878ade17d5130c58743a9bd742978e36cb485a32f4575d1d81957eb68719647340a9fc83120da611570e70da54a27ede7a4fe5adb02a2

data/lib/macho.rb

@@ -1,13 +1,13 @@
-$:.unshift File.dirname(__FILE__)
-
 require "cstruct"
 require "macho/headers"
 require "macho/structure"
 require "macho/load_commands"
 require "macho/sections"
-require "macho/file"
+require "macho/macho_file"
+require "macho/fat_file"
 require "macho/exceptions"
 require "macho/utils"
+require "macho/tools"
 
 module MachO
 	# nothing to see here.

data/lib/macho/exceptions.rb

@@ -10,10 +10,15 @@ module MachO
 		end
 	end
 
-	# raised when a file's magic bytes are those of a fat binary
 	class FatBinaryError < MachOError
-		def initialize(num)
-			super "Unsupported fat binary (magic 0x#{"%02x" % num})"
+		def initialize
+			super "Fat binaries must be loaded with MachO::FatFile"
+		end
+	end
+
+	class MachOBinaryError < MachOError
+		def initialize
+			super "Normal binaries must be loaded with MachO::MachOFile"
 		end
 	end
 

data/lib/macho/fat_file.rb

@@ -0,0 +1,114 @@
+module MachO
+	class FatFile
+		attr_reader :header, :fat_archs, :machos
+
+		def initialize(filename)
+			raise ArgumentError.new("filename must be a String") unless filename.is_a? String
+
+			@filename = filename
+			@raw_data = open(@filename, "rb") { |f| f.read }
+			@header = get_fat_header
+			@fat_archs = get_fat_archs
+			@machos = get_machos
+		end
+
+		def serialize
+			@raw_data
+		end
+
+		def dylib_id
+			if !machos.all?(&:dylib?)
+				return nil
+			end
+
+			ids = machos.map(&:dylib_id)
+
+			# this should never be the case, but let's be defensive
+			if !ids.uniq!.size == 1
+				return nil
+			end
+
+			ids.first
+		end
+
+		def dylib_id=(new_id)
+			if !new_id.is_a?(String)
+				raise ArgumentError.new("argument must be a String")
+			end
+
+			if !machos.all?(&:dylib?)
+				return nil
+			end
+
+			machos.each do |macho|
+				macho.dylib_id = new_id
+			end
+
+			synchronize_raw_data
+		end
+
+		def linked_dylibs
+			dylibs = machos.map(&:linked_dylibs)
+
+			# can machos inside fat binaries have different dylibs?
+			dylibs.uniq!
+		end
+
+		def write(filename)
+			File.open(filename, "wb") { |f| f.write(@raw_data) }
+		end
+
+		def write!
+			File.open(@filename, "wb") { |f| f.write(@raw_data) }
+		end
+
+		private
+
+		def get_fat_header
+			magic, nfat_arch = @raw_data[0..7].unpack("N2")
+
+			if !Utils.magic?(magic)
+				raise MagicError.new(magic)
+			end
+
+			if !Utils.fat_magic?(magic)
+				raise MachOBinaryError.new
+			end
+
+			FatHeader.new(magic, nfat_arch)
+		end
+
+		def get_fat_archs
+			archs = []
+
+			header[:nfat_arch].times do |i|
+				fields = @raw_data[8 + (FatArch.bytesize * i), FatArch.bytesize].unpack("N5")
+				archs << FatArch.new(*fields)
+			end
+
+			archs
+		end
+
+		def get_machos
+			machos = []
+
+			fat_archs.each do |arch|
+				machos << MachOFile.new_from_bin(@raw_data[arch[:offset], arch[:size]])
+			end
+
+			machos
+		end
+
+		# when we create machos within FatFile, we initialize them with slices
+		# from @raw_data. this means creating new arrays that don't affect
+		# @raw_data directly, so we need to synchronize it after changing
+		# anything within the machos.
+		def synchronize_raw_data
+			machos.each_with_index do |macho, i|
+				arch = fat_archs[i]
+
+				@raw_data[arch[:offset], arch[:size]] = macho.serialize
+			end
+		end
+	end
+end

data/lib/macho/headers.rb

@@ -79,7 +79,62 @@ module MachO
 		MH_KEXT_BUNDLE => "MH_KEXT_BUNDLE"
 	}
 
-	# TODO: declare values for flags in MachHeader/MachHeader64
+	# values for flags field in MachHeader/MachHeader64
+	MH_NOUNDEFS = 0x1
+	MH_INCRLINK = 0x2
+	MH_DYLDLINK = 0x4
+	MH_BINDATLOAD = 0x8
+	MH_PREBOUND = 0x10
+	MH_SPLIT_SEGS = 0x20
+	MH_LAZY_INIT = 0x40
+	MH_TWOLEVEL = 0x80
+	MH_FORCE_FLAT = 0x100
+	MH_NOMULTIDEFS = 0x200
+	MH_NOPREFIXBINDING = 0x400
+	MH_PREBINDABLE = 0x800
+	MH_ALLMODSBOUND = 0x1000
+	MH_SUBSECTIONS_VIA_SYMBOLS = 0x2000
+	MH_CANONICAL = 0x4000
+	MH_WEAK_DEFINES = 0x8000
+	MH_BINDS_TO_WEAK = 0x10000
+	MH_ALLOW_STACK_EXECUTION = 0x20000
+	MH_ROOT_SAFE = 0x40000
+	MH_SETUID_SAFE = 0x80000
+	MH_NO_REEXPORTED_DYLIBS = 0x100000
+	MH_PIE = 0x200000
+	MH_DEAD_STRIPPABLE_DYLIB = 0x400000
+	MH_HAS_TLV_DESCRIPTORS = 0x800000
+	MH_NO_HEAP_EXECUTION = 0x1000000
+	MH_APP_EXTENSION_SAFE = 0x02000000
+
+	MH_FLAGS = {
+		MH_NOUNDEFS => "MH_NOUNDEFS",
+		MH_INCRLINK => "MH_INCRLINK",
+		MH_DYLDLINK => "MH_DYLDLINK",
+		MH_BINDATLOAD => "MH_BINDATLOAD",
+		MH_PREBOUND => "MH_PREBOUND",
+		MH_SPLIT_SEGS => "MH_SPLIT_SEGS",
+		MH_LAZY_INIT => "MH_LAZY_INIT",
+		MH_TWOLEVEL => "MH_TWOLEVEL",
+		MH_FORCE_FLAT => "MH_FORCE_FLAT",
+		MH_NOMULTIDEFS => "MH_NOMULTIDEFS",
+		MH_NOPREFIXBINDING => "MH_NOPREFIXBINDING",
+		MH_PREBINDABLE => "MH_PREBINDABLE",
+		MH_ALLMODSBOUND => "MH_ALLMODSBOUND",
+		MH_SUBSECTIONS_VIA_SYMBOLS => "MH_SUBSECTIONS_VIA_SYMBOLS",
+		MH_CANONICAL => "MH_CANONICAL",
+		MH_WEAK_DEFINES => "MH_WEAK_DEFINES",
+		MH_BINDS_TO_WEAK => "MH_BINDS_TO_WEAK",
+		MH_ALLOW_STACK_EXECUTION => "MH_ALLOW_STACK_EXECUTION",
+		MH_ROOT_SAFE => "MH_ROOT_SAFE",
+		MH_SETUID_SAFE => "MH_SETUID_SAFE",
+		MH_NO_REEXPORTED_DYLIBS => "MH_NO_REEXPORTED_DYLIBS",
+		MH_PIE => "MH_PIE",
+		MH_DEAD_STRIPPABLE_DYLIB => "MH_DEAD_STRIPPABLE_DYLIB",
+		MH_HAS_TLV_DESCRIPTORS => "MH_HAS_TLV_DESCRIPTORS",
+		MH_NO_HEAP_EXECUTION => "MH_NO_HEAP_EXECUTION",
+		MH_APP_EXTENSION_SAFE => "MH_APP_EXTENSION_SAFE"
+	}
 
 	# 'Fat' binaries envelop Mach-O binaries so include them for completeness,
 	# Fat binary header structure
@@ -106,6 +161,10 @@ module MachO
 		uint32 :ncmds
 		uint32 :sizeofcmds
 		uint32 :flags
+
+		def flag?(flag)
+			flags & flag == flag
+		end
 	end
 
 	# 64-bit Mach-O file header structure
@@ -118,5 +177,9 @@ module MachO
 		uint32 :sizeofcmds
 		uint32 :flags
 		uint32 :reserved
+
+		def flag?(flag)
+			flags & flag == flag
+		end
 	end
 end

data/lib/macho/load_commands.rb

@@ -152,6 +152,17 @@ module MachO
 		LC_LINKER_OPTIMIZATION_HINT => "LinkeditDataCommand"
 	}
 
+	# currently known segment names
+	# we don't use these anywhere right now, but they're good to have
+	SEG_PAGEZERO = "__PAGEZERO"
+	SEG_TEXT = "__TEXT"
+	SEG_DATA = "__DATA"
+	SEG_OBJC = "__OBJC"
+	SEG_ICON = "__ICON"
+	SEG_LINKEDIT = "__LINKEDIT"
+	SEG_UNIXSTACK = "__UNIXSTACK"
+	SEG_IMPORT = "__IMPORT"
+
 	# Mach-O load command structure
 	# this is the most generic load command - only cmd ID and size are
 	# represented, and no actual data. used when a more specific class

data/lib/macho/{file.rb → macho_file.rb}

@@ -2,6 +2,13 @@ module MachO
 	class MachOFile
 		attr_reader :header, :load_commands
 
+		def self.new_from_bin(bin)
+			instance = allocate
+			instance.initialize_from_bin(bin)
+
+			instance
+		end
+
 		def initialize(filename)
 			raise ArgumentError.new("filename must be a String") unless filename.is_a? String
 
@@ -11,6 +18,17 @@ module MachO
 			@load_commands = get_load_commands
 		end
 
+		def initialize_from_bin(bin)
+			@filename = nil
+			@raw_data = bin
+			@header = get_mach_header
+			@load_commands = get_load_commands
+		end
+
+		def serialize
+			@raw_data
+		end
+
 		def magic32?
 			Utils.magic32?(header[:magic])
 		end
@@ -231,10 +249,13 @@ module MachO
 		end
 
 		def write!
-			File.open(@filename, "wb") { |f| f.write(@raw_data) }
+			if @filename.nil?
+				raise MachOError.new("cannot write to a default file when initialized from a binary string")
+			else
+				File.open(@filename, "wb") { |f| f.write(@raw_data) }
+			end
 		end
 
-		#######
 		private
 
 		def get_mach_header
@@ -247,10 +268,10 @@ module MachO
 			flags = get_flags
 			
 			if Utils.magic32?(magic)
-				header = MachHeader.new(magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags)
+				MachHeader.new(magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags)
 			else
-				# the reserved field is reserved, so just fill it with 0
-				header = MachHeader64.new(magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags, 0)
+				# the reserved field is...reserved, so just fill it with 0
+				MachHeader64.new(magic, cputype, cpusubtype, filetype, ncmds, sizeofcmds, flags, 0)
 			end
 		end
 
@@ -261,9 +282,8 @@ module MachO
 				raise MagicError.new(magic)
 			end
 			
-			# TODO: support fat (universal) binaries
 			if Utils.fat_magic?(magic)
-				raise FatBinaryError.new(magic)
+				raise FatBinaryError.new
 			end
 
 			magic
@@ -272,7 +292,7 @@ module MachO
 		def get_cputype
 			cputype = @raw_data[4..7].unpack("V").first
 
-			if !CPU_TYPES.keys.include?(cputype)
+			if !CPU_TYPES.has_key?(cputype)
 				raise CPUTypeError.new(cputype)
 			end
 
@@ -285,7 +305,7 @@ module MachO
 			# this mask isn't documented!
 			cpusubtype &= ~CPU_SUBTYPE_LIB64
 
-			if !CPU_SUBTYPES.keys.include?(cpusubtype)
+			if !CPU_SUBTYPES.has_key?(cpusubtype)
 				raise CPUSubtypeError.new(cpusubtype)
 			end
 
@@ -295,7 +315,7 @@ module MachO
 		def get_filetype
 			filetype = @raw_data[12..15].unpack("V").first
 
-			if !MH_FILETYPES.keys.include?(filetype)
+			if !MH_FILETYPES.has_key?(filetype)
 				raise FiletypeError.new(filetype)
 			end
 
@@ -314,7 +334,6 @@ module MachO
 			sizeofcmds
 		end
 
-		# TODO: parse flags, maybe?
 		def get_flags
 			flags = @raw_data[24..27].unpack("V").first
 
@@ -334,7 +353,7 @@ module MachO
 
 				# why do I do this? i don't like declaring constants below
 				# classes, and i need them to resolve...
-				klass = Object.const_get "MachO::#{LC_STRUCTURES[cmd]}"
+				klass = MachO.const_get "#{LC_STRUCTURES[cmd]}"
 				command = klass.new_from_bin(offset, @raw_data.slice(offset, klass.bytesize))
 
 				load_commands << command

data/lib/macho/sections.rb

@@ -41,6 +41,21 @@ module MachO
 	S_ATTR_EXT_RELOC = 0x00000200
 	S_ATTR_LOC_RELOC = 0x00000100
 
+	# currently known section names
+	# we don't use these anywhere right now, but they're good to have
+	SECT_TEXT = "__text"
+	SECT_FVMLIB_INIT0 = "__fvmlib_init0"
+	SECT_FVMLIB_INIT1 = "__fvmlib_init1"
+	SECT_DATA = "__data"
+	SECT_BSS = "__bss"
+	SECT_COMMON = "__common"
+	SECT_OBJC_SYMBOLS = "__symbol_table"
+	SECT_OBJC_MODULES = "__module_info"
+	SECT_OBJC_STRINGS = "__selector_strs"
+	SECT_OBJC_REFS = "__selector_refs"
+	SECT_ICON_HEADER = "__header"
+	SECT_ICON_TIFF = "__tiff"
+
 	class Section < MachOStructure
 		attr_reader :sectname, :segname, :addr, :size, :offset, :align, :reloff
 		attr_reader :nreloc, :flags, :reserved1, :reserved2

data/lib/macho/utils.rb

@@ -9,8 +9,7 @@ module MachO
 		end
 
 		def self.magic?(num)
-			num == FAT_MAGIC || num == FAT_CIGAM || num == MH_MAGIC ||
-			num == MH_CIGAM || num == MH_MAGIC_64 || num == MH_CIGAM_64
+			MH_MAGICS.has_key?(num)
 		end
 
 		def self.fat_magic?(num)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macho
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - William Woodruff
@@ -17,16 +17,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cstruct.rb
-- lib/int_helpers.rb
 - lib/macho.rb
 - lib/macho/exceptions.rb
-- lib/macho/file.rb
+- lib/macho/fat_file.rb
 - lib/macho/headers.rb
 - lib/macho/load_commands.rb
+- lib/macho/macho_file.rb
 - lib/macho/sections.rb
 - lib/macho/structure.rb
 - lib/macho/utils.rb
-- lib/otool_helpers.rb
 homepage: https://github.com/woodruffw/ruby-macho
 licenses:
 - MIT

data/lib/int_helpers.rb

@@ -1,17 +0,0 @@
-module INTHelpers
-	Change = Struct.new("Changes", :old, :new)
-
-	Rpath = Struct.new("Rpaths", :old, :new, :found) do
-		def found?
-			found
-		end
-	end
-
-	AddRpath = Struct.new("AddRpaths", :new)
-
-	DeleteRpath = Struct.new("DeleteRpaths", :old, :found) do
-		def found?
-			found
-		end
-	end
-end

data/lib/otool_helpers.rb

@@ -1,3 +0,0 @@
-module OtoolHelpers
-	
-end