shhh 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3719455248b51396f2f9e61a118831781ed9cfde
-  data.tar.gz: 18fa87873719241498d30f3490bb1db8d5f91f1d
+  metadata.gz: d631ceb60ef17845e368b02a7e945245bc547f9f
+  data.tar.gz: e34a0ab7746f04d9ffb3da3469248a242fcb5a40
 SHA512:
-  metadata.gz: f0009d955c698e4dca1a76dbff0ce0d764d2fd1c624afff258f9900e09ebc01430e3ba3cee3345aa1bb70a81d79fb9e48bafe650a10a080bf68c005aadcbd199
-  data.tar.gz: 36fbc0bae8fa2c4ced54d8dfe822630b39d84767c1d939fee3dfe7ec749a4df0c94ac1e6b071e1ea64f693cb518ebcfc92b676ad6430318f4e3f6142f6f2c42d
+  metadata.gz: 423a1b4c83204f67d41261b628b29965c1f102f3e542c2ffb5e00e4235073c87471d7c4ed44e6e8608f88bb38c4ec03686abae647303c39508d48d0b8f5705d8
+  data.tar.gz: 46e5e760fad9a81312614d53bd6cdae611463ee2e9b7c334f2f1f8a8c9db521ee8f8c9d3a4dbf018499fd6ef812f56e8adc23f2dbce7a9aafdb9cabe39b2f853

data/.gitignore

@@ -10,4 +10,4 @@
 /tmp/
 /data
 /spec/coverage/
-*.enc
+/*.enc

data/lib/shhh/app/cache.rb

@@ -0,0 +1,35 @@
+require 'coin'
+require 'digest'
+require 'singleton'
+# # configure the URI that the DRb server runs on (defaults to druby://localhost:PORT)
+
+
+module Shhh
+  module App
+    class Cache
+
+      include Singleton
+
+      class << self
+        def configure
+          Coin.uri = 'druby://127.0.0.1:24924'
+        end
+      end
+
+      self.configure
+
+      def md5(string)
+        Digest::MD5.base64digest(string)
+      end
+
+      def [] (key)
+        Coin.read(md5(key))
+      end
+
+      def []=(key, value)
+        Coin.write(md5(key), value)
+      end
+    end
+  end
+end
+

data/lib/shhh/app/private_key/decryptor.rb

@@ -1,4 +1,5 @@
 require_relative 'decryptor'
+require 'shhh/app/cache'
 module Shhh
   module App
     module PrivateKey
@@ -10,6 +11,7 @@ module Shhh
         def initialize(encrypted_key, input_handler)
           self.encrypted_key = encrypted_key
           self.input_handler = input_handler
+          @cache_checked = false
         end
 
         def key
@@ -18,7 +20,12 @@ module Shhh
           if should_decrypt?
             begin
               retries ||= 0
-              decrypted_key = decrypt(password)
+
+              p = password
+              decrypted_key = decrypt(p)
+              # if the password is valid, let's add it to the cache.
+              Shhh::App::Cache.instance[encrypted_key] = p
+
             rescue ::OpenSSL::Cipher::CipherError => e
               input_handler.puts 'Invalid password. Please try again.'
               ((retries += 1) < 3) ? retry : raise(Shhh::Errors::InvalidPasswordPrivateKey.new('Invalid password.'))
@@ -35,15 +42,24 @@ module Shhh
           encrypted_key && (encrypted_key.length > 32)
         end
 
-
         def decrypt(password)
           decr_password(encrypted_key, password)
         end
 
         def password
+          check_cache || ask_user
+        end
+
+        def ask_user
           input_handler.ask
         end
 
+        def check_cache
+          return nil if @cache_checked
+          @cache_checked = true
+          Shhh::App::Cache.instance[encrypted_key]
+        end
+
       end
     end
   end

data/lib/shhh/encrypted_file.rb

@@ -15,8 +15,8 @@ module Shhh
 
     def initialize(file:, key_id:, key_type:)
       @file        = file
-      @key_id         = key_id
-      @key_type     = key_type.to_sym
+      @key_id      = key_id
+      @key_type    = key_type.to_sym
       @app_args    = { file: file, key_type => key_id, decrypt: true }
       @application = Shhh::Application.new(self.app_args)
     end

data/lib/shhh/version.rb

@@ -1,3 +1,3 @@
 module Shhh
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

data/shhh.gemspec

@@ -35,6 +35,7 @@ Thank you for installing Shhh!
   spec.add_dependency 'activesupport'
   spec.add_dependency 'highline', '~> 1.7'
   spec.add_dependency 'clipboard', '~> 1.1'
+  spec.add_dependency 'coin'
 
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'bundler', '~> 1.12'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shhh
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_dir
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: coin
+  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: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +209,7 @@ files:
 - lib/shhh.rb
 - lib/shhh/app.rb
 - lib/shhh/app/args.rb
+- lib/shhh/app/cache.rb
 - lib/shhh/app/cli.rb
 - lib/shhh/app/commands.rb
 - lib/shhh/app/commands/command.rb
@@ -218,9 +233,6 @@ files:
 - lib/shhh/app/output/file.rb
 - lib/shhh/app/output/noop.rb
 - lib/shhh/app/output/stdout.rb
-- lib/shhh/app/password/cache.rb
-- lib/shhh/app/password/cache/client.rb
-- lib/shhh/app/password/cache/server.rb
 - lib/shhh/app/private_key/base64_decoder.rb
 - lib/shhh/app/private_key/decryptor.rb
 - lib/shhh/app/private_key/detector.rb

data/lib/shhh/app/password/cache.rb

@@ -1,14 +0,0 @@
-module Shhh
-  module App
-    module Password
-      module Cache
-        SERVER = {
-          host: '127.0.0.1',
-          port: 8787
-        }
-      end
-    end
-  end
-end
-
-Shhh.dir_r 'shhh/app/password'

data/lib/shhh/app/password/cache/client.rb

@@ -1,46 +0,0 @@
-require 'drb/drb'
-module Shhh
-  module App
-    module Password
-      module Cache
-        class Client
-          # The URI to connect to
-
-          attr_accessor :uri, :host, :port
-          attr_accessor :config
-
-          def initialize(host: nil,
-                         port: nil,
-                         config: {})
-            self.config =config
-            self.host   = host
-            self.port   = port
-          end
-
-          def uri
-            return uri if uri
-            template = 'druby://<%= host %>:<%= port %>>'
-            renderer = ERB.new template
-            self.uri = renderer.result(binding)
-          end
-
-          def start
-            raise NoMethodError, 'not implemented'
-            # Start a local DRbServer to handle callbacks.
-
-            # Not necessary for this small example, but will be required
-            # as soon as we pass a non-marshallable object as an argument
-            # to a dRuby call.
-
-            # Note: this must be called at least once per process to take any effect.
-            # This is particularly important if your application forks.
-            DRb.start_service
-            # timeserver = DRbObject.new_with_uri(SERVER_URI)
-            # puts timeserver.get_current_time
-            # sleep 10
-          end
-        end
-      end
-    end
-  end
-end

data/lib/shhh/app/password/cache/server.rb

@@ -1,33 +0,0 @@
-require 'drb/drb'
-require 'singleton'
-module Shhh
-  module App
-    module Password
-      module Cache
-        URI='druby://localhost:8787'
-
-        class Server
-          include Singleton
-
-          def lookup(key)
-            raise NoMethodError, 'not implemented'
-            return 'tasty bisquits'
-          end
-
-          FRONT_OBJECT=self.instance
-
-          def boot
-            raise NoMethodError, 'not implemented'
-            # The object that handles requests on the server
-
-            $SAFE = 1 # disable eval() and friends
-
-            DRb.start_service(URI, FRONT_OBJECT)
-            # Wait for the drb server thread to finish before exiting.
-            DRb.thread.join
-          end
-        end
-      end
-    end
-  end
-end