apk_analyzer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a749460d2c62450889ae77a17caaa168d49eca
-  data.tar.gz: c2d6b680d16576723c5c9063c3cdca2b89d720b0
+  metadata.gz: c9a78dc35d71f81551f39123658300a1b79d18dd
+  data.tar.gz: f16422da7e2bccaaf082c12a83580f9041cceafa
 SHA512:
-  metadata.gz: e0225df57e93601f1f6e55359f429637badb21c13c5f9794c847210b9559f4b0f83467b0946b174b886662a367244ee3a2185d399ea59760ebef73429f60a965
-  data.tar.gz: 22ca4fd6a296419afaca64075a731598b0c0130081147c8182560fcb76cfeaa3146ff90112976db9b1b475e97d5f588e0ba9d5e92a501285f03b92eb38db7087
+  metadata.gz: 900e109f394f8e1caedca681c1916bc0124828aaf6f520a13e359a652f15d210d542d696b6277b8b100b819c5f03f345d28d721fbfde2dab316f8cf49987b890
+  data.tar.gz: 0951645dc29a00dece264930df2c37026a91bee1b9e882f022941e11a819ada1191cc68df389114661e572c524f4e236f140ca34a59513db475f78650267d370

data/lib/apk_analyzer/analyzer.rb

@@ -68,7 +68,8 @@ module ApkAnalyzer
     
     # Certificate info. Issuer and dates
     def collect_cert_info
-      os_has_keytool = system('keytool')
+      # Redirect keytool check error to /dev/null
+      os_has_keytool = system('keytool 2>/dev/null')
       raise 'keytool dependency not satisfied. Make sure that JAVA keytool utility is installed' unless os_has_keytool
       cert_info = {}
       certificate_raw = `keytool -printcert -rfc -jarfile #{@apk_path.shellescape}`
@@ -190,13 +191,16 @@ module ApkAnalyzer
 
     def cert_extract_issuer(certificate_content, result)
       subject = `echo "#{certificate_content}" | openssl x509 -noout -in /dev/stdin -subject -nameopt -esc_msb,utf8`
-      result[:issuer_raw] = subject.gsub(/\n/,'')
-      result[:cn] = cert_extract_issuer_parameterized(subject, 'CN').gsub(/\n/,'')
-      result[:ou] = cert_extract_issuer_parameterized(subject, 'OU')
-      result[:o] = cert_extract_issuer_parameterized(subject, 'O')
-      result[:st] = cert_extract_issuer_parameterized(subject, 'ST')
-      result[:l] = cert_extract_issuer_parameterized(subject, 'L')
-      result[:c] = cert_extract_issuer_parameterized(subject, 'C')
+      # All APK certificate fields are not manadatory. At least one is needed.So to remove trailing carrier return
+      # character, we apply gsub method on the raw subject, and we use it after.
+      raw = subject.gsub(/\n/,'')
+      result[:issuer_raw] = raw
+      result[:cn] = cert_extract_issuer_parameterized(raw, 'CN')
+      result[:ou] = cert_extract_issuer_parameterized(raw, 'OU')
+      result[:o] = cert_extract_issuer_parameterized(raw, 'O')
+      result[:st] = cert_extract_issuer_parameterized(raw, 'ST')
+      result[:l] = cert_extract_issuer_parameterized(raw, 'L')
+      result[:c] = cert_extract_issuer_parameterized(raw, 'C')
     end
 
     def cert_extract_issuer_parameterized(subject, param)

data/lib/apk_analyzer/version.rb

@@ -1,3 +1,3 @@
 module ApkAnalyzer
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apk_analyzer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - BACKELITE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apktools