mootool 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb92ea5d0aabdbcf38f13ad689433f8b68ca590f33dbf5c9df2faaa5f4c3903
-  data.tar.gz: 583f08dc949bd8f0cb597128b1c25728ec579c6b726330db082cba89fdd1e2c5
+  metadata.gz: 9706bb658f685c95928c3df7cc944657976d13fcd7bd08bdd1306a4715340eff
+  data.tar.gz: e275e9e729b7a8a75d4dc7f1c2ae413315963be2cff388c598216e63d9dd1a51
 SHA512:
-  metadata.gz: b1f196cb6d8487d32861467204cc8ff59e4447141b0a18e867d43a6afa0ca0e18923ab121767b06bcf8143faabfa2a9b7c4490737195a5f8b81068de24c6d5dc
-  data.tar.gz: 6e52e6278cdb716c6cfe377ad7199c0adaed6aa7b365f082bf19f0f09f69370f0690caa6ec165c2d36f4793c8fc837455131cbcfe2b3513f5c61c7452f87e161
+  metadata.gz: cdb68cf6de5600620c85922edefef776fcee8585b05b9240fa457625742d877593ee07e047a3fcb3f655c424cc17a711573aff62f922cee497a8d428d1f8925a
+  data.tar.gz: 7a6d65c21a8417429b3314d6605798d988dbb43e8fdb52c012a48d5ed62e750e0a3c8a98c5226595bc05d524b15cff86ece61644a0b67598d4cc578118753032

data/Gemfile.lock

@@ -1,8 +1,11 @@
 PATH
   remote: .
   specs:
-    mootool (0.2.3)
+    mootool (0.2.4)
+      lzfse
+      lzss
       plist (~> 3)
+      ruby-lzma
       ruby-macho (~> 3)
       rubyzip (~> 2)
       sorbet-runtime (~> 0)
@@ -17,6 +20,8 @@ GEM
     docile (1.4.0)
     iniparse (1.5.0)
     json (2.6.2)
+    lzfse (0.0.1)
+    lzss (0.1)
     method_source (1.0.0)
     netrc (0.11.0)
     overcommit (0.59.1)
@@ -68,6 +73,7 @@ GEM
       rubocop (~> 1.0)
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
+    ruby-lzma (0.4.3)
     ruby-macho (3.0.0)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
@@ -90,7 +96,7 @@ GEM
       sorbet (>= 0.5.9204)
       sorbet-runtime (>= 0.5.9204)
       thor (>= 0.19.2)
-    tapioca (0.9.3)
+    tapioca (0.9.4)
       bundler (>= 1.17.3)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)

data/lib/mootool/models/decompressor.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'lzfse'
+require 'lzma'
+require 'compress/lzss'
+
+module MooTool
+  # The magic Apple decompressor (as in it uses magics)
+  class Decompressor
+    COMPRESSION_LZSS = 'lzss'
+    COMPRESSION_LZVN = 'lzvn'
+    COMPRESSION_LZFSE = 'bvx2'
+    COMPRESSION_LZMA = 'lzma'
+
+    attr_reader :value
+
+    def initialize(data)
+      @value = case data[0..3]
+               when COMPRESSION_LZFSE
+                 LZFSE.lzfse_decompress(data)
+               when COMPRESSION_LZVN
+                 LZFSE.lzvn_decompress(data)
+               when COMPRESSION_LZSS
+                 Compress::LZSS.decompress(data)
+               when COMPRESSION_LZMA
+                 LZMA.decompress(data)
+               else
+                 data
+               end
+    end
+  end
+end

data/lib/mootool/models/device_tree.rb

@@ -4,82 +4,114 @@
 require 'sorbet-runtime'
 
 module MooTool
-  module Models
-    # DeviceTree is a Apple Device Tree node that has been parsed
-    class DeviceTree
-      extend T::Sig
+  # DeviceTree is a Apple Device Tree node that has been parsed
+  class DeviceTree
+    extend T::Sig
+
+    NODE_FORMAT = 'VV'
+    PROP_FORMAT = 'A32V'
 
-      NODE_FORMAT = 'VV'
-      PROP_FORMAT = 'A32V'
+    PHANDLE_PROP = 'AAPL,phandle'
+    COMPATIBLE_PROP = 'compatible'
 
-      # Represents a single node in the device tree
-      class Node
-        extend T::Sig
+    # Represents a single node in the device tree
+    class Node
+      extend T::Sig
 
-        attr_reader :children, :properties
+      attr_reader :children, :properties
 
-        sig { params(data: T.any(IO, StringIO)).void }
-        def initialize(data)
-          vals = T.must(data.read(8)).unpack(NODE_FORMAT)
-          property_count = T.cast(vals[0], Integer)
-          child_count = T.cast(vals[1], Integer)
+      sig { params(tree: DeviceTree, data: T.any(IO, StringIO)).void }
+      def initialize(tree, data)
+        @tree = tree
+        vals = T.must(data.read(8)).unpack(NODE_FORMAT)
+        property_count = T.cast(vals[0], Integer)
+        child_count = T.cast(vals[1], Integer)
 
-          @properties = T.let({}, T::Hash[String, Property])
-          @children = T.let([], T::Array[Node])
+        @properties = T.let({}, T::Hash[String, Property])
+        @children = T.let([], T::Array[Node])
 
-          property_count.times do
-            prop = Property.new(data)
-            @properties[prop.name] = prop
-          end
-          child_count.times { @children << Node.new(data) }
+        property_count.times do
+          prop = Property.new(data)
+          @properties[prop.name] = prop
         end
+        child_count.times { @children << Node.new(tree, data) }
+
+        @tree.add_handle(self, @properties[PHANDLE_PROP].value) if @properties.key? PHANDLE_PROP
       end
 
-      # Represents a single property and it's value
-      class Property
-        extend T::Sig
+      def to_h
+        props = @properties.transform_values(&:value)
+        if @children.any?
+          props.merge({ children: @children.map(&:to_h) })
+        else
+          props
+        end
+      end
+    end
 
-        attr_accessor :name, :value
+    # Represents a single property and it's value
+    class Property
+      extend T::Sig
 
-        sig { params(data: T.any(StringIO, IO)).void }
-        def initialize(data)
-          args = T.must(data.read(36)).unpack(PROP_FORMAT)
+      attr_accessor :name, :value
 
-          @name = T.let(T.cast(args[0], String), String)
-          @size = T.let(T.cast(args[1], Integer), Integer)
+      sig { params(data: T.any(StringIO, IO)).void }
+      def initialize(data)
+        args = T.must(data.read(36)).unpack(PROP_FORMAT)
 
-          if @size & 0x80000000 != 0
-            @template = true
-            @size &= 0x7fffffff
-          end
+        @name = T.let(T.cast(args[0], String), String)
+        @size = T.let(T.cast(args[1], Integer), Integer)
 
-          @value = data.read(@size.align(4))
-          @value = T.must(@value)[0..@size]
+        if @size & 0x80000000 != 0
+          @template = true
+          @size &= 0x7fffffff
         end
+
+        @value = T.must(data.read(@size.align(4)))[0..(@size - 1)]
+
+        normalize
       end
 
-      attr_reader :root
+      private
 
-      # @param [String] data
-      sig { params(data: T.any(IO, String, StringIO, Pathname)).void }
-      def initialize(data)
-        case data
-        when Pathname
-          data = T.assert_type!(data, Pathname)
-          @data = File.open(data.realpath, 'rb')
-        when String
-          data = T.assert_type!(data, String)
-          @data = StringIO.new(data)
-        when IO
-          @data = T.cast(data, IO)
-        end
-        @root = Node.new(@data)
+      def normalize
+        @value = @value.split("\x00").map(&:chomp) if @name == COMPATIBLE_PROP
+        @value = @value.unpack1('V') if @size == 4
+
+        @value = @value.chomp("\x00") if @value.is_a?(String) && @value.count("\x00") == 1 && @value.end_with?("\x00")
       end
+    end
 
-      sig { params(path: String).returns(DeviceTree) }
-      def self.open(path)
-        DeviceTree.new(Pathname.new(path))
+    attr_reader :root
+
+    # @param [String] data
+    sig { params(data: T.any(IO, String, StringIO, Pathname)).void }
+    def initialize(data)
+      @handles = {}
+      case data
+      when Pathname
+        data = T.assert_type!(data, Pathname)
+        @data = File.open(data.realpath, 'rb')
+      when String
+        data = T.assert_type!(data, String)
+        @data = StringIO.new(data)
+      when IO
+        @data = T.cast(data, IO)
       end
+      @root = Node.new(self, @data)
+    end
+
+    def add_handle(node, handle)
+      @handles[handle] = node
+    end
+
+    sig { params(path: String).returns(DeviceTree) }
+    def self.open(path)
+      MooTool::DeviceTree.new(Pathname.new(path))
+    end
+
+    def to_h
+      @root.to_h
     end
   end
 end

data/lib/mootool/models/img4.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'openssl'
+require_relative 'decompressor'
 
 module MooTool
   # Module for Apple's IMG4 encryption and signing format
@@ -18,12 +19,14 @@ module MooTool
         when 'IM4P'
           @type = @data.value[1].value
           @build = @data.value[2].value
-          @payload = @data.value[3].value
+          @payload = MooTool::Decompressor.new(@data.value[3].value).value
         when 'IMG4', 'IM4M'
           raise 'Not implemented'
         else
           raise "Unknown IMG4 type #{@data.first.value}"
         end
+
+        @manifest = Manifest.new(@payload) if @payload.start_with?('IM4M')
       end
 
       def payload?

data/lib/mootool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MooTool
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/mootool.gemspec

@@ -37,7 +37,10 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'lzfse'
+  spec.add_runtime_dependency 'lzss'
   spec.add_runtime_dependency 'plist', '~> 3'
+  spec.add_runtime_dependency 'ruby-lzma'
   spec.add_runtime_dependency 'ruby-macho', '~> 3'
   spec.add_runtime_dependency 'rubyzip', '~> 2'
   spec.add_runtime_dependency 'sorbet-runtime', '~> 0'

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mootool
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rick Mark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lzfse
+  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: lzss
+  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: plist
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: ruby-lzma
+  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: ruby-macho
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +146,7 @@ files:
 - lib/mootool/controllers/kernel_collection.rb
 - lib/mootool/controllers/sections.rb
 - lib/mootool/core_extensions.rb
+- lib/mootool/models/decompressor.rb
 - lib/mootool/models/device_tree.rb
 - lib/mootool/models/img4.rb
 - lib/mootool/models/ipsw.rb