aes_keeper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21e5cca9b69f4f7c2b8b4293c9dccb94b5424b6
-  data.tar.gz: 5dbbb5ffb17a53f95911c39033ba98418b66cbbd
+  metadata.gz: fe002651b1e55b1ed52eead2ed8d8988b2fadf45
+  data.tar.gz: f4ccfcb450f6584c44e203bb92b2ddb672c1b890
 SHA512:
-  metadata.gz: b5966c1289e8340d51ff1931a34190804f0066427c6b583d1d502488924c41d150412bc52cff7e60148fd694307ea1636b8546c29a25ff1c80e3542893ef5757
-  data.tar.gz: fbd85365c8ae110a1c85c2eee8120dc9a093bec804558217548fa2cec67644777d05c545c3bec8f4479609daeb47eca431f9e2dbfa0a773d7bd6e9bdc8404f2d
+  metadata.gz: fb09a61e37d0d8f499e1f645210000b7e2b9f7235d79adb8fa10fdb48408ed8f3d1ec9d3ca72cb9573243eefe6467d58dca80bfc8cd5a6ae30bc9ecf0e20b89e
+  data.tar.gz: 59b0e16ce24f89ef24cf2646a826c47b99682673ed0c402a00cf0353bfcc746dd1fd3e4a949822ff492653a136cc91e0c0afa7e2a1f3599be787de23e2e33459

data/README.md

@@ -26,6 +26,12 @@ Or install it yourself as:
 
 ## Usage
 
+#####AESKeeper::AESKeeperPure
+ - Pure String implementation. Backwards compatible and crossplatform compatible.
+
+#####AESKeeper::AESKeeperMarshal && AesKeeper
+ - Marshalling Object implementation
+
 With encryption and iv result separate:
 ```ruby
 cipher = AesKeeper.new(key: 'some really good 32+ character long key for encryption! ^_^')

data/lib/aes_keeper.rb

@@ -1,6 +1,7 @@
 require "aes_keeper/version"
 require 'armor'
 require 'base64'
+require 'aes_keeper/aes_keeper_common.rb'
 require 'aes_keeper/aes_keeper_pure.rb'
 require 'aes_keeper/aes_keeper_marshal.rb'
 

data/lib/aes_keeper/aes_keeper_common.rb

@@ -0,0 +1,57 @@
+module AESKeeper
+  class AESKeeperCommon
+    VERSION = VERSION
+    def initialize(options = {})
+      raise ":key required!" unless options.has_key? :key
+      raise ":key needs to be at-least 32 characters!" unless options[:key].length >= 32
+      @key = key(options)
+      @cipher = OpenSSL::Cipher::AES256.new(:CBC)
+    end
+
+    private
+    def key(options = {})
+      return nil unless options.has_key? :key
+      if options.has_key?(:salt) && options.fetch(:armor) {true}
+        Armor.digest(options[:key], options[:salt])
+      else
+        options[:key]
+      end
+    end
+
+    def decrypt_validations bndng
+      options = bndng.local_variable_get :options
+      if options.is_a? String
+        text = options.dup
+        options = {}
+        if text.scan(/:/).one?
+          options[:encrypted], options[:iv] = text.split(':')
+        else
+          raise 'Invalid String input!'
+        end
+      end
+      raise ':encrypted required!' unless options.has_key?(:encrypted)
+      raise ':iv required!' unless options.has_key?(:iv)
+      raise ':encrypted invalid type!' unless options[:encrypted].is_a? String
+      raise ':iv invalid type!' unless options[:iv].is_a? String
+      return '' if options[:encrypted].strip.empty? and options[:iv].strip.empty?
+      bndng.local_variable_set :options, options
+    end
+
+    def stringable obj
+      obj.tap { |i|
+        i.define_singleton_method(:to_s) { [self[:encrypted], self[:iv]].join(":") }
+        i.define_singleton_method(:to_string) { [self[:encrypted], self[:iv]].join(":") }
+      }
+    end
+
+    def nothing obj
+      obj.tap {|i|
+        i.define_singleton_method(:to_s){''}
+        i.define_singleton_method(:blank?){true}
+        i.define_singleton_method(:empty?){true}
+        i.define_singleton_method(:presence){''}
+        i.define_singleton_method(:present?){false}
+      }
+    end
+  end
+end

data/lib/aes_keeper/aes_keeper_marshal.rb

@@ -1,13 +1,5 @@
 module AESKeeper
-  class AESKeeperMarshal
-    VERSION = VERSION
-    def initialize(options = {})
-      raise ":key required!" unless options.has_key? :key
-      raise ":key needs to be at-least 32 characters!" unless options[:key].length >= 32
-      @key = key(options)
-      @cipher = OpenSSL::Cipher::AES256.new(:CBC)
-    end
-
+  class AESKeeperMarshal < AESKeeperCommon
     def encrypt(content, options = {})
       if (content != nil) and (content != "")
         @cipher.encrypt
@@ -16,38 +8,16 @@ module AESKeeper
         @cipher.iv = iv
         encrypted = @cipher.update Marshal.dump(content)
         encrypted << @cipher.final
-        {
+        stringable({
           encrypted: Base64.encode64(encrypted).encode('utf-8'), iv: Base64.encode64(iv).encode('utf-8')
-        }.tap { |i|
-          i.define_singleton_method(:to_s) { [self[:encrypted], self[:iv]].join(":") }
-          i.define_singleton_method(:to_string) { [self[:encrypted], self[:iv]].join(":") }
-        }
+        })
       else
-        { encrypted: '', iv: ''}.tap {|i|
-          i.define_singleton_method(:to_s){''}
-          i.define_singleton_method(:blank?){true}
-          i.define_singleton_method(:empty?){true}
-          i.define_singleton_method(:presence){''}
-          i.define_singleton_method(:present?){false}
-        }
+        nothing({ encrypted: '', iv: ''})
       end
     end
 
     def decrypt(options = {})
-      if options.is_a? String
-        text = options.dup
-        options = {}
-        if text.scan(/:/).one?
-          options[:encrypted], options[:iv] = text.split(':')
-        else
-          raise 'Invalid String input!'
-        end
-      end
-      raise ':encrypted required!' unless options.has_key?(:encrypted)
-      raise ':iv required!' unless options.has_key?(:iv)
-      raise ':encrypted invalid type!' unless options[:encrypted].is_a? String
-      raise ':iv invalid type!' unless options[:iv].is_a? String
-      return '' if options[:encrypted].strip.empty? and options[:iv].strip.empty?
+      decrypt_validations binding
       @cipher.decrypt
       @cipher.key =  key(options) || @key
       @cipher.iv = Base64.decode64(options[:iv].encode('ascii-8bit'))
@@ -59,10 +29,5 @@ module AESKeeper
         raise 'Decryption failed.'
       end
     end
-
-    def key(options = {})
-      return nil unless options.has_key? :key
-      options.has_key?(:salt) ? Armor.digest(options[:key], options[:salt]) : options[:key]
-    end
   end
 end

data/lib/aes_keeper/aes_keeper_pure.rb

@@ -1,12 +1,5 @@
 module AESKeeper
-  class AESKeeperPure
-    def initialize(options = {})
-      raise ":key required!" unless options.has_key? :key
-      raise ":key needs to be at-least 32 characters!" unless options[:key].length >= 32
-      @key = key(options)
-      @cipher = OpenSSL::Cipher::AES256.new(:CBC)
-    end
-
+  class AESKeeperPure < AESKeeperCommon
     def encrypt(content, options = {})
       if (content != nil) and (content != "")
         @cipher.encrypt
@@ -15,38 +8,16 @@ module AESKeeper
         @cipher.iv = @iv
         encrypted = @cipher.update content
         encrypted << @cipher.final
-        {
+        stringable({
           encrypted: Base64.encode64(encrypted).encode('utf-8'), iv: Base64.encode64(@iv).encode('utf-8')
-        }.tap { |i|
-          i.define_singleton_method(:to_s) { [self[:encrypted], self[:iv]].join(":") }
-          i.define_singleton_method(:to_string) { [self[:encrypted], self[:iv]].join(":") }
-        }
-      else
-        { encrypted: '', iv: ''}.tap {|i|
-          i.define_singleton_method(:to_s){''}
-          i.define_singleton_method(:blank?){true}
-          i.define_singleton_method(:empty?){true}
-          i.define_singleton_method(:presence){''}
-          i.define_singleton_method(:present?){false}
-        }
+        })
+       else
+        nothing({ encrypted: '', iv: ''})
       end
     end
 
     def decrypt(options = {})
-      if options.is_a? String
-        text = options.dup
-        options = {}
-        if text.scan(/:/).one?
-          options[:encrypted], options[:iv] = text.split(':')
-        else
-          raise 'Invalid String input!'
-        end
-      end
-      raise ':encrypted required!' unless options.has_key?(:encrypted)
-      raise ':iv required!' unless options.has_key?(:iv)
-      raise ':encrypted invalid type!' unless options[:encrypted].is_a? String
-      raise ':iv invalid type!' unless options[:iv].is_a? String
-      return '' if options[:encrypted].strip.empty? and options[:iv].strip.empty?
+      decrypt_validations binding
       @cipher.decrypt
       @cipher.key =  key(options) || @key
       @cipher.iv = Base64.decode64(options[:iv].encode('ascii-8bit'))
@@ -58,10 +29,5 @@ module AESKeeper
         raise 'Decryption failed.'
       end
     end
-
-    def key(options = {})
-      return nil unless options.has_key? :key
-      options.has_key?(:salt) ? Armor.digest(options[:key], options[:salt]) : options[:key]
-    end
   end
 end

data/lib/aes_keeper/version.rb

@@ -1,3 +1,3 @@
 module AESKeeper
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/aes_keeper_pure_test.rb

@@ -6,6 +6,24 @@ describe AESKeeper::AESKeeperPure do
   let(:encrypt2){AESKeeper::AESKeeperPure.new key: "asdfghjklqwertyuiopzxcvbnm1234567890", salt: "shaker"}
   let(:encrypt3){AESKeeper::AESKeeperPure.new key: uuid, salt: "Example.com"}
 
+  it "can be reproducible and optional PBKDF2" do
+    enc = AESKeeper::AESKeeperPure.new key: "asdfghjklqwertyuiopzxcvbnm1234567890", salt: "shaker", armor: false
+    enc.instance_exec {@iv="F5DC1E5A25F87C2201FE9B8D682D22CE"}
+    a = enc.encrypt("asdf@moo.com").to_s
+
+    enc = AESKeeper::AESKeeperPure.new key: "asdfghjklqwertyuiopzxcvbnm1234567890", salt: "shaker"
+    enc.instance_exec {@iv="F5DC1E5A25F87C2201FE9B8D682D22CE"}
+    b = enc.encrypt("asdf@moo.com").to_s
+
+    enc = AESKeeper::AESKeeperPure.new key: "asdfghjklqwertyuiopzxcvbnm1234567890", salt: "shaker", armor: false
+    enc.instance_exec {@iv="F5DC1E5A25F87C2201FE9B8D682D22CE"}
+    c = enc.encrypt("asdf@moo.com").to_s
+
+    _(a).must_equal c
+    _(a).wont_equal b
+    _(b).wont_equal c
+  end
+
   it "produces a hash of size 2" do
     hsh = encrypt1.encrypt("moo")
     _(hsh).must_be_kind_of Hash
@@ -53,3 +71,10 @@ describe AESKeeper::AESKeeperPure do
   end
 end
 
+
+# ~> LoadError
+# ~> cannot load such file -- minitest_helper
+# ~>
+# ~> /home/danielpclark/.rvm/rubies/ruby-2.2.3/lib/ruby/site_ruby/2.2.0/rubygems/core_ext/kernel_require.rb:54:in `require'
+# ~> /home/danielpclark/.rvm/rubies/ruby-2.2.3/lib/ruby/site_ruby/2.2.0/rubygems/core_ext/kernel_require.rb:54:in `require'
+# ~> /tmp/seeing_is_believing_temp_dir20160202-24131-1bft3zn/program.rb:1:in `<main>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aes_keeper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - Rakefile
 - aes_keeper.gemspec
 - lib/aes_keeper.rb
+- lib/aes_keeper/aes_keeper_common.rb
 - lib/aes_keeper/aes_keeper_marshal.rb
 - lib/aes_keeper/aes_keeper_pure.rb
 - lib/aes_keeper/version.rb