android_parser 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc3206bde4ce793fb477360fd78062daa372bf5dba443d3521d86b8ffaf0a91f
-  data.tar.gz: 15c49cc70cb8ac8c561bdb2f5d6e108c9ff6d095bf82b56996ee1c012c874b37
+  metadata.gz: 8360af54a4093e8cc95844b8b7419e3190aed92f5aa6c832f0fd4f7e8ccd2f53
+  data.tar.gz: 1b8a9172fdf2b4f18c43cb0a342aa5244f7ad109cbfc8b8995d74d6de9fc34a9
 SHA512:
-  metadata.gz: 470a1645dc911bc2f41405ac41beb93d570a4885ab2413f61c7f413ce38477a7bc0c3da7162de40cd48b97799dcfd4eab12f1335a9c48a40e2555720f60a39b4
-  data.tar.gz: 55b1870a03b25be087e20e75c2d32a92c15a5a2a1a7d6290970a1ce0af78b44399fe5e9957fb8f111c53d9c2c59e98648b594cf7aad8d16666ff77775a3cfb10
+  metadata.gz: 393956811a1cfcb6bd043cdc8c6494a1760a0558d6d12ce157ee9e08b67035499f702e15cf8d6baa7971572eb616c0de28ebc92003a4e9a32c18541eb82b7f7b
+  data.tar.gz: a7998f5d5e71b889c083f6b1d73f4d277bd7aecd6c412a5d4b14dc10bccf1104472dffde03c2a2280071f88c846906f15c80991d73689f2dd957a46270ac3fbf

data/.github/dependabot.yml

@@ -1,9 +1,11 @@
 version: 2
 updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "21:00"
-    timezone: Asia/Shanghai
-  open-pull-requests-limit: 10
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -10,12 +10,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ ruby-2.5, ruby-2.6, ruby-2.7, ruby-3.0 ]
+        ruby: [ ruby-2.5, ruby-2.6, ruby-2.7, ruby-3.0, ruby-3.1, ruby-3.2 ]
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # ChangeLog
 
+## 2.5.1
+
+* Bugfix: Handle string resources referencing other resources.
+
 ## 2.5.0
 
 > New begins!
+
 ## 0.7.0
 
 * implement Apk#signs, Apk#certificates and Manifest#version_name (#14, #15)

data/README.md

@@ -1,5 +1,10 @@
 # android_parser
 
+[![Language](https://img.shields.io/badge/ruby-2.5+-701516.svg)](.github/workflows/ci.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/icyleaf/android_parser/ci.yml)](https://github.com/icyleaf/android_parser/actions/workflows/ci.yml)
+[![Gem version](https://img.shields.io/gem/v/android_parser.svg?style=flat)](https://rubygems.org/gems/android_parser)
+[![License](https://img.shields.io/badge/license-MIT-red.svg?style=flat)](LICENSE.txt)
+
 Android Apk static analysis parser library for Ruby, forked from [playtestcloud/ruby_apk](https://github.com/playtestcloud/ruby_apk).
 
 ## Requirements

data/android_parser.gemspec

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
-# frozen_string_literal: true
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-# require 'android_parser/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'android_parser'
-  spec.version       = '2.5.0'
+  spec.version       = '2.5.1'
   spec.authors       = ['SecureBrain', 'icyleaf']
   spec.email         = ['info@securebrain.co.jp', 'icyleaf.cn@gmail.com']
   spec.platform      = Gem::Platform::RUBY
@@ -26,10 +23,10 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'rexml', '> 3.0'
   end
 
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '>= 1.2.0'
   spec.add_development_dependency 'rspec-collection_matchers', '>= 1.1.0'
   spec.add_development_dependency 'rspec-mocks', '>= 3.6.0'
   spec.add_development_dependency 'bundler', '>= 1.12'
   spec.add_development_dependency 'rake', '>= 10.0'
-  # spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/android/resource.rb

@@ -355,12 +355,7 @@ module Android
         @types[type_id('string')].each do |type|
           str_hash  = {}
           type.entry_count.times do |i|
-            entry = type[i]
-            if entry.nil?
-              str_hash[i] = nil
-            else
-              str_hash[i] = @global_string_pool.strings[type[i].val.data]
-            end
+            str_hash[i] = lookup_string_value(type, i)
           end
           lang = type.config.locale_lang
           contry = type.config.locale_contry
@@ -375,6 +370,20 @@ module Android
       end
       private :extract_res_strings
 
+      def lookup_string_value(type, index)
+        entry = type[index]
+        return nil if entry.nil?
+
+        if entry.val.data_type == ResValue::TYPE_REFERENCE
+          # this assumes that the value references another string resource, i.e. we're ignoring the type id of the reference
+          reference_id = entry.val.data & 0xffff
+          lookup_string_value(type, reference_id)
+        else
+          @global_string_pool.strings[entry.val.data]
+        end
+      end
+      private :lookup_string_value
+
       def inspect
         "<ResTablePackage offset:%#08x, size:%#x, name:\"%s\">" % [@offset, @size, @name]
       end
@@ -523,6 +532,8 @@ module Android
     end
 
     class ResValue < Chunk
+      TYPE_REFERENCE = 0x01
+
       attr_reader :size, :data_type, :data
       def parse
         @size = read_int16

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: android_parser
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - SecureBrain
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -31,6 +31,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Static analysis tool for android apk since 2021