fastlane-plugin-match_keystore 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e735f7fda8b92409a84f94a1e826254555ee6b33a9f2333a8891e37fee25a5
-  data.tar.gz: 1e8b9230a2e0f0d3f315d1c587e08589ab03308e3570adb8d703b6f84b65fce1
+  metadata.gz: 42c7915b7d46b87470d41acfd251257c04ce89460ac60a08318404530a1fbd24
+  data.tar.gz: 07f280f892d41adee35f025218da2a1eeb345f17c9cf27d2d027246f4b248940
 SHA512:
-  metadata.gz: 5ce5971aa35734b0ce58746631d107db20833edb7d8d6fa2f1c9ae6a700efce48db7ca36f8ed59800a95ed6fae660001e3ec3477dc06090594ab8dca88d9c30c
-  data.tar.gz: aa7171f32c1818427d0b8b8b6fc2f117e78aa7f688c53135099c80c1465762819c906e35f6adf91645f3b81f956c149fd3426c6a722496af199ff8d3b89dd4aa
+  metadata.gz: 85ff5b2dda6f5a38714a09aea05fb279ec87015e970860ac3238f10280d233195936b84ef617d6bfafca36ee9d164f4a1c6267d8ea76e75305a40f4d44b55627
+  data.tar.gz: f8e3fba2336ef34b35300d38535d2f5fbb5798af9efc50f268fa33a7a05282157f1a46755953eac2d99b362642560b8dc9e7b6255377a13e0fae9b5ebcfcd60d

data/README.md

@@ -24,7 +24,6 @@ The keystore properties are encrypted with AES in order to secure sensitive data
 
 ```ruby
   lane :release_and_sign do |options|
-
   	gradle(task: "clean")
     gradle(task: 'assemble', build_type: 'Release')
 

data/lib/fastlane/plugin/match_keystore/actions/match_keystore_action.rb

@@ -52,24 +52,28 @@ module Fastlane
 
         build_tools_last_version
       end
+      
+      def self.check_openssl_version
+        output = `openssl version`
+        if !output.start_with?("OpenSSL")
+          raise "Please install OpenSSL 1.1.1 at least https://www.openssl.org/"
+        end
+        UI.message("OpenSSL version: " + output.strip)
+      end
 
       def self.gen_key(key_path, password)
         `rm -f #{key_path}`
-        if OS.mac?
-          `echo "#{password}" | openssl dgst -sha512 | cut -c1-128 > #{key_path}`
-        else
-          `echo "#{password}" | openssl dgst -sha512 | awk '{print $2}' | cut -c1-128 > #{key_path}`
-        end
+        `echo "#{password}" | openssl dgst -sha512 | awk '{print $2}' | cut -c1-128 > #{key_path}`
       end
 
       def self.encrypt_file(clear_file, encrypt_file, key_path)
         `rm -f #{encrypt_file}`
-        `openssl enc -aes-256-cbc -salt -in #{clear_file} -out #{encrypt_file} -pass file:#{key_path}`
+        `openssl enc -aes-256-cbc -salt -pbkdf2 -in #{clear_file} -out #{encrypt_file} -pass file:#{key_path}`
       end
 
       def self.decrypt_file(encrypt_file, clear_file, key_path)
         `rm -f #{clear_file}`
-        `openssl enc -d -aes-256-cbc -in #{encrypt_file} -out #{clear_file} -pass file:#{key_path}`
+        `openssl enc -d -aes-256-cbc -pbkdf2 -in #{encrypt_file} -out #{clear_file} -pass file:#{key_path}`
       end
 
       def self.sign_apk(apk_path, keystore_path, key_password, alias_name, alias_password, zip_align)
@@ -151,21 +155,20 @@ module Fastlane
           raise "The environment variable ANDROID_HOME is not defined, or Android SDK is not installed!"
         end
 
+        # Check OpenSSL:
+        self.check_openssl_version
+
         dir_name = ENV['HOME'] + '/.match_keystore'
         unless File.directory?(dir_name)
           UI.message("Creating '.match_keystore' working directory...")
           FileUtils.mkdir_p(dir_name)
         end
 
-        UI.message("OpenSSL version: ")
-        puts `openssl version`
-
         key_path = dir_name + '/key.hex'
         if !File.file?(key_path)
-          if ci_password.to_s.strip.empty?
-            security_password = other_action.prompt(text: "Security password: ")
-          else
-            security_password = ci_password
+          security_password = other_action.prompt(text: "Security password: ", secure_text: true, ci_input: ci_password)
+          if security_password.to_s.strip.empty?
+            raise "Security password is not defined! Please use 'ci_password' parameter for CI."
           end
           UI.message "Generating security key..."
           self.gen_key(key_path, security_password)
@@ -211,8 +214,17 @@ module Fastlane
           end
 
           key_password = other_action.prompt(text: "Keystore Password: ")
+          if key_password.to_s.strip.empty?
+            raise "Keystore Password is not definined!"
+          end
           alias_name = other_action.prompt(text: "Keystore Alias name: ")
+          if alias_name.to_s.strip.empty?
+            raise "Keystore Alias name is not definined!"
+          end
           alias_password = other_action.prompt(text: "Keystore Alias password: ")
+          if alias_password.to_s.strip.empty?
+            raise "Keystore Alias password is not definined!"
+          end
 
           # https://developer.android.com/studio/publish/app-signing
           if !File.file?(existing_keystore)
@@ -326,7 +338,8 @@ module Fastlane
       def self.output
         [
           ['MATCH_KEYSTORE_PATH', 'File path of the Keystore fot the App.'],
-          ['MATCH_KEYSTORE_ALIAS_NAME', 'Keystore Alias Name.']
+          ['MATCH_KEYSTORE_ALIAS_NAME', 'Keystore Alias Name.'],
+          ['MATCH_KEYSTORE_APK_SIGNED', 'Path of the signed APK.']
         ]
       end
 

data/lib/fastlane/plugin/match_keystore/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module MatchKeystore
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-match_keystore
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Christopher NEY
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry