fastlane-plugin-cryptex 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b7da7f87da959bbe1ad86774aedf5d3ac0e85f
-  data.tar.gz: 5e5ce005d472a170bd0af367767fe8f05394acfc
+  metadata.gz: 9e7e52be1d3bf837c665852e86e4dce1dfaaf4aa
+  data.tar.gz: 8efee788f405cccd7b5e10489417aa74c2cd0d56
 SHA512:
-  metadata.gz: df4193e9cc83064d4d118eb4552406682b39ce481943007c82fb32fba40ed4651985adad3ce0622c80369f698ae1c440e3a0147054a4b32c06f2cea2f7bb2abf
-  data.tar.gz: 504cc4e6cb6e326997222f0a83a51ebfdde0b05ebbaf1a62083703ef49a4113602112ee80d81e96f3ff4f0fb4109317d1a45137f0ee4f97c31d86b3d3f7e8ae4
+  metadata.gz: 5f8e4e6fc4492c29add0fd73b1a4d779cb4cddad4af97d5f9c8a305d4f41624ed9948090fd1b9d36f018745b437112d719bfc48546f29c237da04371877022be
+  data.tar.gz: 693215239f21ce0c622924f9efbd43a176157dbb9ea4e7d3b8d1b1988a9cdad86524aa28c994cae4628e1636750a0c0a243a11f739e9d221fc58ed7793b9154d

data/bin/cryptex

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$:.push File.expand_path("../../lib", __FILE__)
+$:.push File.expand_path('../lib', __dir__)
 
 require 'fastlane'
 require 'fastlane/plugin/cryptex'

data/lib/fastlane/plugin/cryptex.rb

@@ -1,7 +1,7 @@
 
 module Fastlane
   module Cryptex
-    ROOT = Pathname.new(File.expand_path('../cryptex', __FILE__))
+    ROOT = Pathname.new(File.expand_path('cryptex', __dir__))
     # Return all .rb files inside the "actions" and "helper" directory
     def self.all_classes
       Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]

data/lib/fastlane/plugin/cryptex/actions/cryptex_generate_keystore.rb

@@ -3,7 +3,7 @@ module Fastlane
     class CryptexGenerateKeystoreAction < Action
       def self.run(params)
         require "fileutils"
-        cmd = "keytool -genkey -v -keystore #{File.expand_path(params[:destination])} -storepass #{params[:password]} -keypass #{params[:password]} -alias #{params[:alias]} -dname 'CN=#{params[:fullname]},L=#{params[:city]}' -validity 1000"
+        cmd = "keytool -genkey -v -keystore #{File.expand_path(params[:destination])} -storepass #{params[:password]} -keypass #{params[:password]} -alias #{params[:alias]} -dname 'CN=#{params[:fullname]},L=#{params[:city]}' -validity 10000"
         FastlaneCore::CommandExecutor.execute(command: cmd,
                                             print_all: true,
                                         print_command: true)

data/lib/fastlane/plugin/cryptex/change_password.rb

@@ -5,12 +5,12 @@ module Fastlane
         to ||= ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: false)
         from ||= ChangePassword.ask_password(message: "Old passphrase for Git Repo: ", confirm: true)
         GitHelper.clear_changes
-        workspace = GitHelper.clone(params[:git_url], params[:shallow_clone], manual_password: from, skip_docs: params[:skip_docs], branch: params[:git_branch])
+        workspace = GitHelper.clone(params[:git_url], params[:shallow_clone], manual_password: from, skip_docs: params[:skip_docs], branch: params[:git_branch], digest: params[:digest])
         Encrypt.new.clear_password(params[:git_url])
         Encrypt.new.store_password(params[:git_url], to)
 
         message = "[fastlane] Changed passphrase"
-        GitHelper.commit_changes(workspace, message, params[:git_url], params[:git_branch])
+        GitHelper.commit_changes(workspace, message, params[:git_url], params[:git_branch], digest: params[:digest])
       end
 
       def self.ask_password(message: "Passphrase for Git Repo: ", confirm: true)

data/lib/fastlane/plugin/cryptex/commands_generator.rb

@@ -11,7 +11,6 @@ module Fastlane
         FastlaneCore::UpdateChecker.start_looking_for_update('cryptex')
         self.new.run
       ensure
-
         FastlaneCore::UpdateChecker.show_update_status('cryptex', Cryptex::VERSION)
       end
 
@@ -67,7 +66,7 @@ module Fastlane
           c.action do |args, options|
             params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
             params.load_configuration_file("Cryptexfile")
-            decrypted_repo = Cryptex::GitHelper.clone(params[:git_url], params[:shallow_clone], branch: params[:git_branch])
+            decrypted_repo = Cryptex::GitHelper.clone(params[:git_url], params[:shallow_clone], branch: params[:git_branch], digest: params[:digest])
             UI.success "Repo is at: '#{decrypted_repo}'"
           end
         end

data/lib/fastlane/plugin/cryptex/encrypt.rb

@@ -35,27 +35,29 @@ module Fastlane
         Security::InternetPassword.delete(server: server_name(git_url))
       end
 
-      def encrypt_repo(path: nil, git_url: nil)
+      def encrypt_repo(path: nil, git_url: nil, digest: nil)
         iterate(path) do |current|
           crypt(path: current,
             password: password(git_url),
-             encrypt: true)
+             encrypt: true,
+              digest: digest)
           UI.success "🔒  Encrypted '#{File.basename(current)}'" if $verbose
         end
         UI.success "🔒  Successfully encrypted certificates repo"
       end
 
-      def decrypt_repo(path: nil, git_url: nil, manual_password: nil)
+      def decrypt_repo(path: nil, git_url: nil, manual_password: nil, digest: nil)
         iterate(path) do |current|
           begin
             crypt(path: current,
               password: manual_password || password(git_url),
-               encrypt: false)
-          rescue
+               encrypt: false,
+                digest: digest)
+          rescue StandardError
             UI.error "Couldn't decrypt the repo, please make sure you enter the right password!"
             UI.user_error!("Invalid password passed via 'CRYPTEX_PASSWORD'") if ENV["CRYPTEX_PASSWORD"]
             clear_password(git_url)
-            decrypt_repo(path: path, git_url: git_url)
+            decrypt_repo(path: path, git_url: git_url, digest: digest)
             return
           end
           UI.success "🔓  Decrypted '#{File.basename(current)}'" if $verbose
@@ -72,7 +74,7 @@ module Fastlane
 
       private
 
-      def crypt(path: nil, password: nil, encrypt: true)
+      def crypt(path: nil, password: nil, encrypt: true, digest: 'sha256')
         if password.to_s.strip.length.zero? && encrypt
           UI.user_error!("No password supplied")
         end
@@ -80,6 +82,7 @@ module Fastlane
         tmpfile = File.join(Dir.mktmpdir, "temporary")
         command = ["openssl aes-256-cbc"]
         command << "-k #{password.shellescape}"
+        command << "-md #{digest}"
         command << "-in #{path.shellescape}"
         command << "-out #{tmpfile.shellescape}"
         command << "-a"

data/lib/fastlane/plugin/cryptex/git_helper.rb

@@ -1,7 +1,7 @@
 module Fastlane
   module Cryptex
     class GitHelper
-      def self.clone(git_url, shallow_clone, manual_password: nil, skip_docs: false, branch: "master")
+      def self.clone(git_url, shallow_clone, manual_password: nil, skip_docs: false, branch: "master", digest: nil)
         return @dir if @dir
 
         @dir = Dir.mktmpdir
@@ -14,7 +14,7 @@ module Fastlane
           FastlaneCore::CommandExecutor.execute(command: "GIT_TERMINAL_PROMPT=0 #{command}",
                                               print_all: $verbose,
                                           print_command: $verbose)
-        rescue
+        rescue StandardError
           UI.error("Error cloning Repo")
           UI.error("Run the following command manually to make sure you're properly authenticated:")
           UI.command(command)
@@ -26,7 +26,7 @@ module Fastlane
         checkout_branch(branch) unless branch == "master"
 
         copy_readme(@dir) unless skip_docs
-        Cryptex::Encrypt.new.decrypt_repo(path: @dir, git_url: git_url, manual_password: manual_password)
+        Cryptex::Encrypt.new.decrypt_repo(path: @dir, git_url: git_url, manual_password: manual_password, digest: digest)
 
         return @dir
       end
@@ -46,11 +46,11 @@ module Fastlane
         end
       end
 
-      def self.commit_changes(path, message, git_url, branch = "master")
+      def self.commit_changes(path, message, git_url, branch = "master", digest: nil)
         Dir.chdir(path) do
           return if `git status`.include?("nothing to commit")
 
-          Cryptex::Encrypt.new.encrypt_repo(path: path, git_url: git_url)
+          Cryptex::Encrypt.new.encrypt_repo(path: path, git_url: git_url, digest: digest)
           File.write("cryptex_version.txt", Cryptex::VERSION) # unencrypted
 
           commands = []
@@ -68,7 +68,7 @@ module Fastlane
         end
         FileUtils.rm_rf(path)
         @dir = nil
-      rescue => ex
+      rescue StandardError => ex
         UI.error("Couldn't commit or push changes back to git...")
         UI.error(ex)
       end

data/lib/fastlane/plugin/cryptex/options.rb

@@ -77,7 +77,13 @@ module Fastlane
                                        env_name: "CRYPTEX_SKIP_DOCS",
                                        description: "Skip generation of a README.md for the created git repository",
                                        is_string: false,
-                                       default_value: false)
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :digest,
+                                       short_option: "-m",
+                                       env_name: "CRYPTEX_DIGEST",
+                                       description: "Specify the Message Digest to use for crypt routines",
+                                       is_string: true,
+                                       default_value: "md5")
         ]
       end
     end

data/lib/fastlane/plugin/cryptex/runner.rb

@@ -11,7 +11,7 @@ module Fastlane
         if params[:hash].kind_of?(String)
           begin
             params[:hash] = JSON.parse(params[:hash])
-          rescue
+          rescue StandardError
             # might contain sensitive informatio
             UI.user_error!("Supplied :hash isn't in json format")
           end
@@ -86,7 +86,7 @@ module Fastlane
                                            hide_keys: [],
                                                title: "Summary for cryptex #{Cryptex::VERSION}")
         @git_changed = false
-        params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs], branch: params[:git_branch])
+        params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs], branch: params[:git_branch], digest: params[:digest])
         @params = params
         if params[:type] == "import_env"
           return import_env(params)
@@ -113,7 +113,7 @@ module Fastlane
       ensure
         if git_changed
           message = GitHelper.generate_commit_message(params)
-          GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch])
+          GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch], digest: params[:digest])
         end
         GitHelper.clear_changes
       end

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

@@ -1,6 +1,6 @@
 module Fastlane
   module Cryptex
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
     DESCRIPTION = "cryptex"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-cryptex
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Helmut Januschka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.5
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.105.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.105.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: match
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fastlane
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.105.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.105.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: match
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
 description: 
 email: h.januschka@krone.at
 executables:
@@ -171,3 +171,4 @@ signing_key:
 specification_version: 4
 summary: fastlane Crypt Store Git repo
 test_files: []
+has_rdoc: